.../JsonApiDocumentTopLevelNormalizerTest.php      | 68 +++++++++++-----------
 1 file changed, 33 insertions(+), 35 deletions(-)

diff --git a/tests/src/Kernel/Normalizer/JsonApiDocumentTopLevelNormalizerTest.php b/tests/src/Kernel/Normalizer/JsonApiDocumentTopLevelNormalizerTest.php
index c5c3437..192c1f4 100644
--- a/tests/src/Kernel/Normalizer/JsonApiDocumentTopLevelNormalizerTest.php
+++ b/tests/src/Kernel/Normalizer/JsonApiDocumentTopLevelNormalizerTest.php
@@ -202,17 +202,9 @@ class JsonApiDocumentTopLevelNormalizerTest extends JsonapiKernelTestBase {
 
   /**
    * @covers ::normalize
-   * @dataProvider normalizeValueProvider
    */
-  public function testNormalize($include) {
+  public function testNormalize() {
     list($request, $resource_type) = $this->generateProphecies('node', 'article');
-    $request->query = new ParameterBag([
-      'fields' => [
-        'node--article' => 'title,type,uid,field_tags,field_image',
-        'user--user' => 'name',
-      ],
-      'include' => $include,
-    ]);
 
     $jsonapi_doc_object = $this
       ->getNormalizer()
@@ -222,6 +214,24 @@ class JsonApiDocumentTopLevelNormalizerTest extends JsonapiKernelTestBase {
         [
           'request' => $request,
           'resource_type' => $resource_type,
+          'account' => NULL,
+          'sparse_fieldset' => [
+            'node--article' => [
+              'title',
+              'type',
+              'uid',
+              'field_tags',
+              'field_image',
+            ],
+            'user--user' => [
+              'name',
+            ],
+          ],
+          'include' => [
+            'uid',
+            'field_tags',
+            'field_image',
+          ]
         ]
       );
     $normalized = $jsonapi_doc_object->rasterizeValue();
@@ -283,19 +293,6 @@ class JsonApiDocumentTopLevelNormalizerTest extends JsonapiKernelTestBase {
   }
 
   /**
-   * Data provider for testNormalize.
-   *
-   * @return array
-   *   The data for the test method.
-   */
-  public function normalizeValueProvider() {
-    return [
-      ['uid,field_tags,field_image'],
-      ['uid, field_tags, field_image'],
-    ];
-  }
-
-  /**
    * @covers ::normalize
    */
   public function testNormalizeRelated() {
@@ -320,6 +317,7 @@ class JsonApiDocumentTopLevelNormalizerTest extends JsonapiKernelTestBase {
         [
           'request' => $request,
           'resource_type' => $resource_type,
+          'account' => NULL,
         ]
       );
     $normalized = $jsonapi_doc_object->rasterizeValue();
@@ -339,13 +337,6 @@ class JsonApiDocumentTopLevelNormalizerTest extends JsonapiKernelTestBase {
     list($request, $resource_type) = $this->generateProphecies('node', 'article', 'uuid');
     $document_wrapper = $this->prophesize(JsonApiDocumentTopLevel::class);
     $document_wrapper->getData()->willReturn($this->node);
-    $request->query = new ParameterBag([
-      'fields' => [
-        'node--article' => 'title,type,uid,field_tags',
-        'user--user' => 'name',
-      ],
-      'include' => 'uid,field_tags',
-    ]);
 
     $jsonapi_doc_object = $this
       ->getNormalizer()
@@ -355,6 +346,11 @@ class JsonApiDocumentTopLevelNormalizerTest extends JsonapiKernelTestBase {
         [
           'request' => $request,
           'resource_type' => $resource_type,
+          'account' => NULL,
+          'include' => [
+            'uid',
+            'field_tags',
+          ],
         ]
       );
     $normalized = $jsonapi_doc_object->rasterizeValue();
@@ -416,18 +412,19 @@ class JsonApiDocumentTopLevelNormalizerTest extends JsonapiKernelTestBase {
     list($request, $resource_type) = $this->generateProphecies('node_type', 'node_type', 'id');
     $document_wrapper = $this->prophesize(JsonApiDocumentTopLevel::class);
     $document_wrapper->getData()->willReturn($this->nodeType);
-    $request->query = new ParameterBag([
-      'fields' => [
-        'node_type--node_type' => 'uuid,display_submitted',
-      ],
-      'include' => NULL,
-    ]);
 
     $jsonapi_doc_object = $this
       ->getNormalizer()
       ->normalize($document_wrapper->reveal(), 'api_json', [
         'request' => $request,
         'resource_type' => $resource_type,
+        'account' => NULL,
+        'sparse_fieldset' => [
+          'node_type--node_type' => [
+            'uuid',
+            'display_submitted',
+          ],
+        ],
       ]);
     $normalized = $jsonapi_doc_object->rasterizeValue();
     $this->assertTrue(empty($normalized['data']['attributes']['type']));
@@ -688,6 +685,7 @@ class JsonApiDocumentTopLevelNormalizerTest extends JsonapiKernelTestBase {
     $context = [
       'request' => $this->decorateRequest($request, $fields, $includes),
       'resource_type' => $resource_type,
+      'account' => NULL,
     ];
     $jsonapi_doc_object = $this->getNormalizer()->normalize(new JsonApiDocumentTopLevel($this->node), 'api_json', $context);
     $this->assertArraySubset($expected_metadata->getCacheTags(), $jsonapi_doc_object->getCacheTags());