diff --git a/tests/src/Kernel/FieldTest.php b/tests/src/Kernel/FieldTest.php
index fde6e0a..6025106 100644
--- a/tests/src/Kernel/FieldTest.php
+++ b/tests/src/Kernel/FieldTest.php
@@ -120,19 +120,23 @@ class FieldTest extends KernelTestBase {
         'format' => $this->testFormat->id(),
       ],
       'test_list' => [
-        'value' => 'key1',
+        'value1',
+        'value2',
       ],
     ]);
     $entity->save();
 
     $this->assertTokens('node', ['node' => $entity], [
       'test_field' => Markup::create('foo'),
-      'test_list:0' => Markup::create('value1'),
+      'test_field:0:value' => 'foo',
+      'test_field:0:format' => $this->testFormat->id(),
+      'test_list:0:value' => Markup::create('value1'),
+      'test_list:1:value' => Markup::create('value2'),
     ]);
 
-    // Verify that no token was generated for the list_string's second value.
+    // Verify that no third token was generated for the list_string field.
     $this->assertNoTokens('node', ['node' => $entity], [
-      'test_list:1',
+      'test_list:2',
     ]);
 
     // Test the test_list token metadata.
@@ -140,6 +144,10 @@ class FieldTest extends KernelTestBase {
     $token_info = $tokenService->getTokenInfo('node', 'test_list');
     $this->assertEqual($token_info['name'], 'test_list');
     $this->assertEqual($token_info['module'], 'token');
+    $this->assertEqual($token_info['type'], 'list<node-test_list>');
+    $typeInfo = $tokenService->getTypeInfo('list<node-test_list>');
+    $this->assertEqual($typeInfo['name'], 'List of test_list values');
+    $this->assertEqual($typeInfo['type'], 'list<node-test_list>');
 
     // Create a node without a value in the text field and test its token.
     $entity = Node::create([