diff --git a/tests/DataCollector/JobsCollectorTest.php b/tests/DataCollector/JobsCollectorTest.php
index 15112618..fc5eff1d 100644
--- a/tests/DataCollector/JobsCollectorTest.php
+++ b/tests/DataCollector/JobsCollectorTest.php
@@ -36,14 +36,26 @@ public function testItCollectsDispatchedJobs()
         $collector->setXdebugLinkTemplate('');
 
         $this->assertEquals(
-            ['data' => [], 'count' => 0, 'is_counter' => true],
+            [
+                'data' => [],
+                'count' => 0,
+                'is_counter' => true,
+                'key_map' => ['value' => 'Count']
+            ],
             $collector->collect()
         );
 
         OrderShipped::dispatch(1);
 
         $this->assertEquals(
-            ['data' => [OrderShipped::class => 1], 'count' => 1, 'is_counter' => true],
+            [
+                'data' => [
+                    OrderShipped::class => ['value' => 1]
+                ],
+                'count' => 1,
+                'is_counter' => true,
+                'key_map' => ['value' => 'Count']
+            ],
             $collector->collect()
         );
 
@@ -52,7 +64,15 @@ public function testItCollectsDispatchedJobs()
         dispatch(new SendNotification());
 
         $this->assertEquals(
-            ['data' => [OrderShipped::class => 1, SendNotification::class => 3], 'count' => 4, 'is_counter' => true],
+            [
+                'data' => [
+                    OrderShipped::class => ['value' => 1],
+                    SendNotification::class => ['value' => 3]
+                ],
+                'count' => 4,
+                'is_counter' => true,
+                'key_map' => ['value' => 'Count']
+            ],
             $collector->collect()
         );
     }
diff --git a/tests/DataCollector/ModelsCollectorTest.php b/tests/DataCollector/ModelsCollectorTest.php
index 02ca92ac..f47697d7 100644
--- a/tests/DataCollector/ModelsCollectorTest.php
+++ b/tests/DataCollector/ModelsCollectorTest.php
@@ -35,21 +35,47 @@ public function testItCollectsRetrievedModels()
         ]);
 
         $this->assertEquals(
-            ['data' => [], 'count' => 0, 'is_counter' => true],
+            [
+                'data' => [],
+                'count' => 0,
+                'is_counter' => true,
+                'key_map' => [
+                    'value' => 'Count'
+                ],
+            ],
             $collector->collect()
         );
 
         User::first();
 
         $this->assertEquals(
-            ['data' => [User::class => 1], 'count' => 1, 'is_counter' => true],
+            [
+                'data' => [
+                    User::class => ['value' => 1]
+                ],
+                'count' => 1,
+                'is_counter' => true,
+                'key_map' => [
+                    'value' => 'Count'
+                ],
+            ],
             $collector->collect()
         );
 
         Person::all();
 
         $this->assertEquals(
-            ['data' => [User::class => 1, Person::class => 2], 'count' => 3, 'is_counter' => true],
+            [
+                'data' => [
+                    User::class => ['value' => 1],
+                    Person::class => ['value' => 2]
+                ],
+                'count' => 3,
+                'is_counter' => true,
+                'key_map' => [
+                    'value' => 'Count'
+                ]
+            ],
             $collector->collect()
         );
     }