From f9f233f349852c43615c2c30d2bca494bea5de74 Mon Sep 17 00:00:00 2001
From: Andreas Berger <andreas@berger-ecommerce.com>
Date: Thu, 19 Dec 2024 14:30:59 +0100
Subject: [PATCH] implement new js sync mechanism

This adds a new 3 way sync mechanism, where the test definitions (Asciidoc), that are generated from neo4j graphql (js) are stored separately as `*.js.adoc`.

The new tool JsTestCaseSync.kt now compares the js version with the previous js version and only take over test that were changed.
Additionally, the reformatting feature is extracted from the TestSuites into a new tool AsciidocReformater.kt. This removes code that is not test relevant out of the test factories.

As a refactoring, utility functions were also removed from the test factories into own *Utils classes.
---
 .editorconfig                                 |    1 +
 .run/AsciidocReformater.run.xml               |   11 +
 .run/JsTestCaseSync.run.xml                   |   11 +
 .run/Reformat Tests.run.xml                   |   13 -
 .../neo4j/graphql/asciidoc/AsciiDocParser.kt  |   50 +-
 .../org/neo4j/graphql/asciidoc/ast/Block.kt   |    6 +-
 .../neo4j/graphql/asciidoc/ast/CodeBlock.kt   |   16 +-
 .../neo4j/graphql/asciidoc/ast/Document.kt    |    8 +
 .../org/neo4j/graphql/asciidoc/ast/Section.kt |   72 +
 .../graphql/asciidoc/ast/StructuralNode.kt    |    2 +
 .../org/neo4j/graphql/asciidoc/ast/Table.kt   |   18 +
 .../graphql/asciidoc/ast/ThematicBreak.kt     |    7 +-
 .../graphql/domain/CodeBlockPredicate.kt      |   28 +
 .../org/neo4j/graphql/domain/TestCase.kt      |   67 +
 .../graphql/factories/AsciiDocTestFactory.kt  |  233 +-
 .../graphql/factories/CypherTestFactory.kt    |  564 +-
 .../factories/GraphQLSchemaTestFactory.kt     |  100 +-
 .../neo4j/graphql/tools/AsciidocReformater.kt |  110 +
 .../org/neo4j/graphql/tools/JsTestCaseSync.kt |  469 ++
 .../org/neo4j/graphql/utils/Assertions.kt     |  209 +
 .../org/neo4j/graphql/utils/CypherUtils.kt    |   47 +
 .../graphql/utils/InvalidQueryException.kt    |    6 -
 .../org/neo4j/graphql/utils/JsonUtils.kt      |   49 +
 .../org/neo4j/graphql/utils/SchemaUtils.kt    |   51 +
 .../org/neo4j/graphql/utils/TestUtils.kt      |   31 +-
 .../test/resources/augmentation-tests.adoc    |    6 +-
 core/src/test/resources/custom-fields.adoc    |   10 +-
 .../resources/cypher-directive-tests.adoc     |   22 +-
 core/src/test/resources/cypher-tests.adoc     |  186 +-
 .../resources/dynamic-property-tests.adoc     |   12 +-
 core/src/test/resources/filter-tests.adoc     |  196 +-
 .../integration-test-files/aliasing.adoc      |   61 +-
 .../integration-test-files/aliasing.js.adoc   |  180 +
 .../config-options/query-options.adoc         |   27 +-
 .../config-options/query-options.js.adoc      |   82 +
 .../config-options/startup-validation.adoc    |  833 ---
 .../connection-resolvers.adoc                 |   31 +-
 .../connection-resolvers.js.adoc              |  112 +
 .../connections/alias.adoc                    |  350 +-
 .../connections/alias.js.adoc                 | 1442 ++++
 .../connections/filtering.adoc                |   27 +-
 .../connections/filtering.js.adoc             |   97 +
 .../connections/interfaces.adoc               |  276 +-
 .../connections/interfaces.js.adoc            |  707 ++
 .../connections/nested.adoc                   |  115 +-
 .../connections/nested.js.adoc                |  283 +
 .../connections/unions.adoc                   |  498 +-
 .../connections/unions.js.adoc                | 1089 +++
 .../custom-resolvers.adoc                     |  113 +-
 .../custom-resolvers.js.adoc                  |   67 +
 .../custom-scalar-filtering.adoc              |  102 +-
 .../custom-scalar-filtering.js.adoc           |  331 +
 .../authorization/custom-resolvers.adoc       |   33 +-
 .../authorization/custom-resolvers.js.adoc    |  143 +
 .../directives/coalesce.adoc                  |   52 +-
 .../directives/coalesce.js.adoc               |  189 +
 .../directives/customResolver.adoc            | 1401 +---
 .../directives/customResolver.js.adoc         | 1176 +++
 .../directives/default.adoc                   |  200 -
 .../directives/node/label.adoc                |   14 +-
 .../directives/node/label.js.adoc             |   59 +
 .../filtering/advanced-filtering.adoc         |  551 +-
 .../filtering/advanced-filtering.js.adoc      | 1390 ++++
 .../filter-interface-relationship.adoc        |  146 +-
 .../filter-interface-relationship.js.adoc     |  530 ++
 .../filtering/filter-union-relationship.adoc  |  190 +-
 .../filter-union-relationship.js.adoc         |  638 ++
 .../filtering/operations.adoc                 |   28 +-
 .../filtering/operations.js.adoc              |   82 +
 .../filtering/single-relationship.adoc        |   30 +-
 .../filtering/single-relationship.js.adoc     |  139 +
 .../filtering/typename-in.adoc                |   61 +-
 .../filtering/typename-in.js.adoc             |  196 +
 .../integration-test-files/find.adoc          |  254 +-
 .../integration-test-files/find.js.adoc       |  562 ++
 .../interfaces/relationships/read.adoc        |  142 +-
 .../interfaces/relationships/read.js.adoc     |  409 ++
 .../integration-test-files/issues/1683.adoc   |   19 +-
 .../issues/1683.js.adoc                       |   87 +
 .../integration-test-files/issues/1686.adoc   |   11 +-
 .../issues/1686.js.adoc                       |   78 +
 .../integration-test-files/issues/1687.adoc   |   20 +-
 .../issues/1687.js.adoc                       |   81 +
 .../integration-test-files/issues/1779.adoc   |   50 +-
 .../issues/1779.js.adoc                       |  107 +
 .../integration-test-files/issues/207.adoc    |   22 +-
 .../integration-test-files/issues/207.js.adoc |   58 +
 .../integration-test-files/issues/2262.adoc   |   33 +-
 .../issues/2262.js.adoc                       |  123 +
 .../integration-test-files/issues/2820.adoc   |  425 +-
 .../issues/2820.js.adoc                       |  803 ++
 .../integration-test-files/issues/2847.adoc   |   17 +-
 .../issues/2847.js.adoc                       |   83 +
 .../integration-test-files/issues/3009.adoc   |   25 +-
 .../issues/3009.js.adoc                       |   69 +
 .../integration-test-files/issues/3394.adoc   |  139 +-
 .../issues/3394.js.adoc                       |  311 +
 .../integration-test-files/issues/360.adoc    |   79 +-
 .../integration-test-files/issues/360.js.adoc |  191 +
 .../integration-test-files/issues/4007.adoc   |   45 +-
 .../issues/4007.js.adoc                       |  105 +
 .../integration-test-files/issues/4015.adoc   |   63 +-
 .../issues/4015.js.adoc                       |  115 +
 .../integration-test-files/issues/402.adoc    |   19 +-
 .../integration-test-files/issues/402.js.adoc |   76 +
 .../integration-test-files/issues/4196.adoc   |   55 +-
 .../issues/4196.js.adoc                       |  117 +
 .../integration-test-files/issues/4287.adoc   |   46 +-
 .../issues/4287.js.adoc                       |  129 +
 .../integration-test-files/issues/433.adoc    |   29 +-
 .../integration-test-files/issues/433.js.adoc |   93 +
 .../integration-test-files/issues/4450.adoc   |   17 +-
 .../issues/4450.js.adoc                       |   90 +
 .../integration-test-files/issues/4532.adoc   |  151 +-
 .../issues/4532.js.adoc                       |  278 +
 .../integration-test-files/issues/4667.adoc   |   17 +-
 .../issues/4667.js.adoc                       |   78 +
 .../integration-test-files/issues/5142.adoc   |    7 +-
 .../issues/5142.js.adoc                       |   33 +
 .../issues/5223-cartesian.adoc                |  261 +-
 .../issues/5223-cartesian.js.adoc             |  352 +
 .../issues/5223-point.adoc                    |  201 +-
 .../issues/5223-point.js.adoc                 |  352 +
 .../integration-test-files/issues/560.adoc    |   33 +-
 .../integration-test-files/issues/560.js.adoc |  131 +
 .../integration-test-files/issues/583.adoc    |   41 +-
 .../integration-test-files/issues/583.js.adoc |  143 +
 .../integration-test-files/issues/620.adoc    |   44 +-
 .../integration-test-files/issues/620.js.adoc |   80 +
 .../issues/date-in-edge.adoc                  |   15 +-
 .../issues/date-in-edge.js.adoc               |  102 +
 .../relationship-properties/read.adoc         |   69 +-
 .../relationship-properties/read.js.adoc      |  132 +
 .../rfcs/query-limits.adoc                    |   20 +-
 .../rfcs/query-limits.js.adoc                 |   68 +
 .../integration-test-files/scalars.adoc       |   19 +-
 .../integration-test-files/scalars.js.adoc    |   60 +
 .../integration-test-files/types/bigint.adoc  |   36 +-
 .../types/bigint.js.adoc                      |  118 +
 .../integration-test-files/types/date.adoc    |   19 +-
 .../integration-test-files/types/date.js.adoc |   62 +
 .../types/datetime.adoc                       |   35 +-
 .../types/datetime.js.adoc                    |  119 +
 .../types/duration.adoc                       |  129 +-
 .../types/duration.js.adoc                    |  385 +
 .../types/localdatetime.adoc                  |  127 +-
 .../types/localdatetime.js.adoc               |  548 ++
 .../types/localtime.adoc                      |  133 +-
 .../types/localtime.js.adoc                   |  549 ++
 .../types/point-cartesian.adoc                |   53 +-
 .../types/point-cartesian.js.adoc             |  168 +
 .../integration-test-files/types/point.adoc   |   39 +-
 .../types/point.js.adoc                       |  108 +
 .../types/points-cartesian.adoc               |  215 +-
 .../types/points-cartesian.js.adoc            |  256 +
 .../integration-test-files/types/points.adoc  |   97 +-
 .../types/points.js.adoc                      |  130 +
 .../integration-test-files/types/time.adoc    |   99 +-
 .../integration-test-files/types/time.js.adoc |  547 ++
 ....ts.adoc => undirected-relationships.adoc} |   25 +-
 .../undirected-relationships.js.adoc          |   86 +
 .../unions/union-relationship-filtering.adoc  |   41 +-
 .../union-relationship-filtering.js.adoc      |  159 +
 .../unions/unions-top-level.adoc              |   62 +-
 .../unions/unions-top-level.js.adoc           |  196 +
 .../integration-test-files/unions/unions.adoc |  143 +-
 .../unions/unions.js.adoc                     |  387 +
 core/src/test/resources/issues/gh-112.adoc    |    4 +-
 core/src/test/resources/issues/gh-147.adoc    |    2 +-
 core/src/test/resources/issues/gh-149.adoc    |    2 +-
 core/src/test/resources/issues/gh-160.adoc    |    2 +-
 core/src/test/resources/issues/gh-163.adoc    |    4 +-
 core/src/test/resources/issues/gh-169.adoc    |    8 +-
 core/src/test/resources/issues/gh-170.adoc    |    2 +-
 ...190-cypher-directive-with-passThrough.adoc |    2 +-
 core/src/test/resources/issues/gh-210.adoc    |    2 +-
 ...-245-cypher-directive-on-relationship.adoc |    2 +-
 .../gh-265-querying-multiple-root-fields.adoc |    2 +-
 ...work-if-using-datafetchinginterceptor.adoc |    2 +-
 core/src/test/resources/issues/gh-27.adoc     |    8 +-
 .../gh-295-wrong-target-node-alias.adoc       |    2 +-
 ...slation-for-IDs-with-property-aliases.adoc |   10 +-
 core/src/test/resources/issues/gh-45.adoc     |    4 +-
 core/src/test/resources/issues/gh-47.adoc     |    8 +-
 core/src/test/resources/issues/gh-65.adoc     |    2 +-
 core/src/test/resources/issues/gh-85.adoc     |    2 +-
 core/src/test/resources/movie-tests.adoc      |   76 +-
 .../resources/optimized-query-for-filter.adoc |   32 +-
 core/src/test/resources/property-tests.adoc   |    2 +-
 .../test/resources/relationship-tests.adoc    |   36 +-
 .../resources/schema-operations-tests.adoc    |    4 +-
 .../cypher/advanced-filtering.adoc            |   40 +-
 .../cypher/directives/ignore.adoc             |    2 +-
 .../tck-test-files/cypher/pagination.adoc     |   24 +-
 .../resources/tck-test-files/cypher/sort.adoc |   16 +-
 .../tck-test-files/cypher/types/datetime.adoc |    8 +-
 .../cypher/v2/advanced-filtering.adoc         |  141 +-
 .../cypher/v2/advanced-filtering.js.adoc      |  780 ++
 .../tck-test-files/cypher/v2/arrays.adoc      |    5 +-
 .../tck-test-files/cypher/v2/arrays.js.adoc   |   45 +
 .../cypher/v2/connections/alias.adoc          |    9 +-
 .../cypher/v2/connections/alias.js.adoc       |  143 +
 .../v2/connections/filtering/composite.adoc   |   21 +-
 .../connections/filtering/composite.js.adoc   |  323 +
 .../v2/connections/filtering/node/and.adoc    |    9 +-
 .../v2/connections/filtering/node/and.js.adoc |  133 +
 .../v2/connections/filtering/node/arrays.adoc |    9 +-
 .../connections/filtering/node/arrays.js.adoc |  132 +
 .../connections/filtering/node/equality.adoc  |    5 +-
 .../filtering/node/equality.js.adoc           |   76 +
 .../connections/filtering/node/numerical.adoc |   17 +-
 .../filtering/node/numerical.js.adoc          |  234 +
 .../v2/connections/filtering/node/or.adoc     |    5 +-
 .../v2/connections/filtering/node/or.js.adoc  |   79 +
 .../v2/connections/filtering/node/points.adoc |    5 +-
 .../connections/filtering/node/points.js.adoc |   92 +
 .../v2/connections/filtering/node/string.adoc |   25 +-
 .../connections/filtering/node/string.js.adoc |  243 +
 .../filtering/relationship/and.adoc           |    9 +-
 .../filtering/relationship/and.js.adoc        |  133 +
 .../filtering/relationship/arrays.adoc        |    9 +-
 .../filtering/relationship/arrays.js.adoc     |  133 +
 .../filtering/relationship/equality.adoc      |    5 +-
 .../filtering/relationship/equality.js.adoc   |   76 +
 .../filtering/relationship/numerical.adoc     |   17 +-
 .../filtering/relationship/numerical.js.adoc  |  229 +
 .../filtering/relationship/or.adoc            |    5 +-
 .../filtering/relationship/or.js.adoc         |   81 +
 .../filtering/relationship/points.adoc        |    5 +-
 .../filtering/relationship/points.js.adoc     |   92 +
 .../filtering/relationship/string.adoc        |   25 +-
 .../filtering/relationship/string.js.adoc     |  244 +
 .../filtering/relationship/temporal.adoc      |    5 +-
 .../filtering/relationship/temporal.js.adoc   |   81 +
 .../cypher/v2/connections/interfaces.adoc     |   29 +-
 .../cypher/v2/connections/interfaces.js.adoc  |  480 ++
 .../connections/projections/projections.adoc  |   29 +-
 .../projections/projections.js.adoc           |  372 +
 .../connections/relationship-properties.adoc  |   29 +-
 .../relationship-properties.js.adoc           |  452 ++
 .../cypher/v2/connections/unions.adoc         |   21 +-
 .../cypher/v2/connections/unions.js.adoc      |  347 +
 .../cypher/v2/directives/alias.adoc           |    9 +-
 .../cypher/v2/directives/alias.js.adoc        |  114 +
 .../cypher/v2/directives/coalesce.adoc        |   29 +-
 .../cypher/v2/directives/coalesce.js.adoc     |  211 +
 .../cypher/v2/directives/customResolver.adoc  |   73 +-
 .../v2/directives/customResolver.js.adoc      |  744 ++
 .../interface-relationships/read.adoc         |   21 +-
 .../interface-relationships/read.js.adoc      |  311 +
 .../node/node-additional-labels.adoc          |    9 +-
 .../node/node-additional-labels.js.adoc       |   81 +
 .../directives/node/node-label-interface.adoc |    5 +-
 .../node/node-label-interface.js.adoc         |   85 +
 .../v2/directives/node/node-label-union.adoc  |    5 +-
 .../directives/node/node-label-union.js.adoc  |   85 +
 .../cypher/v2/directives/node/node-label.adoc |   13 +-
 .../v2/directives/node/node-label.js.adoc     |  126 +
 .../cypher/v2/directives/plural.adoc          |    9 +-
 .../cypher/v2/directives/plural.js.adoc       |   65 +
 .../cypher/v2/experimental/typename-in.adoc   |   13 +-
 .../v2/experimental/typename-in.js.adoc       |  204 +
 .../union-relationship-filtering.adoc         |    9 +-
 .../union-relationship-filtering.js.adoc      |  118 +
 .../v2/experimental/union-top-level.adoc      |    9 +-
 .../v2/experimental/union-top-level.js.adoc   |  121 +
 .../tck-test-files/cypher/v2/issues/1348.adoc |    9 +-
 .../cypher/v2/issues/1348.js.adoc             |  149 +
 .../tck-test-files/cypher/v2/issues/1687.adoc |    5 +-
 .../cypher/v2/issues/1687.js.adoc             |   62 +
 .../tck-test-files/cypher/v2/issues/1779.adoc |    5 +-
 .../cypher/v2/issues/1779.js.adoc             |   65 +
 .../tck-test-files/cypher/v2/issues/2262.adoc |    5 +-
 .../cypher/v2/issues/2262.js.adoc             |   93 +
 .../tck-test-files/cypher/v2/issues/2614.adoc |    5 +-
 .../cypher/v2/issues/2614.js.adoc             |   85 +
 .../tck-test-files/cypher/v2/issues/2713.adoc |    5 +-
 .../cypher/v2/issues/2713.js.adoc             |   65 +
 .../tck-test-files/cypher/v2/issues/2925.adoc |    9 +-
 .../cypher/v2/issues/2925.js.adoc             |   86 +
 .../tck-test-files/cypher/v2/issues/3215.adoc |    5 +-
 .../cypher/v2/issues/3215.js.adoc             |   47 +
 .../tck-test-files/cypher/v2/issues/3394.adoc |   17 +-
 .../cypher/v2/issues/3394.js.adoc             |  177 +
 .../tck-test-files/cypher/v2/issues/360.adoc  |   17 +-
 .../cypher/v2/issues/360.js.adoc              |  101 +
 .../tck-test-files/cypher/v2/issues/3765.adoc |   25 +-
 .../cypher/v2/issues/3765.js.adoc             |  234 +
 .../tck-test-files/cypher/v2/issues/4007.adoc |    5 +-
 .../cypher/v2/issues/4007.js.adoc             |   65 +
 .../tck-test-files/cypher/v2/issues/4015.adoc |    5 +-
 .../cypher/v2/issues/4015.js.adoc             |   69 +
 .../tck-test-files/cypher/v2/issues/402.adoc  |    5 +-
 .../cypher/v2/issues/402.js.adoc              |   54 +
 .../tck-test-files/cypher/v2/issues/4287.adoc |    5 +-
 .../cypher/v2/issues/4287.js.adoc             |   90 +
 .../tck-test-files/cypher/v2/issues/433.adoc  |    5 +-
 .../cypher/v2/issues/433.js.adoc              |   65 +
 .../tck-test-files/cypher/v2/issues/4432.adoc |    5 +-
 .../cypher/v2/issues/4432.js.adoc             |   89 +
 .../tck-test-files/cypher/v2/issues/4450.adoc |    5 +-
 .../cypher/v2/issues/4450.js.adoc             |   70 +
 .../tck-test-files/cypher/v2/issues/4667.adoc |    5 +-
 .../cypher/v2/issues/4667.js.adoc             |   47 +
 .../tck-test-files/cypher/v2/issues/583.adoc  |    5 +-
 .../cypher/v2/issues/583.js.adoc              |   92 +
 .../tck-test-files/cypher/v2/null.adoc        |    5 +-
 .../tck-test-files/cypher/v2/null.js.adoc     |   49 +
 .../tck-test-files/cypher/v2/pagination.adoc  |   31 +-
 .../cypher/v2/pagination.js.adoc              |  193 +
 .../cypher/v2/rfcs/query-limits.adoc          |   33 +-
 .../cypher/v2/rfcs/query-limits.js.adoc       |  365 +
 .../cypher/v2/rfcs/rfc-022.adoc               |    9 +-
 .../cypher/v2/rfcs/rfc-022.js.adoc            |  118 +
 .../cypher/v2/root-connection.adoc            |   17 +-
 .../cypher/v2/root-connection.js.adoc         |  216 +
 .../tck-test-files/cypher/v2/simple.adoc      |   15 +-
 .../tck-test-files/cypher/v2/simple.js.adoc   |  110 +
 .../cypher/v2/types/bigint.adoc               |   30 +-
 .../cypher/v2/types/bigint.js.adoc            |  108 +
 .../tck-test-files/cypher/v2/types/date.adoc  |    9 +-
 .../cypher/v2/types/date.js.adoc              |   72 +
 .../cypher/v2/types/datetime.adoc             |    5 +-
 .../cypher/v2/types/datetime.js.adoc          |   44 +
 .../cypher/v2/types/duration.adoc             |    9 +-
 .../cypher/v2/types/duration.js.adoc          |   72 +
 .../cypher/v2/types/localdatetime.adoc        |    9 +-
 .../cypher/v2/types/localdatetime.js.adoc     |   72 +
 .../cypher/v2/types/localtime.adoc            |    9 +-
 .../cypher/v2/types/localtime.js.adoc         |   72 +
 .../tck-test-files/cypher/v2/types/point.adoc |   29 +-
 .../cypher/v2/types/point.js.adoc             |  306 +
 .../cypher/v2/types/points.adoc               |    9 +-
 .../cypher/v2/types/points.js.adoc            |   94 +
 .../tck-test-files/cypher/v2/types/time.adoc  |    9 +-
 .../cypher/v2/types/time.js.adoc              |   72 +
 .../query-direction-connection.adoc           |   13 +-
 .../query-direction-connection.js.adoc        |  152 +
 .../query-direction.adoc                      |   17 +-
 .../query-direction.js.adoc                   |  195 +
 .../undirected-connection.adoc                |    5 +-
 .../undirected-connection.js.adoc             |   54 +
 .../undirected-relationships.adoc             |   13 +-
 .../undirected-relationships.js.adoc          |  198 +
 .../tck-test-files/cypher/v2/where.adoc       |   57 +-
 .../tck-test-files/cypher/v2/where.js.adoc    |  402 +
 .../tck-test-files/cypher/where.adoc          |   16 +-
 .../schema/directives/ignore.adoc             |    2 +-
 .../tck-test-files/schema/relationship.adoc   |    2 +-
 .../tck-test-files/schema/simple.adoc         |    2 +-
 .../tck-test-files/schema/types/arrays.adoc   |    2 +-
 .../tck-test-files/schema/types/datetime.adoc |    2 +-
 .../schema/v2/aggregations.adoc               |    9 +-
 .../schema/v2/aggregations.js.adoc            |  586 ++
 .../schema/v2/array-methods.adoc              |    5 +-
 .../schema/v2/array-methods.js.adoc           |  276 +
 .../tck-test-files/schema/v2/arrays.adoc      |    5 +-
 .../tck-test-files/schema/v2/arrays.js.adoc   |   99 +
 .../tck-test-files/schema/v2/comments.adoc    |   19 +-
 .../tck-test-files/schema/v2/comments.js.adoc |  871 +++
 .../schema/v2/connections/enums.adoc          |    5 +-
 .../schema/v2/connections/enums.js.adoc}      |   44 +-
 .../schema/v2/connections/sort.adoc           |    5 +-
 .../schema/v2/connections/sort.js.adoc        |  210 +
 .../schema/v2/connections/unions.adoc         |    5 +-
 .../schema/v2/connections/unions.js.adoc      |  400 +
 .../schema/v2/directive-preserve.adoc         |   21 +-
 .../schema/v2/directive-preserve.js.adoc      | 1510 ++++
 .../schema/v2/directives/alias.adoc           |    5 +-
 .../schema/v2/directives/alias.js.adoc        |  239 +
 .../schema/v2/directives/customResolver.adoc  |    5 +-
 .../v2/directives/customResolver.js.adoc      |  159 +
 .../schema/v2/directives/default.adoc         |    5 +-
 .../schema/v2/directives/default.js.adoc      |  222 +
 .../schema/v2/directives/filterable.adoc      |   33 +-
 .../schema/v2/directives/filterable.js.adoc   | 2290 ++++++
 .../schema/v2/directives/private.adoc         |    9 +-
 .../schema/v2/directives/private.js.adoc      |  286 +
 .../schema/v2/directives/query.adoc           |    9 +-
 .../schema/v2/directives/query.js.adoc        |  176 +
 .../v2/directives/relationship-aggregate.adoc |   17 +-
 .../directives/relationship-aggregate.js.adoc |  888 +++
 .../relationship-nested-operations.adoc       |  105 +-
 .../relationship-nested-operations.js.adoc    | 6445 +++++++++++++++++
 .../directives/relationship-properties.adoc   |    5 +-
 .../relationship-properties.js.adoc           |  283 +
 .../schema/v2/directives/relationship.adoc    |    9 +-
 .../schema/v2/directives/relationship.js.adoc |  410 ++
 .../tck-test-files/schema/v2/enum.adoc        |    5 +-
 .../tck-test-files/schema/v2/enum.js.adoc     |   95 +
 .../v2/experimental-schema/comments.adoc      |   19 +-
 .../v2/experimental-schema/comments.js.adoc   |  871 +++
 .../directive-preserve.adoc                   |   21 +-
 .../directive-preserve.js.adoc                | 1510 ++++
 .../directives/customResolver.adoc            |    5 +-
 .../directives/customResolver.js.adoc         |  159 +
 .../directives/default.adoc                   |    5 +-
 .../directives/default.js.adoc                |  222 +
 .../directives/filterable.adoc                |   33 +-
 .../directives/filterable.js.adoc             | 2290 ++++++
 .../directives/private.adoc                   |    9 +-
 .../directives/private.js.adoc                |  286 +
 .../directives/relationship-aggregate.adoc    |   17 +-
 .../directives/relationship-aggregate.js.adoc |  888 +++
 .../relationship-nested-operations.adoc       |  105 +-
 .../relationship-nested-operations.js.adoc    | 6445 +++++++++++++++++
 .../interface-relationships.adoc              |    5 +-
 .../interface-relationships.js.adoc           |  334 +
 .../interfaces/aggregations.adoc              |    9 +-
 .../interfaces/aggregations.js.adoc           |  522 ++
 .../interfaces/typename-in.adoc               |    5 +-
 .../interfaces/typename-in.js.adoc            |  330 +
 .../schema/v2/experimental-schema/math.adoc   |   25 +-
 .../v2/experimental-schema/math.js.adoc       | 1053 +++
 .../nested-aggregation-on-interface.adoc      |    9 +-
 .../nested-aggregation-on-interface.js.adoc   |  689 ++
 .../schema/v2/experimental-schema/plural.adoc |    5 +-
 .../v2/experimental-schema/plural.js.adoc     |  211 +
 .../v2/experimental-schema/subscriptions.adoc |   17 +-
 .../experimental-schema/subscriptions.js.adoc | 1027 +++
 .../tck-test-files/schema/v2/extend.adoc      |    5 +-
 .../tck-test-files/schema/v2/extend.js.adoc   |   97 +
 .../tck-test-files/schema/v2/inputs.adoc      |    5 +-
 .../schema/v2/inputs.js.adoc}                 |   23 +-
 .../schema/v2/interface-relationships.adoc    |    5 +-
 .../schema/v2/interface-relationships.js.adoc |  334 +
 .../tck-test-files/schema/v2/issues/1038.adoc |    5 +-
 .../schema/v2/issues/1038.js.adoc             |  150 +
 .../tck-test-files/schema/v2/issues/1614.adoc |    5 +-
 .../schema/v2/issues/1614.js.adoc             |  184 +
 .../tck-test-files/schema/v2/issues/162.adoc  |    5 +-
 .../schema/v2/issues/162.js.adoc              |  241 +
 .../tck-test-files/schema/v2/issues/2187.adoc |    5 +-
 .../schema/v2/issues/2187.js.adoc             |  250 +
 .../tck-test-files/schema/v2/issues/2969.adoc |    5 +-
 .../schema/v2/issues/2969.js.adoc             |  220 +
 .../tck-test-files/schema/v2/issues/2981.adoc |    5 +-
 .../schema/v2/issues/2981.js.adoc             |  301 +
 .../tck-test-files/schema/v2/issues/3816.adoc |    9 +-
 .../schema/v2/issues/3816.js.adoc             |  419 ++
 .../tck-test-files/schema/v2/issues/5428.adoc |    5 +-
 .../schema/v2/issues/5428.js.adoc             |   86 +
 .../tck-test-files/schema/v2/issues/609.adoc  |    5 +-
 .../schema/v2/issues/609.js.adoc              |   86 +
 .../schema/v2/lowercase-type-names.adoc       |    5 +-
 .../schema/v2/lowercase-type-names.js.adoc    |  279 +
 .../tck-test-files/schema/v2/math.adoc        |   25 +-
 .../tck-test-files/schema/v2/math.js.adoc     | 1053 +++
 .../schema/v2/nested-aggregation-on-type.adoc |    5 +-
 .../v2/nested-aggregation-on-type.js.adoc     |  232 +
 .../tck-test-files/schema/v2/null.adoc        |    5 +-
 .../tck-test-files/schema/v2/null.js.adoc     |  219 +
 .../schema/v2/pluralize-consistency.adoc      |    5 +-
 .../schema/v2/pluralize-consistency.js.adoc   |  191 +
 .../schema/v2/query-direction.adoc            |   13 +-
 .../schema/v2/query-direction.js.adoc         |  395 +
 .../v2/remove-deprecated/aggregations.adoc    |    9 +-
 .../v2/remove-deprecated/aggregations.js.adoc |  586 ++
 .../v2/remove-deprecated/array-methods.adoc   |    5 +-
 .../remove-deprecated/array-methods.js.adoc   |  276 +
 .../schema/v2/remove-deprecated/comments.adoc |   19 +-
 .../v2/remove-deprecated/comments.js.adoc     |  871 +++
 .../tck-test-files/schema/v2/scalar.adoc      |    5 +-
 .../tck-test-files/schema/v2/scalar.js.adoc   |  103 +
 .../tck-test-files/schema/v2/simple.adoc      |    5 +-
 .../tck-test-files/schema/v2/simple.js.adoc   |  108 +
 .../schema/v2/string-comparators.adoc         |   57 +-
 .../schema/v2/string-comparators.js.adoc      |  577 ++
 .../schema/v2/subscriptions.adoc              |   17 +-
 .../schema/v2/subscriptions.js.adoc           | 1027 +++
 .../schema/v2/types/bigint.adoc               |    5 +-
 .../schema/v2/types/bigint.js.adoc            |  100 +
 .../tck-test-files/schema/v2/types/date.adoc  |    5 +-
 .../schema/v2/types/date.js.adoc              |   98 +
 .../schema/v2/types/datetime.adoc             |    5 +-
 .../schema/v2/types/datetime.js.adoc          |   98 +
 .../schema/v2/types/duration.adoc             |    5 +-
 .../schema/v2/types/duration.js.adoc          |   98 +
 .../schema/v2/types/localdatetime.adoc        |    5 +-
 .../schema/v2/types/localdatetime.js.adoc     |   98 +
 .../schema/v2/types/localtime.adoc            |    5 +-
 .../schema/v2/types/localtime.js.adoc         |  100 +
 .../tck-test-files/schema/v2/types/point.adoc |   17 +-
 .../schema/v2/types/point.js.adoc             |  466 ++
 .../tck-test-files/schema/v2/types/time.adoc  |    5 +-
 .../schema/v2/types/time.js.adoc              |   98 +
 .../tck-test-files/schema/v2/unions.adoc      |    5 +-
 .../tck-test-files/schema/v2/unions.js.adoc   |  209 +
 .../translator-tests-custom-scalars.adoc      |   12 +-
 .../src/test/resources/translator-tests1.adoc |   64 +-
 .../src/test/resources/translator-tests2.adoc |    2 +-
 .../src/test/resources/translator-tests3.adoc |    2 +-
 492 files changed, 77118 insertions(+), 8962 deletions(-)
 create mode 100644 .run/AsciidocReformater.run.xml
 create mode 100644 .run/JsTestCaseSync.run.xml
 delete mode 100644 .run/Reformat Tests.run.xml
 create mode 100644 core/src/test/kotlin/org/neo4j/graphql/domain/CodeBlockPredicate.kt
 create mode 100644 core/src/test/kotlin/org/neo4j/graphql/domain/TestCase.kt
 create mode 100644 core/src/test/kotlin/org/neo4j/graphql/tools/AsciidocReformater.kt
 create mode 100644 core/src/test/kotlin/org/neo4j/graphql/tools/JsTestCaseSync.kt
 create mode 100644 core/src/test/kotlin/org/neo4j/graphql/utils/Assertions.kt
 create mode 100644 core/src/test/kotlin/org/neo4j/graphql/utils/CypherUtils.kt
 delete mode 100644 core/src/test/kotlin/org/neo4j/graphql/utils/InvalidQueryException.kt
 create mode 100644 core/src/test/kotlin/org/neo4j/graphql/utils/JsonUtils.kt
 create mode 100644 core/src/test/kotlin/org/neo4j/graphql/utils/SchemaUtils.kt
 create mode 100644 core/src/test/resources/integration-test-files/aliasing.js.adoc
 create mode 100644 core/src/test/resources/integration-test-files/config-options/query-options.js.adoc
 delete mode 100644 core/src/test/resources/integration-test-files/config-options/startup-validation.adoc
 create mode 100644 core/src/test/resources/integration-test-files/connection-resolvers.js.adoc
 create mode 100644 core/src/test/resources/integration-test-files/connections/alias.js.adoc
 create mode 100644 core/src/test/resources/integration-test-files/connections/filtering.js.adoc
 create mode 100644 core/src/test/resources/integration-test-files/connections/interfaces.js.adoc
 create mode 100644 core/src/test/resources/integration-test-files/connections/nested.js.adoc
 create mode 100644 core/src/test/resources/integration-test-files/connections/unions.js.adoc
 create mode 100644 core/src/test/resources/integration-test-files/custom-resolvers.js.adoc
 create mode 100644 core/src/test/resources/integration-test-files/custom-scalar-filtering.js.adoc
 create mode 100644 core/src/test/resources/integration-test-files/directives/authorization/custom-resolvers.js.adoc
 create mode 100644 core/src/test/resources/integration-test-files/directives/coalesce.js.adoc
 create mode 100644 core/src/test/resources/integration-test-files/directives/customResolver.js.adoc
 delete mode 100644 core/src/test/resources/integration-test-files/directives/default.adoc
 create mode 100644 core/src/test/resources/integration-test-files/directives/node/label.js.adoc
 create mode 100644 core/src/test/resources/integration-test-files/filtering/advanced-filtering.js.adoc
 create mode 100644 core/src/test/resources/integration-test-files/filtering/filter-interface-relationship.js.adoc
 create mode 100644 core/src/test/resources/integration-test-files/filtering/filter-union-relationship.js.adoc
 create mode 100644 core/src/test/resources/integration-test-files/filtering/operations.js.adoc
 create mode 100644 core/src/test/resources/integration-test-files/filtering/single-relationship.js.adoc
 create mode 100644 core/src/test/resources/integration-test-files/filtering/typename-in.js.adoc
 create mode 100644 core/src/test/resources/integration-test-files/find.js.adoc
 create mode 100644 core/src/test/resources/integration-test-files/interfaces/relationships/read.js.adoc
 create mode 100644 core/src/test/resources/integration-test-files/issues/1683.js.adoc
 create mode 100644 core/src/test/resources/integration-test-files/issues/1686.js.adoc
 create mode 100644 core/src/test/resources/integration-test-files/issues/1687.js.adoc
 create mode 100644 core/src/test/resources/integration-test-files/issues/1779.js.adoc
 create mode 100644 core/src/test/resources/integration-test-files/issues/207.js.adoc
 create mode 100644 core/src/test/resources/integration-test-files/issues/2262.js.adoc
 create mode 100644 core/src/test/resources/integration-test-files/issues/2820.js.adoc
 create mode 100644 core/src/test/resources/integration-test-files/issues/2847.js.adoc
 create mode 100644 core/src/test/resources/integration-test-files/issues/3009.js.adoc
 create mode 100644 core/src/test/resources/integration-test-files/issues/3394.js.adoc
 create mode 100644 core/src/test/resources/integration-test-files/issues/360.js.adoc
 create mode 100644 core/src/test/resources/integration-test-files/issues/4007.js.adoc
 create mode 100644 core/src/test/resources/integration-test-files/issues/4015.js.adoc
 create mode 100644 core/src/test/resources/integration-test-files/issues/402.js.adoc
 create mode 100644 core/src/test/resources/integration-test-files/issues/4196.js.adoc
 create mode 100644 core/src/test/resources/integration-test-files/issues/4287.js.adoc
 create mode 100644 core/src/test/resources/integration-test-files/issues/433.js.adoc
 create mode 100644 core/src/test/resources/integration-test-files/issues/4450.js.adoc
 create mode 100644 core/src/test/resources/integration-test-files/issues/4532.js.adoc
 create mode 100644 core/src/test/resources/integration-test-files/issues/4667.js.adoc
 create mode 100644 core/src/test/resources/integration-test-files/issues/5142.js.adoc
 create mode 100644 core/src/test/resources/integration-test-files/issues/5223-cartesian.js.adoc
 create mode 100644 core/src/test/resources/integration-test-files/issues/5223-point.js.adoc
 create mode 100644 core/src/test/resources/integration-test-files/issues/560.js.adoc
 create mode 100644 core/src/test/resources/integration-test-files/issues/583.js.adoc
 create mode 100644 core/src/test/resources/integration-test-files/issues/620.js.adoc
 create mode 100644 core/src/test/resources/integration-test-files/issues/date-in-edge.js.adoc
 create mode 100644 core/src/test/resources/integration-test-files/relationship-properties/read.js.adoc
 create mode 100644 core/src/test/resources/integration-test-files/rfcs/query-limits.js.adoc
 create mode 100644 core/src/test/resources/integration-test-files/scalars.js.adoc
 create mode 100644 core/src/test/resources/integration-test-files/types/bigint.js.adoc
 create mode 100644 core/src/test/resources/integration-test-files/types/date.js.adoc
 create mode 100644 core/src/test/resources/integration-test-files/types/datetime.js.adoc
 create mode 100644 core/src/test/resources/integration-test-files/types/duration.js.adoc
 create mode 100644 core/src/test/resources/integration-test-files/types/localdatetime.js.adoc
 create mode 100644 core/src/test/resources/integration-test-files/types/localtime.js.adoc
 create mode 100644 core/src/test/resources/integration-test-files/types/point-cartesian.js.adoc
 create mode 100644 core/src/test/resources/integration-test-files/types/point.js.adoc
 create mode 100644 core/src/test/resources/integration-test-files/types/points-cartesian.js.adoc
 create mode 100644 core/src/test/resources/integration-test-files/types/points.js.adoc
 create mode 100644 core/src/test/resources/integration-test-files/types/time.js.adoc
 rename core/src/test/resources/integration-test-files/{home/andreas/projects/neo4j-graphql/packages/graphql/tests/integration/undirected-relationships.test.ts.adoc => undirected-relationships.adoc} (85%)
 create mode 100644 core/src/test/resources/integration-test-files/undirected-relationships.js.adoc
 create mode 100644 core/src/test/resources/integration-test-files/unions/union-relationship-filtering.js.adoc
 create mode 100644 core/src/test/resources/integration-test-files/unions/unions-top-level.js.adoc
 create mode 100644 core/src/test/resources/integration-test-files/unions/unions.js.adoc
 create mode 100644 core/src/test/resources/tck-test-files/cypher/v2/advanced-filtering.js.adoc
 create mode 100644 core/src/test/resources/tck-test-files/cypher/v2/arrays.js.adoc
 create mode 100644 core/src/test/resources/tck-test-files/cypher/v2/connections/alias.js.adoc
 create mode 100644 core/src/test/resources/tck-test-files/cypher/v2/connections/filtering/composite.js.adoc
 create mode 100644 core/src/test/resources/tck-test-files/cypher/v2/connections/filtering/node/and.js.adoc
 create mode 100644 core/src/test/resources/tck-test-files/cypher/v2/connections/filtering/node/arrays.js.adoc
 create mode 100644 core/src/test/resources/tck-test-files/cypher/v2/connections/filtering/node/equality.js.adoc
 create mode 100644 core/src/test/resources/tck-test-files/cypher/v2/connections/filtering/node/numerical.js.adoc
 create mode 100644 core/src/test/resources/tck-test-files/cypher/v2/connections/filtering/node/or.js.adoc
 create mode 100644 core/src/test/resources/tck-test-files/cypher/v2/connections/filtering/node/points.js.adoc
 create mode 100644 core/src/test/resources/tck-test-files/cypher/v2/connections/filtering/node/string.js.adoc
 create mode 100644 core/src/test/resources/tck-test-files/cypher/v2/connections/filtering/relationship/and.js.adoc
 create mode 100644 core/src/test/resources/tck-test-files/cypher/v2/connections/filtering/relationship/arrays.js.adoc
 create mode 100644 core/src/test/resources/tck-test-files/cypher/v2/connections/filtering/relationship/equality.js.adoc
 create mode 100644 core/src/test/resources/tck-test-files/cypher/v2/connections/filtering/relationship/numerical.js.adoc
 create mode 100644 core/src/test/resources/tck-test-files/cypher/v2/connections/filtering/relationship/or.js.adoc
 create mode 100644 core/src/test/resources/tck-test-files/cypher/v2/connections/filtering/relationship/points.js.adoc
 create mode 100644 core/src/test/resources/tck-test-files/cypher/v2/connections/filtering/relationship/string.js.adoc
 create mode 100644 core/src/test/resources/tck-test-files/cypher/v2/connections/filtering/relationship/temporal.js.adoc
 create mode 100644 core/src/test/resources/tck-test-files/cypher/v2/connections/interfaces.js.adoc
 create mode 100644 core/src/test/resources/tck-test-files/cypher/v2/connections/projections/projections.js.adoc
 create mode 100644 core/src/test/resources/tck-test-files/cypher/v2/connections/relationship-properties.js.adoc
 create mode 100644 core/src/test/resources/tck-test-files/cypher/v2/connections/unions.js.adoc
 create mode 100644 core/src/test/resources/tck-test-files/cypher/v2/directives/alias.js.adoc
 create mode 100644 core/src/test/resources/tck-test-files/cypher/v2/directives/coalesce.js.adoc
 create mode 100644 core/src/test/resources/tck-test-files/cypher/v2/directives/customResolver.js.adoc
 create mode 100644 core/src/test/resources/tck-test-files/cypher/v2/directives/interface-relationships/read.js.adoc
 create mode 100644 core/src/test/resources/tck-test-files/cypher/v2/directives/node/node-additional-labels.js.adoc
 create mode 100644 core/src/test/resources/tck-test-files/cypher/v2/directives/node/node-label-interface.js.adoc
 create mode 100644 core/src/test/resources/tck-test-files/cypher/v2/directives/node/node-label-union.js.adoc
 create mode 100644 core/src/test/resources/tck-test-files/cypher/v2/directives/node/node-label.js.adoc
 create mode 100644 core/src/test/resources/tck-test-files/cypher/v2/directives/plural.js.adoc
 create mode 100644 core/src/test/resources/tck-test-files/cypher/v2/experimental/typename-in.js.adoc
 create mode 100644 core/src/test/resources/tck-test-files/cypher/v2/experimental/union-relationship-filtering.js.adoc
 create mode 100644 core/src/test/resources/tck-test-files/cypher/v2/experimental/union-top-level.js.adoc
 create mode 100644 core/src/test/resources/tck-test-files/cypher/v2/issues/1348.js.adoc
 create mode 100644 core/src/test/resources/tck-test-files/cypher/v2/issues/1687.js.adoc
 create mode 100644 core/src/test/resources/tck-test-files/cypher/v2/issues/1779.js.adoc
 create mode 100644 core/src/test/resources/tck-test-files/cypher/v2/issues/2262.js.adoc
 create mode 100644 core/src/test/resources/tck-test-files/cypher/v2/issues/2614.js.adoc
 create mode 100644 core/src/test/resources/tck-test-files/cypher/v2/issues/2713.js.adoc
 create mode 100644 core/src/test/resources/tck-test-files/cypher/v2/issues/2925.js.adoc
 create mode 100644 core/src/test/resources/tck-test-files/cypher/v2/issues/3215.js.adoc
 create mode 100644 core/src/test/resources/tck-test-files/cypher/v2/issues/3394.js.adoc
 create mode 100644 core/src/test/resources/tck-test-files/cypher/v2/issues/360.js.adoc
 create mode 100644 core/src/test/resources/tck-test-files/cypher/v2/issues/3765.js.adoc
 create mode 100644 core/src/test/resources/tck-test-files/cypher/v2/issues/4007.js.adoc
 create mode 100644 core/src/test/resources/tck-test-files/cypher/v2/issues/4015.js.adoc
 create mode 100644 core/src/test/resources/tck-test-files/cypher/v2/issues/402.js.adoc
 create mode 100644 core/src/test/resources/tck-test-files/cypher/v2/issues/4287.js.adoc
 create mode 100644 core/src/test/resources/tck-test-files/cypher/v2/issues/433.js.adoc
 create mode 100644 core/src/test/resources/tck-test-files/cypher/v2/issues/4432.js.adoc
 create mode 100644 core/src/test/resources/tck-test-files/cypher/v2/issues/4450.js.adoc
 create mode 100644 core/src/test/resources/tck-test-files/cypher/v2/issues/4667.js.adoc
 create mode 100644 core/src/test/resources/tck-test-files/cypher/v2/issues/583.js.adoc
 create mode 100644 core/src/test/resources/tck-test-files/cypher/v2/null.js.adoc
 create mode 100644 core/src/test/resources/tck-test-files/cypher/v2/pagination.js.adoc
 create mode 100644 core/src/test/resources/tck-test-files/cypher/v2/rfcs/query-limits.js.adoc
 create mode 100644 core/src/test/resources/tck-test-files/cypher/v2/rfcs/rfc-022.js.adoc
 create mode 100644 core/src/test/resources/tck-test-files/cypher/v2/root-connection.js.adoc
 create mode 100644 core/src/test/resources/tck-test-files/cypher/v2/simple.js.adoc
 create mode 100644 core/src/test/resources/tck-test-files/cypher/v2/types/bigint.js.adoc
 create mode 100644 core/src/test/resources/tck-test-files/cypher/v2/types/date.js.adoc
 create mode 100644 core/src/test/resources/tck-test-files/cypher/v2/types/datetime.js.adoc
 create mode 100644 core/src/test/resources/tck-test-files/cypher/v2/types/duration.js.adoc
 create mode 100644 core/src/test/resources/tck-test-files/cypher/v2/types/localdatetime.js.adoc
 create mode 100644 core/src/test/resources/tck-test-files/cypher/v2/types/localtime.js.adoc
 create mode 100644 core/src/test/resources/tck-test-files/cypher/v2/types/point.js.adoc
 create mode 100644 core/src/test/resources/tck-test-files/cypher/v2/types/points.js.adoc
 create mode 100644 core/src/test/resources/tck-test-files/cypher/v2/types/time.js.adoc
 create mode 100644 core/src/test/resources/tck-test-files/cypher/v2/undirected-relationships/query-direction-connection.js.adoc
 create mode 100644 core/src/test/resources/tck-test-files/cypher/v2/undirected-relationships/query-direction.js.adoc
 create mode 100644 core/src/test/resources/tck-test-files/cypher/v2/undirected-relationships/undirected-connection.js.adoc
 create mode 100644 core/src/test/resources/tck-test-files/cypher/v2/undirected-relationships/undirected-relationships.js.adoc
 create mode 100644 core/src/test/resources/tck-test-files/cypher/v2/where.js.adoc
 create mode 100644 core/src/test/resources/tck-test-files/schema/v2/aggregations.js.adoc
 create mode 100644 core/src/test/resources/tck-test-files/schema/v2/array-methods.js.adoc
 create mode 100644 core/src/test/resources/tck-test-files/schema/v2/arrays.js.adoc
 create mode 100644 core/src/test/resources/tck-test-files/schema/v2/comments.js.adoc
 rename core/src/test/resources/{integration-test-files/relationship-properties/error-if-missing-relationship-properties.adoc => tck-test-files/schema/v2/connections/enums.js.adoc} (92%)
 create mode 100644 core/src/test/resources/tck-test-files/schema/v2/connections/sort.js.adoc
 create mode 100644 core/src/test/resources/tck-test-files/schema/v2/connections/unions.js.adoc
 create mode 100644 core/src/test/resources/tck-test-files/schema/v2/directive-preserve.js.adoc
 create mode 100644 core/src/test/resources/tck-test-files/schema/v2/directives/alias.js.adoc
 create mode 100644 core/src/test/resources/tck-test-files/schema/v2/directives/customResolver.js.adoc
 create mode 100644 core/src/test/resources/tck-test-files/schema/v2/directives/default.js.adoc
 create mode 100644 core/src/test/resources/tck-test-files/schema/v2/directives/filterable.js.adoc
 create mode 100644 core/src/test/resources/tck-test-files/schema/v2/directives/private.js.adoc
 create mode 100644 core/src/test/resources/tck-test-files/schema/v2/directives/query.js.adoc
 create mode 100644 core/src/test/resources/tck-test-files/schema/v2/directives/relationship-aggregate.js.adoc
 create mode 100644 core/src/test/resources/tck-test-files/schema/v2/directives/relationship-nested-operations.js.adoc
 create mode 100644 core/src/test/resources/tck-test-files/schema/v2/directives/relationship-properties.js.adoc
 create mode 100644 core/src/test/resources/tck-test-files/schema/v2/directives/relationship.js.adoc
 create mode 100644 core/src/test/resources/tck-test-files/schema/v2/enum.js.adoc
 create mode 100644 core/src/test/resources/tck-test-files/schema/v2/experimental-schema/comments.js.adoc
 create mode 100644 core/src/test/resources/tck-test-files/schema/v2/experimental-schema/directive-preserve.js.adoc
 create mode 100644 core/src/test/resources/tck-test-files/schema/v2/experimental-schema/directives/customResolver.js.adoc
 create mode 100644 core/src/test/resources/tck-test-files/schema/v2/experimental-schema/directives/default.js.adoc
 create mode 100644 core/src/test/resources/tck-test-files/schema/v2/experimental-schema/directives/filterable.js.adoc
 create mode 100644 core/src/test/resources/tck-test-files/schema/v2/experimental-schema/directives/private.js.adoc
 create mode 100644 core/src/test/resources/tck-test-files/schema/v2/experimental-schema/directives/relationship-aggregate.js.adoc
 create mode 100644 core/src/test/resources/tck-test-files/schema/v2/experimental-schema/directives/relationship-nested-operations.js.adoc
 create mode 100644 core/src/test/resources/tck-test-files/schema/v2/experimental-schema/interface-relationships.js.adoc
 create mode 100644 core/src/test/resources/tck-test-files/schema/v2/experimental-schema/interfaces/aggregations.js.adoc
 create mode 100644 core/src/test/resources/tck-test-files/schema/v2/experimental-schema/interfaces/typename-in.js.adoc
 create mode 100644 core/src/test/resources/tck-test-files/schema/v2/experimental-schema/math.js.adoc
 create mode 100644 core/src/test/resources/tck-test-files/schema/v2/experimental-schema/nested-aggregation-on-interface.js.adoc
 create mode 100644 core/src/test/resources/tck-test-files/schema/v2/experimental-schema/plural.js.adoc
 create mode 100644 core/src/test/resources/tck-test-files/schema/v2/experimental-schema/subscriptions.js.adoc
 create mode 100644 core/src/test/resources/tck-test-files/schema/v2/extend.js.adoc
 rename core/src/test/resources/{integration-test-files/errors.adoc => tck-test-files/schema/v2/inputs.js.adoc} (84%)
 create mode 100644 core/src/test/resources/tck-test-files/schema/v2/interface-relationships.js.adoc
 create mode 100644 core/src/test/resources/tck-test-files/schema/v2/issues/1038.js.adoc
 create mode 100644 core/src/test/resources/tck-test-files/schema/v2/issues/1614.js.adoc
 create mode 100644 core/src/test/resources/tck-test-files/schema/v2/issues/162.js.adoc
 create mode 100644 core/src/test/resources/tck-test-files/schema/v2/issues/2187.js.adoc
 create mode 100644 core/src/test/resources/tck-test-files/schema/v2/issues/2969.js.adoc
 create mode 100644 core/src/test/resources/tck-test-files/schema/v2/issues/2981.js.adoc
 create mode 100644 core/src/test/resources/tck-test-files/schema/v2/issues/3816.js.adoc
 create mode 100644 core/src/test/resources/tck-test-files/schema/v2/issues/5428.js.adoc
 create mode 100644 core/src/test/resources/tck-test-files/schema/v2/issues/609.js.adoc
 create mode 100644 core/src/test/resources/tck-test-files/schema/v2/lowercase-type-names.js.adoc
 create mode 100644 core/src/test/resources/tck-test-files/schema/v2/math.js.adoc
 create mode 100644 core/src/test/resources/tck-test-files/schema/v2/nested-aggregation-on-type.js.adoc
 create mode 100644 core/src/test/resources/tck-test-files/schema/v2/null.js.adoc
 create mode 100644 core/src/test/resources/tck-test-files/schema/v2/pluralize-consistency.js.adoc
 create mode 100644 core/src/test/resources/tck-test-files/schema/v2/query-direction.js.adoc
 create mode 100644 core/src/test/resources/tck-test-files/schema/v2/remove-deprecated/aggregations.js.adoc
 create mode 100644 core/src/test/resources/tck-test-files/schema/v2/remove-deprecated/array-methods.js.adoc
 create mode 100644 core/src/test/resources/tck-test-files/schema/v2/remove-deprecated/comments.js.adoc
 create mode 100644 core/src/test/resources/tck-test-files/schema/v2/scalar.js.adoc
 create mode 100644 core/src/test/resources/tck-test-files/schema/v2/simple.js.adoc
 create mode 100644 core/src/test/resources/tck-test-files/schema/v2/string-comparators.js.adoc
 create mode 100644 core/src/test/resources/tck-test-files/schema/v2/subscriptions.js.adoc
 create mode 100644 core/src/test/resources/tck-test-files/schema/v2/types/bigint.js.adoc
 create mode 100644 core/src/test/resources/tck-test-files/schema/v2/types/date.js.adoc
 create mode 100644 core/src/test/resources/tck-test-files/schema/v2/types/datetime.js.adoc
 create mode 100644 core/src/test/resources/tck-test-files/schema/v2/types/duration.js.adoc
 create mode 100644 core/src/test/resources/tck-test-files/schema/v2/types/localdatetime.js.adoc
 create mode 100644 core/src/test/resources/tck-test-files/schema/v2/types/localtime.js.adoc
 create mode 100644 core/src/test/resources/tck-test-files/schema/v2/types/point.js.adoc
 create mode 100644 core/src/test/resources/tck-test-files/schema/v2/types/time.js.adoc
 create mode 100644 core/src/test/resources/tck-test-files/schema/v2/unions.js.adoc

diff --git a/.editorconfig b/.editorconfig
index 1525fadc..46940d65 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -411,6 +411,7 @@ ij_asciidoc_blank_lines_after_header = 1
 ij_asciidoc_blank_lines_keep_after_header = 1
 ij_asciidoc_formatting_enabled = true
 ij_asciidoc_one_sentence_per_line = true
+trim_trailing_whitespace = false
 
 [{*.ant,*.fo,*.fxml,*.jhm,*.jnlp,*.jrxml,*.pom,*.qrc,*.rng,*.tld,*.wadl,*.wsdd,*.wsdl,*.xjb,*.xml,*.xsd,*.xsl,*.xslt,*.xul,phpunit.xml.dist}]
 ij_xml_align_attributes = true
diff --git a/.run/AsciidocReformater.run.xml b/.run/AsciidocReformater.run.xml
new file mode 100644
index 00000000..70c82a08
--- /dev/null
+++ b/.run/AsciidocReformater.run.xml
@@ -0,0 +1,11 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="org.neo4j.graphql.tools.AsciidocReformater" type="JetRunConfigurationType" nameIsGenerated="true">
+    <option name="MAIN_CLASS_NAME" value="org.neo4j.graphql.tools.AsciidocReformater" />
+    <module name="neo4j-graphql-java" />
+    <shortenClasspath name="NONE" />
+    <option name="WORKING_DIRECTORY" value="$MODULE_WORKING_DIR$" />
+    <method v="2">
+      <option name="Make" enabled="true" />
+    </method>
+  </configuration>
+</component>
diff --git a/.run/JsTestCaseSync.run.xml b/.run/JsTestCaseSync.run.xml
new file mode 100644
index 00000000..b42b1ff3
--- /dev/null
+++ b/.run/JsTestCaseSync.run.xml
@@ -0,0 +1,11 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="org.neo4j.graphql.tools.JsTestCaseSync" type="JetRunConfigurationType" nameIsGenerated="true">
+    <option name="MAIN_CLASS_NAME" value="org.neo4j.graphql.tools.JsTestCaseSync" />
+    <module name="neo4j-graphql-java" />
+    <shortenClasspath name="NONE" />
+    <option name="WORKING_DIRECTORY" value="$MODULE_WORKING_DIR$" />
+    <method v="2">
+      <option name="Make" enabled="true" />
+    </method>
+  </configuration>
+</component>
diff --git a/.run/Reformat Tests.run.xml b/.run/Reformat Tests.run.xml
deleted file mode 100644
index ed6f4681..00000000
--- a/.run/Reformat Tests.run.xml	
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-    <configuration default="false" name="Reformat Tests" type="JUnit" factoryName="JUnit">
-        <module name="neo4j-graphql-java"/>
-        <option name="MAIN_CLASS_NAME" value=""/>
-        <option name="METHOD_NAME" value=""/>
-        <option name="TEST_OBJECT" value="directory"/>
-        <option name="VM_PARAMETERS" value="-ea -Dneo4j-graphql-java.reformat=true"/>
-        <dir value="$PROJECT_DIR$/core/src/test/kotlin/org/neo4j/graphql"/>
-        <method v="2">
-            <option name="Make" enabled="true"/>
-        </method>
-    </configuration>
-</component>
diff --git a/core/src/test/kotlin/org/neo4j/graphql/asciidoc/AsciiDocParser.kt b/core/src/test/kotlin/org/neo4j/graphql/asciidoc/AsciiDocParser.kt
index 7aba85b5..f4ecac11 100644
--- a/core/src/test/kotlin/org/neo4j/graphql/asciidoc/AsciiDocParser.kt
+++ b/core/src/test/kotlin/org/neo4j/graphql/asciidoc/AsciiDocParser.kt
@@ -1,26 +1,30 @@
 package org.neo4j.graphql.asciidoc
 
-import org.neo4j.graphql.asciidoc.ast.*
 import org.apache.commons.csv.CSVFormat
-import java.io.File
+import org.neo4j.graphql.asciidoc.ast.*
 import java.net.URI
+import java.nio.file.Path
 import java.util.regex.Pattern
 import javax.ws.rs.core.UriBuilder
+import kotlin.io.path.readLines
 
 class AsciiDocParser(
-    fileName: String
+    private val file: Path
 ) {
 
-    private val file = File(AsciiDocParser::class.java.getResource("/$fileName")?.toURI()!!)
-    private val srcLocation = File("src/test/resources/", fileName).toURI()
-
-    private var root = Document(srcLocation)
+    private var root = Document(file.toUri())
     private var currentSection: Section = root
     private var currentDepth: Int = 0
 
-
     fun parse(): Document {
-        val lines = file.readLines()
+        return parseLines(file.readLines())
+    }
+
+    fun parseContent(content: String): Document {
+        return parseLines(content.lines())
+    }
+
+    private fun parseLines(lines: List<String>): Document {
         var title: String?
 
         var insideCodeblock = false
@@ -29,7 +33,7 @@ class AsciiDocParser(
 
         val fileContent = StringBuilder()
 
-        root = Document(srcLocation)
+        root = Document(file.toUri())
         currentSection = root
         currentDepth = 0
         var caption: String? = null
@@ -42,11 +46,6 @@ class AsciiDocParser(
         loop@ for ((lineNr, line) in lines.withIndex()) {
             fileContent.append(line).append('\n')
 
-            if (line.startsWith("#") || line.startsWith("//")) {
-                offset += line.length + 1
-                continue
-            }
-
             val headlineMatcher = HEADLINE_PATTERN.matcher(line)
 
             when {
@@ -55,7 +54,7 @@ class AsciiDocParser(
                     addBlock(content)
                     val depth = headlineMatcher.group(1).length
                     title = headlineMatcher.group(2)
-                    val uri = UriBuilder.fromUri(srcLocation).queryParam("line", lineNr + 1).build()
+                    val uri = uriWithLineNr(lineNr)
                     startSection(title, uri, depth)
                 }
 
@@ -65,10 +64,10 @@ class AsciiDocParser(
 
                 line.startsWith("[%header,format=csv") -> {
                     addBlock(content)
-                    val uri = UriBuilder.fromUri(srcLocation).queryParam("line", lineNr + 1).build()
+                    val uri = uriWithLineNr(lineNr)
 
-                    val parts = line.substring(19, line.indexOf("]")).trim().split(",")
-                    val attributes = parts.slice(0..<parts.size).map {
+                    val parts = line.substring(19, line.indexOf("]")).trim().split(",").filter { it.isNotBlank() }
+                    val attributes = parts.slice(parts.indices).map {
                         val attributeParts = it.split("=")
                         attributeParts[0] to attributeParts.getOrNull(1)
                     }.toMap()
@@ -82,7 +81,7 @@ class AsciiDocParser(
 
                 line.startsWith("[source,") -> {
                     addBlock(content)
-                    val uri = UriBuilder.fromUri(srcLocation).queryParam("line", lineNr + 1).build()
+                    val uri = uriWithLineNr(lineNr)
 
                     val parts = line.substring(8, line.indexOf("]")).trim().split(",")
                     val language = parts[0]
@@ -93,8 +92,6 @@ class AsciiDocParser(
 
                     currentCodeBlock = CodeBlock(uri, language, currentSection, attributes).also {
                         it.caption = caption
-                        it.markerStart = offset
-                        it.markerEnd = offset + line.length
                         currentSection.blocks.add(it)
                     }
                     caption = null
@@ -124,10 +121,8 @@ class AsciiDocParser(
                 line == "----" -> {
                     insideCodeblock = !insideCodeblock
                     if (insideCodeblock) {
-                        currentCodeBlock?.start = offset + line.length + 1
                         content = StringBuilder()
                     } else if (currentCodeBlock != null) {
-                        currentCodeBlock.end = offset
                         currentCodeBlock.content = content.toString().trim()
                         currentCodeBlock = null
                         content = StringBuilder()
@@ -145,10 +140,13 @@ class AsciiDocParser(
         return root
     }
 
+    private fun uriWithLineNr(lineNr: Int): URI =
+        UriBuilder.fromUri(file.toUri()).queryParam("line", lineNr + 1).build()
+
     private fun addBlock(content: StringBuilder) {
         val str = content.toString()
-        if (str.trim().isNotEmpty()) {
-            currentSection.let { it.blocks.add(Block(it, str)) }
+        if (str.isNotBlank()) {
+            currentSection.let { it.blocks.add(Block(it, str.trimEnd())) }
         }
         content.clear()
     }
diff --git a/core/src/test/kotlin/org/neo4j/graphql/asciidoc/ast/Block.kt b/core/src/test/kotlin/org/neo4j/graphql/asciidoc/ast/Block.kt
index 1139335b..61706e81 100644
--- a/core/src/test/kotlin/org/neo4j/graphql/asciidoc/ast/Block.kt
+++ b/core/src/test/kotlin/org/neo4j/graphql/asciidoc/ast/Block.kt
@@ -2,10 +2,14 @@ package org.neo4j.graphql.asciidoc.ast
 
 class Block(
     parent: StructuralNode,
-    val content: String
+    var content: String
 ) : StructuralNode(parent) {
 
     override fun toString(): String {
         return "Block(content='$content')"
     }
+
+    override fun buildContent(contentExtractor: (CodeBlock) -> String): String {
+        return content + "\n"
+    }
 }
diff --git a/core/src/test/kotlin/org/neo4j/graphql/asciidoc/ast/CodeBlock.kt b/core/src/test/kotlin/org/neo4j/graphql/asciidoc/ast/CodeBlock.kt
index 44ec0be9..ce3084dc 100644
--- a/core/src/test/kotlin/org/neo4j/graphql/asciidoc/ast/CodeBlock.kt
+++ b/core/src/test/kotlin/org/neo4j/graphql/asciidoc/ast/CodeBlock.kt
@@ -11,11 +11,6 @@ class CodeBlock(
 
     var caption: String? = null
 
-    var markerStart: Int? = null
-    var markerEnd: Int? = null
-    var start: Int? = null
-    var end: Int? = null
-
     lateinit var content: String
 
     /**
@@ -49,4 +44,15 @@ class CodeBlock(
     fun matches(language: String, filter: Map<String, String?> = emptyMap(), exactly: Boolean = false) =
         this.language == language && filter.all { (k, v) -> attributes[k] == v } && (!exactly || attributes.size == filter.size)
 
+    override fun buildContent(contentExtractor: (CodeBlock) -> String): String {
+        val builder = StringBuilder()
+        caption?.let {
+            builder.append("\n.${it}\n")
+        }
+        builder.append(adjustedMarker)
+        builder.append("\n----\n")
+        builder.append(contentExtractor(this))
+        builder.append("\n----\n")
+        return builder.toString()
+    }
 }
diff --git a/core/src/test/kotlin/org/neo4j/graphql/asciidoc/ast/Document.kt b/core/src/test/kotlin/org/neo4j/graphql/asciidoc/ast/Document.kt
index 5a5252a5..15dc297d 100644
--- a/core/src/test/kotlin/org/neo4j/graphql/asciidoc/ast/Document.kt
+++ b/core/src/test/kotlin/org/neo4j/graphql/asciidoc/ast/Document.kt
@@ -8,4 +8,12 @@ class Document(
 
     lateinit var content: String
 
+    override fun buildContent(contentExtractor: (CodeBlock) -> String): String {
+        val builder = StringBuilder()
+        blocks.forEach {
+            builder.append(it.buildContent(contentExtractor))
+        }
+        return builder.toString()
+    }
+
 }
diff --git a/core/src/test/kotlin/org/neo4j/graphql/asciidoc/ast/Section.kt b/core/src/test/kotlin/org/neo4j/graphql/asciidoc/ast/Section.kt
index 42ab2519..c07e15be 100644
--- a/core/src/test/kotlin/org/neo4j/graphql/asciidoc/ast/Section.kt
+++ b/core/src/test/kotlin/org/neo4j/graphql/asciidoc/ast/Section.kt
@@ -1,5 +1,6 @@
 package org.neo4j.graphql.asciidoc.ast
 
+import org.neo4j.graphql.domain.CodeBlockPredicate
 import java.net.URI
 
 open class Section(
@@ -11,4 +12,75 @@ open class Section(
     override fun toString(): String {
         return "Section(title='$title')"
     }
+
+    override fun buildContent(contentExtractor: (CodeBlock) -> String): String {
+
+        val builder = StringBuilder("\n")
+        var current: Section? = this
+        do {
+            builder.append("=")
+            current = current?.parent
+            if (current is Document && current.blocks.filterIsInstance<Section>().size > 1) {
+                // we are in a document with multiple sections, so we need to add another level to the title
+                builder.append("=")
+            }
+        } while (current != null && current !is Document)
+        builder.append(" ${title}\n")
+        blocks.forEach {
+            builder.append(it.buildContent(contentExtractor))
+        }
+        return builder.toString()
+    }
+
+    /**
+     * Find all directly nested code blocks of a given section matching the language and filter
+     */
+    fun findCodeBlocks(
+        predicate: CodeBlockPredicate,
+    ): List<CodeBlock> =
+        blocks
+            .filterIsInstance<CodeBlock>()
+            .filter { predicate.matches(it) }
+
+    /**
+     * Find a single code block of a given section matching the language and filter
+     */
+    fun findSingleOrNullCodeBlock(
+        predicate: CodeBlockPredicate,
+    ): CodeBlock? =
+        findCodeBlocks(predicate)
+            .also { require(it.size <= 1) { "Found more than one code block matching the predicate" } }
+            .singleOrNull()
+
+    /**
+     * Find all setup blocks for a given section, including the setup blocks of the parent sections
+     */
+    fun findSetupCodeBlocks(
+        predicate: CodeBlockPredicate,
+    ): List<CodeBlock> {
+        val result = mutableListOf<CodeBlock>()
+        var currentSection: Section? = this
+        while (currentSection != null) {
+            result.addAll(currentSection.findCodeBlocks(predicate))
+            currentSection.blocks
+                .filterIsInstance<Section>()
+                .filter { it.title == "Setup" }
+                .forEach { result.addAll(it.findCodeBlocks(predicate)) }
+            currentSection = currentSection.parent
+        }
+        return result
+    }
+
+    fun addAfter(insertPoint: StructuralNode?, node: StructuralNode) {
+        if (insertPoint == null) {
+            blocks.add(node)
+        } else {
+            val index = blocks.indexOf(insertPoint)
+            if (index == -1) {
+                blocks.add(node)
+            } else {
+                blocks.add(index + 1, node)
+            }
+        }
+    }
 }
diff --git a/core/src/test/kotlin/org/neo4j/graphql/asciidoc/ast/StructuralNode.kt b/core/src/test/kotlin/org/neo4j/graphql/asciidoc/ast/StructuralNode.kt
index 26273b2d..930b3fc7 100644
--- a/core/src/test/kotlin/org/neo4j/graphql/asciidoc/ast/StructuralNode.kt
+++ b/core/src/test/kotlin/org/neo4j/graphql/asciidoc/ast/StructuralNode.kt
@@ -4,4 +4,6 @@ sealed class StructuralNode(
     open val parent: StructuralNode?
 ) {
     val blocks = mutableListOf<StructuralNode>()
+
+    abstract fun buildContent(contentExtractor: (CodeBlock) -> String): String
 }
diff --git a/core/src/test/kotlin/org/neo4j/graphql/asciidoc/ast/Table.kt b/core/src/test/kotlin/org/neo4j/graphql/asciidoc/ast/Table.kt
index 51cfb98e..b113086b 100644
--- a/core/src/test/kotlin/org/neo4j/graphql/asciidoc/ast/Table.kt
+++ b/core/src/test/kotlin/org/neo4j/graphql/asciidoc/ast/Table.kt
@@ -16,4 +16,22 @@ class Table(
     var start: Int? = null
     var end: Int? = null
 
+    override fun buildContent(contentExtractor: (CodeBlock) -> String): String {
+        val builder = StringBuilder()
+        caption?.let {
+            builder.append("\n.${it}\n")
+        }
+        builder.append("[%header,format=csv")
+        attributes.forEach { (k, v) ->
+            builder.append(",${k}=${v}")
+        }
+        builder.append("]\n|===\n")
+        builder.append(records.first().parser.headerNames.joinToString(",")).append("\n")
+        records.forEach { record ->
+            builder.append(record.joinToString(",")).append("\n")
+        }
+        builder.append("|===\n")
+        return builder.toString()
+    }
+
 }
diff --git a/core/src/test/kotlin/org/neo4j/graphql/asciidoc/ast/ThematicBreak.kt b/core/src/test/kotlin/org/neo4j/graphql/asciidoc/ast/ThematicBreak.kt
index 33572e33..7a90e350 100644
--- a/core/src/test/kotlin/org/neo4j/graphql/asciidoc/ast/ThematicBreak.kt
+++ b/core/src/test/kotlin/org/neo4j/graphql/asciidoc/ast/ThematicBreak.kt
@@ -1,3 +1,8 @@
 package org.neo4j.graphql.asciidoc.ast
 
-class ThematicBreak: StructuralNode(null)
+class ThematicBreak: StructuralNode(null) {
+
+    override fun buildContent(contentExtractor: (CodeBlock) -> String): String {
+        return "\n'''\n"
+    }
+}
diff --git a/core/src/test/kotlin/org/neo4j/graphql/domain/CodeBlockPredicate.kt b/core/src/test/kotlin/org/neo4j/graphql/domain/CodeBlockPredicate.kt
new file mode 100644
index 00000000..1bd4d29a
--- /dev/null
+++ b/core/src/test/kotlin/org/neo4j/graphql/domain/CodeBlockPredicate.kt
@@ -0,0 +1,28 @@
+package org.neo4j.graphql.domain
+
+import org.neo4j.graphql.asciidoc.ast.CodeBlock
+
+
+class CodeBlockPredicate private constructor(
+    private val language: String,
+    private val filter: Map<String, String?> = emptyMap(),
+    private val exactly: Boolean = false
+) {
+
+    fun matches(codeBlock: CodeBlock) = codeBlock.matches(language, filter, exactly)
+
+    companion object {
+        val CYPHER = CodeBlockPredicate("cypher", exactly = true)
+        val CYPHER_PARAMS = CodeBlockPredicate("json", exactly = true)
+        val GRAPHQL_SOURCE_SCHEMA = CodeBlockPredicate("graphql", mapOf("schema" to "true"))
+        val GRAPHQL_AUGMENTED_SCHEMA = CodeBlockPredicate("graphql", mapOf("augmented" to "true"))
+        val GRAPHQL_REQUEST = CodeBlockPredicate("graphql", mapOf("request" to "true"))
+        val GRAPHQL_REQUEST_VARIABLES = CodeBlockPredicate("json", mapOf("request" to "true"))
+        val GRAPHQL_RESPONSE = CodeBlockPredicate("json", mapOf("response" to "true"))
+        val QUERY_CONFIG = CodeBlockPredicate("json", mapOf("query-config" to "true"))
+        val SCHEMA_CONFIG = CodeBlockPredicate("json", mapOf("schema-config" to "true"))
+        val TEST_DATA = CodeBlockPredicate("cypher", mapOf("test-data" to "true"))
+        val CUSTOM_RESOLVER = CodeBlockPredicate("kotlin")
+    }
+
+}
diff --git a/core/src/test/kotlin/org/neo4j/graphql/domain/TestCase.kt b/core/src/test/kotlin/org/neo4j/graphql/domain/TestCase.kt
new file mode 100644
index 00000000..a7b0fbeb
--- /dev/null
+++ b/core/src/test/kotlin/org/neo4j/graphql/domain/TestCase.kt
@@ -0,0 +1,67 @@
+package org.neo4j.graphql.domain
+
+import org.neo4j.graphql.asciidoc.ast.CodeBlock
+import org.neo4j.graphql.asciidoc.ast.Section
+import org.neo4j.graphql.asciidoc.ast.Table
+import org.neo4j.graphql.domain.CodeBlockPredicate.Companion.CUSTOM_RESOLVER
+import org.neo4j.graphql.domain.CodeBlockPredicate.Companion.CYPHER
+import org.neo4j.graphql.domain.CodeBlockPredicate.Companion.CYPHER_PARAMS
+import org.neo4j.graphql.domain.CodeBlockPredicate.Companion.GRAPHQL_AUGMENTED_SCHEMA
+import org.neo4j.graphql.domain.CodeBlockPredicate.Companion.GRAPHQL_REQUEST
+import org.neo4j.graphql.domain.CodeBlockPredicate.Companion.GRAPHQL_REQUEST_VARIABLES
+import org.neo4j.graphql.domain.CodeBlockPredicate.Companion.GRAPHQL_RESPONSE
+import org.neo4j.graphql.domain.CodeBlockPredicate.Companion.GRAPHQL_SOURCE_SCHEMA
+import org.neo4j.graphql.domain.CodeBlockPredicate.Companion.QUERY_CONFIG
+import org.neo4j.graphql.domain.CodeBlockPredicate.Companion.SCHEMA_CONFIG
+import org.neo4j.graphql.domain.CodeBlockPredicate.Companion.TEST_DATA
+import kotlin.reflect.KMutableProperty1
+
+data class TestCase(
+    val setup: Setup,
+    var cypher: CodeBlock? = null,
+    var cypherParams: CodeBlock? = null,
+    var graphqlRequest: CodeBlock? = null,
+    var graphqlRequestVariables: CodeBlock? = null,
+    var graphqlResponse: CodeBlock? = null,
+    var graphqlResponseAssertions: Table? = null,
+    var queryConfig: CodeBlock? = null,
+    var augmentedSchema: CodeBlock? = null,
+) {
+
+    data class Setup(
+        val schema: CodeBlock?,
+        val schemaConfig: CodeBlock?,
+        val testData: List<CodeBlock>,
+        val customResolver: CodeBlock?,
+    ) {
+        constructor(section: Section) : this(
+            section.findSetupCodeBlocks(GRAPHQL_SOURCE_SCHEMA).firstOrNull(),
+            section.findSetupCodeBlocks(SCHEMA_CONFIG).firstOrNull(),
+            section.findSetupCodeBlocks(TEST_DATA),
+            section.findSetupCodeBlocks(CUSTOM_RESOLVER).firstOrNull()
+        )
+    }
+
+    fun parseCodeBlock(codeBlock: CodeBlock) {
+        when {
+            CYPHER.matches(codeBlock) -> init(codeBlock, TestCase::cypher)
+            CYPHER_PARAMS.matches(codeBlock) -> init(codeBlock, TestCase::cypherParams)
+            GRAPHQL_REQUEST.matches(codeBlock) -> init(codeBlock, TestCase::graphqlRequest)
+            GRAPHQL_REQUEST_VARIABLES.matches(codeBlock) -> init(codeBlock, TestCase::graphqlRequestVariables)
+            GRAPHQL_RESPONSE.matches(codeBlock) -> init(codeBlock, TestCase::graphqlResponse)
+            QUERY_CONFIG.matches(codeBlock) -> init(codeBlock, TestCase::queryConfig)
+            GRAPHQL_AUGMENTED_SCHEMA.matches(codeBlock) -> init(codeBlock, TestCase::augmentedSchema)
+        }
+    }
+
+    fun parseTable(table: Table) {
+        if (table.attributes.containsKey("response")) {
+            graphqlResponseAssertions = table
+        }
+    }
+
+    private fun <V> init(current: V, prop: KMutableProperty1<TestCase, V?>) {
+        check(prop.get(this) == null) { "Only one ${prop.name} block is allowed per test case" }
+        prop.set(this, current)
+    }
+}
diff --git a/core/src/test/kotlin/org/neo4j/graphql/factories/AsciiDocTestFactory.kt b/core/src/test/kotlin/org/neo4j/graphql/factories/AsciiDocTestFactory.kt
index b2f42ce6..190e9e5e 100644
--- a/core/src/test/kotlin/org/neo4j/graphql/factories/AsciiDocTestFactory.kt
+++ b/core/src/test/kotlin/org/neo4j/graphql/factories/AsciiDocTestFactory.kt
@@ -1,52 +1,28 @@
 package org.neo4j.graphql.factories
 
-import com.fasterxml.jackson.core.JsonGenerator
-import com.fasterxml.jackson.databind.JsonSerializer
-import com.fasterxml.jackson.databind.ObjectMapper
-import com.fasterxml.jackson.databind.SerializerProvider
-import com.fasterxml.jackson.databind.module.SimpleModule
-import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule
-import com.fasterxml.jackson.module.kotlin.registerKotlinModule
 import com.intellij.rt.execution.junit.FileComparisonFailure
 import org.junit.jupiter.api.DynamicContainer
 import org.junit.jupiter.api.DynamicNode
 import org.junit.jupiter.api.DynamicTest
 import org.neo4j.graphql.asciidoc.AsciiDocParser
 import org.neo4j.graphql.asciidoc.ast.*
-import java.io.File
-import java.io.FileWriter
-import java.time.temporal.TemporalAmount
+import org.neo4j.graphql.domain.TestCase
+import org.neo4j.graphql.domain.TestCase.Setup
+import org.neo4j.graphql.utils.TestUtils
+import java.nio.file.Path
 import java.util.*
 import java.util.stream.Stream
-import kotlin.reflect.KMutableProperty1
+import kotlin.io.path.writeText
 
 /**
- * @param fileName the name of the test file
- * @param relevantBlocks a list of pairs of filter functions and properties to set the found code blocks
+ * @param file the test file
  */
-abstract class AsciiDocTestFactory<T>(
-    protected val fileName: String,
-    private val relevantBlocks: List<CodeBlockMatcher<T>>,
+abstract class AsciiDocTestFactory(
+    protected val file: Path,
     private val createMissingBlocks: Boolean = true
 ) {
 
-    abstract class CodeBlockMatcher<T>(
-        val language: String,
-        val filter: Map<String, String?> = emptyMap(),
-        val exactly: Boolean = false
-    ) {
-        abstract fun set(testData: T, codeBlock: CodeBlock)
-    }
-
-
-    protected val srcLocation = File("src/test/resources/", fileName).toURI()
-
-    private val document = AsciiDocParser(fileName).parse()
-
-    /**
-     * all parsed code blocks of the test file
-     */
-    private val knownBlocks = collectBlocks(document).toMutableList()
+    private val document = AsciiDocParser(file).parse()
 
     fun generateTests(): Stream<DynamicNode> {
         val tests = createTestsOfSection(document).toMutableList()
@@ -55,54 +31,37 @@ abstract class AsciiDocTestFactory<T>(
             // this test prints out the adjusted test file
             tests += DynamicTest.dynamicTest(
                 "Write updated Testfile",
-                srcLocation,
+                file.toUri(),
                 this@AsciiDocTestFactory::writeAdjustedTestFile
             )
-        } else if (REFORMAT_TEST_FILE) {
-            tests += DynamicTest.dynamicTest(
-                "Reformat Testfile",
-                srcLocation,
-                this@AsciiDocTestFactory::reformatTestFile
-            )
         } else if (GENERATE_TEST_FILE_DIFF) {
             // this test prints out the adjusted test file
             tests += DynamicTest.dynamicTest(
                 "Adjusted Tests",
-                srcLocation,
+                file.toUri(),
                 this@AsciiDocTestFactory::printAdjustedTestFile
             )
         }
 
-        addAdditionalTests(tests)
-
-        return if (FLATTEN_TESTS) flatten(tests.stream(), "$fileName:") else tests.stream()
-    }
-
-    open fun addAdditionalTests(tests: MutableList<DynamicNode>) {
+        return if (FLATTEN_TESTS) {
+            val relativeFile = Path.of(TestUtils.TEST_RESOURCES).relativize(file)
+            flatten(tests.stream(), "$relativeFile:")
+        } else {
+            tests.stream()
+        }
     }
 
     private fun createTestsOfSection(section: Section, parentIgnoreReason: String? = null): List<DynamicNode> {
 
         val tests = mutableListOf<DynamicNode>()
-        var testCase = createTestCase(section)
+        val setup = Setup(section)
+        var testCase = TestCase(setup)
         var ignoreReason: String? = null
         for (node in section.blocks) {
             when (node) {
-                is CodeBlock -> {
-                    for (matcher in relevantBlocks) {
-                        if (testCase != null && node.matches(matcher.language, matcher.filter, matcher.exactly)) {
-                            matcher.set(testCase, node)
-                        }
-                    }
+                is CodeBlock -> testCase.parseCodeBlock(node)
 
-
-                }
-
-                is Table -> {
-                    if (testCase != null) {
-                        setTableData(testCase, node)
-                    }
-                }
+                is Table -> testCase.parseTable(node)
 
                 is Block -> {
                     val blockContent = node.content.trim()
@@ -112,11 +71,9 @@ abstract class AsciiDocTestFactory<T>(
                 }
 
                 is ThematicBreak -> {
-                    if (testCase != null) {
-                        tests += createTests(testCase, section, ignoreReason ?: parentIgnoreReason)
-                    }
+                    tests += createTests(testCase, section, ignoreReason ?: parentIgnoreReason)
                     ignoreReason = null
-                    testCase = createTestCase(section) ?: continue
+                    testCase = TestCase(setup)
                 }
 
                 is Section -> {
@@ -127,17 +84,12 @@ abstract class AsciiDocTestFactory<T>(
                 }
             }
         }
-        if (testCase != null) {
-            tests += createTests(testCase, section, ignoreReason ?: parentIgnoreReason)
-        }
+        tests += createTests(testCase, section, ignoreReason ?: parentIgnoreReason)
         return tests
     }
 
-    abstract fun createTestCase(section: Section): T?
-
-    abstract fun createTests(testCase: T, section: Section, ignoreReason: String?): List<DynamicNode>
 
-    open fun setTableData(testCase: T, table: Table) {}
+    abstract fun createTests(testCase: TestCase, section: Section, ignoreReason: String?): List<DynamicNode>
 
     private fun flatten(stream: Stream<out DynamicNode>, name: String): Stream<DynamicNode> {
         return stream.flatMap {
@@ -149,28 +101,16 @@ abstract class AsciiDocTestFactory<T>(
         }
     }
 
-    private fun collectBlocks(node: StructuralNode): List<CodeBlock> {
-        return when (node) {
-            is CodeBlock -> listOf(node)
-            else -> node.blocks.flatMap { collectBlocks(it) }
-        }
-    }
-
     private fun writeAdjustedTestFile() {
-        val content = generateAdjustedFileContent(
-            { it.generatedContent },
-            { !UPDATE_SEMANTIC_EQUALLY_BLOCKS || (it.semanticEqual && (it.tandemUpdate?.semanticEqual ?: true)) }
-        )
-        FileWriter(File("src/test/resources/", fileName)).use {
-            it.write(content)
+        val content = generateAdjustedFileContent {
+            if (UPDATE_SEMANTIC_EQUALLY_BLOCKS && it.semanticEqual && (it.tandemUpdate?.semanticEqual != false))
+                it.generatedContent
+            else
+                it.content
+            it.generatedContent ?: it.content
         }
-    }
 
-    private fun reformatTestFile() {
-        val content = generateAdjustedFileContent({ it.reformattedContent })
-        FileWriter(File("src/test/resources/", fileName)).use {
-            it.write(content)
-        }
+        file.writeText(content)
     }
 
     private fun printAdjustedTestFile() {
@@ -179,34 +119,14 @@ abstract class AsciiDocTestFactory<T>(
             // This special exception will be handled by intellij so that you can diff directly with the file
             throw FileComparisonFailure(
                 null, document.content, rebuildTest,
-                File("src/test/resources/", fileName).absolutePath, null
+                file.toFile().absolutePath, null
             )
         }
     }
 
     protected fun generateAdjustedFileContent(
-        extractor: (CodeBlock) -> String? = { it.generatedContent },
-        matcher: (CodeBlock) -> Boolean = { extractor(it) != null }
-    ): String {
-        knownBlocks.sortWith(compareByDescending { it.start })
-        val rebuildTest = StringBuffer(document.content)
-        knownBlocks.filter { matcher(it) }
-            .forEach { block ->
-                val start = block.start ?: error("unknown start position")
-                if (block.end == null) {
-                    rebuildTest.insert(
-                        start,
-                        ".${block.caption}\n${block.adjustedMarker}\n----\n${extractor(block)}\n----\n\n"
-                    )
-                } else {
-                    rebuildTest.replace(start, block.end!!, extractor(block) + "\n")
-                    if (block.markerStart != null) {
-                        rebuildTest.replace(block.markerStart!!, block.markerEnd!!, block.adjustedMarker)
-                    }
-                }
-            }
-        return rebuildTest.toString()
-    }
+        extractor: (CodeBlock) -> String = { it.generatedContent ?: it.content },
+    ): String = document.buildContent(extractor)
 
     fun createCodeBlock(
         insertPoint: CodeBlock,
@@ -222,8 +142,7 @@ abstract class AsciiDocTestFactory<T>(
                 caption = headline
                 content = ""
             }
-        codeBlock.start = (insertPoint.end ?: error("no start for block defined")) + 6
-        knownBlocks += codeBlock
+        insertPoint.parent.addAfter(insertPoint, codeBlock)
         return codeBlock
     }
 
@@ -234,89 +153,9 @@ abstract class AsciiDocTestFactory<T>(
         val FLATTEN_TESTS = System.getProperty("neo4j-graphql-java.flatten-tests", "false") == "true"
         val GENERATE_TEST_FILE_DIFF =
             System.getProperty("neo4j-graphql-java.generate-test-file-diff", "false") == "true"
-        val REFORMAT_TEST_FILE = System.getProperty("neo4j-graphql-java.reformat", "false") == "true"
         val UPDATE_TEST_FILE = System.getProperty("neo4j-graphql-java.update-test-file", "false") == "true"
         val UPDATE_SEMANTIC_EQUALLY_BLOCKS =
             System.getProperty("neo4j-graphql-java.update-semantic-equally-blocks", "false") == "true"
-        val MAPPER = ObjectMapper()
-            .registerKotlinModule()
-            .registerModules(JavaTimeModule())
-            .registerModule(
-                SimpleModule().addSerializer(
-                    TemporalAmount::class.java,
-                    object : JsonSerializer<TemporalAmount?>() {
-                        override fun serialize(
-                            value: TemporalAmount?,
-                            gen: JsonGenerator?,
-                            serializers: SerializerProvider?
-                        ) {
-                            gen?.writeString(value.toString())
-                        }
-                    })
-            )
-            .disable(com.fasterxml.jackson.databind.SerializationFeature.WRITE_DATES_AS_TIMESTAMPS)
-            .disable(com.fasterxml.jackson.databind.SerializationFeature.WRITE_DURATIONS_AS_TIMESTAMPS)
-
-
-        fun String.parseJsonMap(): Map<String, Any?> = this.let {
-            @Suppress("UNCHECKED_CAST")
-            MAPPER.readValue(this, Map::class.java) as Map<String, Any?>
-        }
-
-
-        /**
-         * Find all directly nested code blocks of a given section matching the language and filter
-         */
-        private fun findCodeBlocks(
-            section: Section,
-            language: String,
-            filter: Map<String, String?> = emptyMap()
-        ): List<CodeBlock> =
-            section.blocks
-                .filterIsInstance<CodeBlock>()
-                .filter { it.matches(language, filter) }
-
-        /**
-         * Find all setup blocks for a given section, including the setup blocks of the parent sections
-         */
-        fun findSetupCodeBlocks(
-            section: Section,
-            language: String,
-            fiter: Map<String, String?> = emptyMap()
-        ): List<CodeBlock> {
-            val result = mutableListOf<CodeBlock>()
-            var currentSection: Section? = section
-            while (currentSection != null) {
-                result.addAll(findCodeBlocks(currentSection, language, fiter))
-                currentSection.blocks
-                    .filterIsInstance<Section>()
-                    .filter { it.title == "Setup" }
-                    .forEach { result.addAll(findCodeBlocks(it, language, fiter)) }
-                currentSection = currentSection.parent
-            }
-            return result
-        }
-
-        fun <T> matcher(
-            language: String,
-            filter: Map<String, String?> = emptyMap(),
-            exactly: Boolean = false,
-            setter: KMutableProperty1<T, CodeBlock?>
-        ): CodeBlockMatcher<T> =
-            matcher(language, filter, exactly) { testData, codeBlock -> setter.set(testData, codeBlock) }
-
-        fun <T> matcher(
-            language: String,
-            filter: Map<String, String?> = emptyMap(),
-            exactly: Boolean = false,
-            setter: (T, CodeBlock) -> Unit
-        ): CodeBlockMatcher<T> =
-            object : CodeBlockMatcher<T>(language, filter, exactly) {
-                override fun set(testData: T, codeBlock: CodeBlock) {
-                    setter(testData, codeBlock)
-                }
-            }
-
     }
 
 }
diff --git a/core/src/test/kotlin/org/neo4j/graphql/factories/CypherTestFactory.kt b/core/src/test/kotlin/org/neo4j/graphql/factories/CypherTestFactory.kt
index 036fafe0..1ca023e1 100644
--- a/core/src/test/kotlin/org/neo4j/graphql/factories/CypherTestFactory.kt
+++ b/core/src/test/kotlin/org/neo4j/graphql/factories/CypherTestFactory.kt
@@ -1,7 +1,5 @@
 package org.neo4j.graphql.factories
 
-import com.fasterxml.jackson.module.kotlin.readValue
-import com.jayway.jsonpath.JsonPath
 import graphql.ExceptionWhileDataFetching
 import graphql.ExecutionInput
 import graphql.GraphQL
@@ -12,98 +10,45 @@ import graphql.schema.FieldCoordinates
 import graphql.schema.GraphQLCodeRegistry
 import graphql.schema.GraphQLSchema
 import org.assertj.core.api.Assertions
-import org.assertj.core.api.InstanceOfAssertFactories
 import org.junit.jupiter.api.Assumptions
 import org.junit.jupiter.api.DynamicNode
 import org.junit.jupiter.api.DynamicTest
-import org.neo4j.cypherdsl.core.renderer.Configuration
-import org.neo4j.cypherdsl.core.renderer.Dialect
-import org.neo4j.cypherdsl.core.renderer.Renderer
-import org.neo4j.cypherdsl.parser.CypherParser
-import org.neo4j.cypherdsl.parser.Options
 import org.neo4j.driver.Driver
 import org.neo4j.graphql.QueryContext
 import org.neo4j.graphql.SchemaBuilder
 import org.neo4j.graphql.SchemaConfig
 import org.neo4j.graphql.asciidoc.ast.CodeBlock
 import org.neo4j.graphql.asciidoc.ast.Section
-import org.neo4j.graphql.asciidoc.ast.Table
 import org.neo4j.graphql.custom_resolver.TestDataFetcher
+import org.neo4j.graphql.domain.TestCase
 import org.neo4j.graphql.driver.adapter.Neo4jAdapter
 import org.neo4j.graphql.driver.adapter.Neo4jDriverAdapter
-import org.neo4j.graphql.scalars.TemporalScalar
-import org.neo4j.graphql.utils.InvalidQueryException
+import org.neo4j.graphql.utils.Assertions.assertCypherParams
+import org.neo4j.graphql.utils.Assertions.assertEqualIgnoreOrder
+import org.neo4j.graphql.utils.Assertions.assertWithJsonPath
+import org.neo4j.graphql.utils.CypherUtils
+import org.neo4j.graphql.utils.JsonUtils
+import org.neo4j.graphql.utils.TestUtils.TEST_RESOURCES
 import org.opentest4j.AssertionFailedError
-import org.threeten.extra.PeriodDuration
 import java.io.File
-import java.io.FileWriter
-import java.math.BigInteger
-import java.time.*
-import java.time.format.DateTimeFormatter
-import java.time.format.DateTimeParseException
-import java.time.temporal.TemporalAccessor
+import java.nio.file.Path
 import java.util.*
 import java.util.concurrent.FutureTask
-import java.util.function.Consumer
 import kotlin.reflect.full.findAnnotation
 
-class CypherTestFactory(fileName: String, val driver: Driver? = null, createMissingBlocks: Boolean = true) :
-    AsciiDocTestFactory<CypherTestFactory.TestCase>(
-        fileName,
-        listOf(
-            matcher("cypher", exactly = true) { t, c -> t.cypher.add(c) },
-            matcher("json", exactly = true) { t, c -> t.cypherParams.add(c) },
-            matcher("graphql", exactly = true, setter = TestCase::graphqlRequest),
-            matcher("json", mapOf("request" to "true"), setter = TestCase::graphqlRequestVariables),
-            matcher("json", mapOf("response" to "true"), setter = TestCase::graphqlResponse),
-            matcher("json", mapOf("query-config" to "true"), setter = TestCase::queryConfig),
-        ),
-        createMissingBlocks,
-    ) {
+class CypherTestFactory(file: Path, private val driver: Driver? = null, createMissingBlocks: Boolean = true) :
+    AsciiDocTestFactory(file, createMissingBlocks) {
 
-    data class TestCase(
-        var schema: CodeBlock,
-        var schemaConfig: CodeBlock?,
-        var testData: List<CodeBlock>,
-        var customResolver: CodeBlock?,
-        var cypher: MutableList<CodeBlock> = mutableListOf(),
-        var cypherParams: MutableList<CodeBlock> = mutableListOf(),
-        var graphqlRequest: CodeBlock? = null,
-        var graphqlRequestVariables: CodeBlock? = null,
-        var graphqlResponse: CodeBlock? = null,
-        var graphqlResponseAssertions: Table? = null,
-        var queryConfig: CodeBlock? = null,
-    )
+    constructor(file: String, driver: Driver?) : this(Path.of(TEST_RESOURCES, file), driver)
 
     data class CypherResult(val query: String, val params: Map<String, Any?>)
 
-    override fun createTestCase(section: Section): TestCase? {
-        val schema = findSetupCodeBlocks(section, "graphql", mapOf("schema" to "true")).firstOrNull() ?: return null
-        val schemaConfig = findSetupCodeBlocks(section, "json", mapOf("schema-config" to "true")).firstOrNull()
-        val testData = findSetupCodeBlocks(section, "cypher", mapOf("test-data" to "true"))
-        val customResolver = findSetupCodeBlocks(section, "kotlin").firstOrNull()
-
-        return TestCase(schema, schemaConfig, testData, customResolver)
-    }
-
-    override fun setTableData(testCase: TestCase, table: Table) {
-        if (table.attributes.containsKey("response")) {
-            testCase.graphqlResponseAssertions = table
-        }
-    }
-
-    override fun addAdditionalTests(tests: MutableList<DynamicNode>) {
-        if (ADD_IGNORE_ORDER_TO_INTEGRATION_TESTS) {
-            tests += DynamicTest.dynamicTest("Create ignore-order", srcLocation, this::reformatMarker)
-        }
-    }
-
     override fun createTests(testCase: TestCase, section: Section, ignoreReason: String?): List<DynamicNode> {
-        if (testCase.graphqlRequest == null) {
+        if (testCase.graphqlRequest == null || testCase.setup.schema == null) {
             return emptyList()
         }
         if (ignoreReason != null) {
-            return listOf(DynamicTest.dynamicTest("Test Cypher", testCase.cypher.firstOrNull()?.uri) {
+            return listOf(DynamicTest.dynamicTest("Test Cypher", testCase.cypher?.uri) {
                 Assumptions.assumeFalse(true) { ignoreReason }
             })
         }
@@ -112,23 +57,12 @@ class CypherTestFactory(fileName: String, val driver: Driver? = null, createMiss
 
         val tests = mutableListOf<DynamicNode>()
 
-        if (ADD_IGNORE_ORDER_TO_INTEGRATION_TESTS) {
-            val hasOrder = testCase.cypher.any { it.content.contains("ORDER BY") }
-            val graphqlResponse = testCase.graphqlResponse
-            if (!hasOrder && graphqlResponse != null
-                && hasArrayWithMoreThenOneItems(MAPPER.readValue<Any>(graphqlResponse.content))
-            ) {
-                graphqlResponse.adjustedAttributes = graphqlResponse.attributes.toMutableMap()
-                    .also { it["ignore-order"] = null }
-            }
-        }
-
         if (DEBUG) {
             tests.add(printGeneratedQuery(result))
             tests.add(printReplacedParameter(result))
         }
         if (driver != null) {
-            val testData = testCase.testData.firstOrNull()
+            val testData = testCase.setup.testData.firstOrNull()
             val responseAssertions = testCase.graphqlResponseAssertions
             var response = testCase.graphqlResponse
             if (responseAssertions == null && response == null) {
@@ -140,67 +74,23 @@ class CypherTestFactory(fileName: String, val driver: Driver? = null, createMiss
                 tests.add(integrationTest(section.title, testCase))
             }
         }
-        if (REFORMAT_TEST_FILE) {
-            testCase.cypher.forEach { cypher ->
-                val statement = CypherParser.parse(cypher.content, Options.defaultOptions())
-                val query = Renderer.getRenderer(
-                    Configuration
-                        .newConfig()
-                        .withDialect(Dialect.NEO4J_5)
-                        .withIndentStyle(Configuration.IndentStyle.TAB)
-                        .withPrettyPrint(true)
-                        .build()
-                ).render(statement)
-                cypher.reformattedContent = query
-            }
-
-            (testCase.cypherParams.takeIf { it.isNotEmpty() }
-                ?: createCodeBlock(testCase.cypher.first(), "json", "Cypher Params")?.let { listOf(it) }
-                ?: emptyList())
-                .filter { it.content.isNotBlank() }
-                .forEach { params ->
-                    val cypherParams = params.content.parseJsonMap()
-                    params.reformattedContent = MAPPER
-                        .writerWithDefaultPrettyPrinter()
-                        .writeValueAsString(cypherParams.toSortedMap())
-                }
-        }
-
-        tests.addAll(testCypher(section.title, testCase.cypher, result))
-        tests.addAll(testCypherParams(testCase.cypher, testCase.cypherParams, result))
 
+        testCypher(testCase.cypher, result)?.let { tests.add(it) }
+        testCypherParams(testCase.cypher, testCase.cypherParams, result)?.let { tests.add(it) }
         return tests
     }
 
-    private fun hasArrayWithMoreThenOneItems(value: Any): Boolean {
-        when (value) {
-            is Map<*, *> -> {
-                return value.any {
-                    val mapValue = it.value
-                    mapValue != null && hasArrayWithMoreThenOneItems(mapValue)
-                }
-            }
-
-            is Collection<*> -> {
-                return value.size > 1 || value.filterNotNull().any { hasArrayWithMoreThenOneItems(it) }
-            }
-        }
-        return false
-    }
-
     private fun createSchema(
-        schemaBlock: CodeBlock,
-        schemaConfigBlock: CodeBlock?,
-        customResolver: CodeBlock?,
+        setup: TestCase.Setup,
         neo4jAdapter: Neo4jAdapter = Neo4jAdapter.NO_OP
     ): GraphQLSchema {
-        val schemaString = schemaBlock.content
-        val schemaConfig = schemaConfigBlock?.content
-            ?.let { return@let MAPPER.readValue(it, SchemaConfig::class.java) }
+        val schemaString = setup.schema?.content ?: error("missing schema")
+        val schemaConfig = setup.schemaConfig?.content
+            ?.let { return@let JsonUtils.parseJson<SchemaConfig>(it) }
             ?: SchemaConfig()
         val codeRegistryBuilder = GraphQLCodeRegistry.newCodeRegistry()
 
-        customResolver?.let { registerTestResolver(it, codeRegistryBuilder) }
+        setup.customResolver?.let { registerTestResolver(it, codeRegistryBuilder) }
 
         return SchemaBuilder.fromSchema(schemaString, schemaConfig)
             .withNeo4jAdapter(neo4jAdapter)
@@ -216,9 +106,8 @@ class CypherTestFactory(fileName: String, val driver: Driver? = null, createMiss
         if (path == customResolver.content) {
             error("Custom resolver must be an include statement")
         }
-        val resolvedFile = srcLocation.resolve(path)
-        val className = File(resolvedFile)
-            .toRelativeString(File("src/test/kotlin").absoluteFile)
+        val resolvedFile = file.toUri().resolve(path)
+        val className = File(resolvedFile).toRelativeString(File("src/test/kotlin").absoluteFile)
             .replace(".kt", "")
             .replace("/", ".")
 
@@ -231,40 +120,33 @@ class CypherTestFactory(fileName: String, val driver: Driver? = null, createMiss
         }
     }
 
-    private fun createTransformationTask(testCase: TestCase): () -> List<CypherResult> {
+    private fun createTransformationTask(testCase: TestCase): () -> CypherResult {
         val transformationTask = FutureTask {
 
             val cypherResults = mutableListOf<CypherResult>()
 
-            val schema =
-                createSchema(
-                    testCase.schema,
-                    testCase.schemaConfig,
-                    testCase.customResolver,
-                    object : Neo4jAdapter {
+            val schema = createSchema(testCase.setup, object : Neo4jAdapter {
 
-                        override fun getDialect(): Neo4jAdapter.Dialect = Neo4jAdapter.Dialect.NEO4J_5
+                override fun getDialect(): Neo4jAdapter.Dialect = Neo4jAdapter.Dialect.NEO4J_5
 
-                        override fun executeQuery(
-                            cypher: String,
-                            params: Map<String, Any?>
-                        ): List<Map<String, Any?>> {
-                            cypherResults.add(CypherResult(cypher, params))
-                            return emptyList()
-                        }
-                    })
+                override fun executeQuery(
+                    cypher: String,
+                    params: Map<String, Any?>
+                ): List<Map<String, Any?>> {
+                    cypherResults.add(CypherResult(cypher, params))
+                    return emptyList()
+                }
+            })
 
             val request = testCase.graphqlRequest!!.content
 
-            val requestParams = testCase.graphqlRequestVariables?.content?.parseJsonMap()
+            val requestParams = testCase.graphqlRequestVariables?.content
+                ?.let { JsonUtils.parseJson<Map<String, Any?>>(it) }
                 ?: emptyMap()
 
             val queryContext = testCase.queryConfig?.content
                 ?.let<String, QueryContext?> { config ->
-                    return@let MAPPER.readValue(
-                        config,
-                        QueryContext::class.java
-                    )
+                    return@let JsonUtils.parseJson<QueryContext>(config)
                 }
                 ?: QueryContext()
 
@@ -285,7 +167,7 @@ class CypherTestFactory(fileName: String, val driver: Driver? = null, createMiss
                     is GraphQLError -> throw InvalidQueryException(it)
                 }
             }
-            cypherResults
+            cypherResults.single()
         }
         return {
             transformationTask.run()
@@ -293,14 +175,12 @@ class CypherTestFactory(fileName: String, val driver: Driver? = null, createMiss
         }
     }
 
-    private fun printGeneratedQuery(result: () -> List<CypherResult>): DynamicTest =
-        DynamicTest.dynamicTest("Generated query") {
-            result().forEach { println(it) }
-        }
+    private fun printGeneratedQuery(result: () -> CypherResult): DynamicTest =
+        DynamicTest.dynamicTest("Generated query") { println(result()) }
 
-    private fun printReplacedParameter(result: () -> List<CypherResult>): DynamicTest =
+    private fun printReplacedParameter(result: () -> CypherResult): DynamicTest =
         DynamicTest.dynamicTest("Generated query with params replaced") {
-            result().forEach {
+            result().also {
                 var queryWithReplacedParams = it.query
                 it.params.forEach { (key, value) ->
                     queryWithReplacedParams =
@@ -316,23 +196,15 @@ class CypherTestFactory(fileName: String, val driver: Driver? = null, createMiss
             }
         }
 
-    private fun testCypher(
-        title: String,
-        cypherBlocks: List<CodeBlock>,
-        result: () -> List<CypherResult>
-    ): List<DynamicTest> = cypherBlocks.mapIndexed { index, cypherBlock ->
-        var name = "Test Cypher"
-        if (cypherBlocks.size > 1) {
-            name += " (${index + 1})"
+    private fun testCypher(cypherBlock: CodeBlock?, result: () -> CypherResult): DynamicTest? {
+        if (cypherBlock == null) {
+            return null
         }
-        DynamicTest.dynamicTest(name, cypherBlock.uri) {
-            val renderer = Renderer.getRenderer(RENDER_OPTIONS)
+        return DynamicTest.dynamicTest("Test Cypher", cypherBlock.uri) {
             val cypher = cypherBlock.content
-            val expectedNormalized =
-                if (cypher.isNotBlank()) renderer.render(CypherParser.parse(cypher, PARSE_OPTIONS)) else ""
-            val actual = (result().getOrNull(index)?.query
-                ?: throw IllegalStateException("missing cypher query for $title ($index)"))
-            val actualNormalized = renderer.render(CypherParser.parse(actual, PARSE_OPTIONS))
+            val expectedNormalized = if (cypher.isNotBlank()) CypherUtils.normalizeCypher(cypher) else ""
+            val actual = result().query
+            val actualNormalized = CypherUtils.normalizeCypher(actual)
 
             if (!Objects.equals(expectedNormalized, actual)) {
                 cypherBlock.generatedContent = actual
@@ -353,54 +225,46 @@ class CypherTestFactory(fileName: String, val driver: Driver? = null, createMiss
     }
 
     private fun testCypherParams(
-        cypherBlocks: List<CodeBlock>,
-        cypherParamsBlocks: List<CodeBlock>,
-        result: () -> List<CypherResult>
-    ): List<DynamicTest> {
-        return cypherParamsBlocks.mapIndexed { index, cypherParamsBlock ->
-            var name = "Test Cypher Params"
-            if (cypherParamsBlocks.size > 1) {
-                name += " (${index + 1})"
-            }
-            DynamicTest.dynamicTest(name, cypherParamsBlock.uri) {
-                val (cypher, params) = result().getOrNull(index)
-                    ?: throw IllegalStateException("Expected a cypher query with index $index")
-
-                val actualParamsJson = MAPPER.writerWithDefaultPrettyPrinter().writeValueAsString(params)
-                if (cypherParamsBlock.content.isBlank()) {
-                    if (params.isNotEmpty()) {
-                        cypherParamsBlock.generatedContent = actualParamsJson
-                        Assertions.fail<Any>("No params defined")
-                    }
-                    return@dynamicTest
-                }
-                val expectedCypherParams = cypherParamsBlock.content.parseJsonMap()
-                val expected = fixNumbers(expectedCypherParams)
-                val actual = fixNumbers(actualParamsJson.parseJsonMap())
-                if (!Objects.equals(expected, actual)) {
+        cypherBlock: CodeBlock?,
+        cypherParamsBlock: CodeBlock?,
+        result: () -> CypherResult
+    ): DynamicTest? {
+        if (cypherBlock == null || cypherParamsBlock == null) {
+            return null
+        }
+        return DynamicTest.dynamicTest("Test Cypher Params", cypherParamsBlock.uri) {
+            val (cypher, params) = result()
+
+            val actualParamsJson = JsonUtils.prettyPrintJson(params)
+            if (cypherParamsBlock.content.isBlank()) {
+                if (params.isNotEmpty()) {
                     cypherParamsBlock.generatedContent = actualParamsJson
+                    Assertions.fail<Any>("No params defined")
                 }
+                return@dynamicTest
+            }
+            val expectedCypherParams = JsonUtils.parseJson<Map<String, Any?>>(cypherParamsBlock.content)
+            if (!Objects.equals(expectedCypherParams, actualParamsJson)) {
+                cypherParamsBlock.generatedContent = actualParamsJson
+            }
 
-                val cypherCodeBlock = cypherBlocks.getOrNull(index)
-                val expectedRenamedParameters = cypherCodeBlock?.content
-                    ?.let { CypherParser.parse(it, PARSE_OPTIONS).catalog.renamedParameters }
-
-                if (expectedRenamedParameters != null) {
-                    val actualRenamedParameters = CypherParser.parse(cypher, PARSE_OPTIONS).catalog
-                        .renamedParameters
-                        .map { (k, v) -> v to k }
-                        .toMap()
-                    val remappedExpectedCypherParams = expectedCypherParams.mapKeys { (k, _) ->
-                        actualRenamedParameters[expectedRenamedParameters[k]] ?: k
-                    }
-                    assertCypherParams(remappedExpectedCypherParams, params)
-                    cypherCodeBlock.tandemUpdate = cypherParamsBlock
-                    cypherParamsBlock.tandemUpdate = cypherCodeBlock
-                } else {
-                    assertCypherParams(expectedCypherParams, params)
+            val expectedRenamedParameters = CypherUtils.parseNormalized(cypherBlock.content).catalog.renamedParameters
+
+            if (expectedRenamedParameters != null) {
+                val actualRenamedParameters = CypherUtils.parseNormalized(cypher).catalog
+                    .renamedParameters
+                    .map { (k, v) -> v to k }
+                    .toMap()
+                val remappedExpectedCypherParams = expectedCypherParams.mapKeys { (k, _) ->
+                    actualRenamedParameters[expectedRenamedParameters[k]] ?: k
                 }
-                cypherParamsBlock.semanticEqual = true
+                assertCypherParams(remappedExpectedCypherParams, params)
+                cypherBlock.tandemUpdate = cypherParamsBlock
+                cypherParamsBlock.tandemUpdate = cypherBlock
+            } else {
+                assertCypherParams(expectedCypherParams, params)
             }
+            cypherParamsBlock.semanticEqual = true
         }
     }
 
@@ -423,7 +287,7 @@ class CypherTestFactory(fileName: String, val driver: Driver? = null, createMiss
                     session.run("MATCH (n) DETACH DELETE n")
 
                     // import test data
-                    testCase.testData.firstOrNull()?.content
+                    testCase.setup.testData.firstOrNull()?.content
                         ?.split(";")
                         ?.filter { it.isNotBlank() }
                         ?.forEach { query -> session.run(query) }
@@ -435,19 +299,18 @@ class CypherTestFactory(fileName: String, val driver: Driver? = null, createMiss
                 ?: error("missing graphql for $title")
 
             val requestParams =
-                testCase.graphqlRequestVariables?.content?.parseJsonMap() ?: emptyMap()
+                testCase.graphqlRequestVariables?.content
+                    ?.let { JsonUtils.parseJson<Map<String, Any?>>(it) }
+                    ?: emptyMap()
 
             val queryContext = testCase.queryConfig?.content
                 ?.let<String, QueryContext?> { config ->
-                    return@let MAPPER.readValue(
-                        config,
-                        QueryContext::class.java
-                    )
+                    return@let JsonUtils.parseJson<QueryContext>(config)
                 }
                 ?: QueryContext()
 
 
-            val schema = createSchema(testCase.schema, testCase.schemaConfig, testCase.customResolver, neo4jAdapter)
+            val schema = createSchema(testCase.setup, neo4jAdapter)
             val graphql = GraphQL.newGraphQL(schema).build()
             val result = graphql.execute(
                 ExecutionInput.newExecutionInput()
@@ -472,259 +335,28 @@ class CypherTestFactory(fileName: String, val driver: Driver? = null, createMiss
             } else if (graphqlResponse != null) {
 
                 if (graphqlResponse.content.isEmpty()) {
-                    val actualCode = MAPPER.writerWithDefaultPrettyPrinter().writeValueAsString(values)
+                    val actualCode = JsonUtils.prettyPrintJson(values)
                     graphqlResponse.generatedContent = actualCode
                 } else {
-                    val expected = fixNumbers(graphqlResponse.content.parseJsonMap())
-                    val actual = fixNumber(values)
-                    if (!Objects.equals(expected, actual)) {
-                        val actualCode = MAPPER.writerWithDefaultPrettyPrinter().writeValueAsString(values)
+                    val expectedCypherParams = JsonUtils.parseJson<Map<String, Any?>>(graphqlResponse.content)
+                    if (!Objects.equals(expectedCypherParams, values)) {
+                        val actualCode = JsonUtils.prettyPrintJson(values)
                         graphqlResponse.generatedContent = actualCode
                     }
                     if (graphqlResponse.attributes.containsKey("ignore-order")) {
-                        assertEqualIgnoreOrder(expected, actual)
-                    } else {
-                        Assertions.assertThat(actual).isEqualTo(expected)
-                    }
-                }
-            }
-        }
-    }
-
-    private fun assertWithJsonPath(table: Table, result: Any?) {
-        for (record in table.records) {
-            val jsonPath = record.get("Path")
-            val condition = record.get("Condition")
-            val expectedValue = record.get("Expected Value")
-
-            val actualValue = JsonPath.read<Any>(result, jsonPath)
-
-            // try to convert the expected value to the type of the current value
-            val typedExpectedValue = if (expectedValue.isNullOrBlank()) {
-                null
-            } else when (actualValue) {
-                is Int -> expectedValue.toInt()
-                else -> expectedValue
-            }
-
-            val assertion = Assertions.assertThat(actualValue).describedAs(jsonPath)
-            when (condition) {
-                "==" -> assertion.isEqualTo(typedExpectedValue)
-                "notEmpty" -> {
-                    if (actualValue is Collection<*>) {
-                        assertion.asInstanceOf(InstanceOfAssertFactories.COLLECTION).isNotEmpty()
-                    } else if (actualValue is String) {
-                        assertion.asInstanceOf(InstanceOfAssertFactories.STRING).isNotEmpty()
+                        assertEqualIgnoreOrder(expectedCypherParams, values)
                     } else {
-                        TODO()
+                        Assertions.assertThat(values).isEqualTo(expectedCypherParams)
                     }
                 }
-
-                else -> TODO("$condition not implemented")
             }
         }
     }
 
-    private fun assertEqualIgnoreOrder(expected: Any?, actual: Any?) {
-        when (expected) {
-            is Map<*, *> -> {
-                val mapAssert = Assertions.assertThat(actual).asInstanceOf(InstanceOfAssertFactories.MAP)
-                    .hasSize(expected.size)
-                    .containsOnlyKeys(*expected.keys.toTypedArray())
-                expected.forEach { (key, value) ->
-                    mapAssert.extractingByKey(key)
-                        .satisfies(Consumer { assertEqualIgnoreOrder(value, (actual as Map<*, *>)[key]) })
-                }
-            }
-
-            is Collection<*> -> {
-                val assertions: List<Consumer<Any>> =
-                    expected.map { e -> Consumer<Any> { a -> assertEqualIgnoreOrder(e, a) } }
-                Assertions.assertThat(actual).asInstanceOf(InstanceOfAssertFactories.LIST)
-                    .hasSize(expected.size)
-                    .withFailMessage { "Expecting actual:\n  ${actual}\n to satisfy\n  ${expected}\n in any order." }
-                    .satisfiesExactlyInAnyOrder(*assertions.toTypedArray())
-            }
-
-            else -> Assertions.assertThat(actual).isEqualTo(expected)
-        }
-    }
-
-
-    private fun reformatMarker() {
-        val content = generateAdjustedFileContent({ it.content }, { it.adjustedAttributes != null })
-        FileWriter(File("src/test/resources/", fileName)).use { it.write(content) }
-    }
+    class InvalidQueryException(@Suppress("MemberVisibilityCanBePrivate") val error: GraphQLError) :
+        RuntimeException(error.message)
 
     companion object {
         private val DEBUG = System.getProperty("neo4j-graphql-java.debug", "false") == "true"
-        private val CONVERT_NUMBER = System.getProperty("neo4j-graphql-java.convert-number", "true") == "true"
-        private val ADD_IGNORE_ORDER_TO_INTEGRATION_TESTS =
-            System.getProperty("neo4j-graphql-java.add-ignore-order-to-integration-tests", "false") == "true"
-
-        private val PARSE_OPTIONS = Options.newOptions()
-            .createSortedMaps(true)
-            .alwaysCreateRelationshipsLTR(true)
-            .build()
-
-        private val RENDER_OPTIONS = Configuration.newConfig()
-            .withPrettyPrint(true)
-            .withGeneratedNames(
-                setOf(
-                    Configuration.GeneratedNames.ALL_ALIASES,
-                    Configuration.GeneratedNames.PARAMETER_NAMES,
-                    Configuration.GeneratedNames.ENTITY_NAMES,
-                )
-            )
-            .build()
-
-        private fun assertCypherParams(expected: Map<String, Any?>, actual: Map<String, Any?>) {
-            Assertions.assertThat(actual).asInstanceOf(InstanceOfAssertFactories.MAP)
-                .hasSize(expected.size)
-                .containsOnlyKeys(*expected.keys.toTypedArray())
-                .allSatisfy({ key, value -> assertCypherParam(expected[key], value) })
-        }
-
-        private fun assertCypherParam(expected: Any?, actual: Any?) {
-            when (expected) {
-                is Int -> when (actual) {
-                    is Double -> {
-                        Assertions.assertThat(actual).isEqualTo(expected.toDouble())
-                        return
-                    }
-
-                    is Long -> {
-                        Assertions.assertThat(actual).isEqualTo(expected.toLong())
-                        return
-                    }
-
-                    is BigInteger -> {
-                        Assertions.assertThat(actual).isEqualTo(expected.toBigInteger())
-                        return
-                    }
-                }
-
-                is String -> {
-                    when (actual) {
-                        is TemporalAccessor -> {
-                            Assertions.assertThat(actual).isEqualTo(TemporalScalar.parse(expected))
-                            return
-                        }
-                    }
-                    try {
-                        val expectedDate = ZonedDateTime.parse(expected)
-                        val actualDate = ZonedDateTime.parse(actual as String)
-                        Assertions.assertThat(actualDate).isEqualTo(expectedDate)
-                        return
-                    } catch (ignore: DateTimeParseException) {
-                    }
-                    try {
-                        val expectedDate = LocalDateTime.parse(expected)
-                        val actualDate = LocalDateTime.parse(actual as String)
-                        Assertions.assertThat(actualDate).isEqualTo(expectedDate)
-                        return
-                    } catch (ignore: DateTimeParseException) {
-                    }
-                    try {
-                        val expectedTime = LocalDate.parse(expected, DateTimeFormatter.ISO_DATE)
-                        val actualTime = LocalDate.parse(actual as String)
-                        Assertions.assertThat(actualTime).isEqualTo(expectedTime)
-                        return
-                    } catch (ignore: DateTimeParseException) {
-                    }
-                    try {
-                        val expectedTime = LocalTime.parse(expected, DateTimeFormatter.ISO_TIME)
-                        val actualTime = LocalTime.parse(actual as String)
-                        Assertions.assertThat(actualTime).isEqualTo(expectedTime)
-                        return
-                    } catch (ignore: DateTimeParseException) {
-                    }
-                    try {
-                        PeriodDuration.parse(expected)?.let { expectedDuration ->
-                            when (actual) {
-                                is PeriodDuration -> Assertions.assertThat(actual).isEqualTo(expectedDuration)
-                                is Period -> Assertions.assertThat(PeriodDuration.of(actual))
-                                    .isEqualTo(expectedDuration)
-
-                                is Duration -> Assertions.assertThat(PeriodDuration.of(actual))
-                                    .isEqualTo(expectedDuration)
-
-                                is String -> Assertions.assertThat(actual).isEqualTo(expected)
-                                else -> Assertions.fail<Any>("Unexpected type ${actual!!::class.java}")
-                            }
-                            return
-                        }
-                    } catch (ignore: DateTimeParseException) {
-                    }
-                }
-
-                is Map<*, *> -> {
-                    if (actual is Number) {
-                        val low = expected["low"] as? Number
-                        val high = expected["high"] as? Number
-                        if (low != null && high != null && expected.size == 2) {
-                            // this is to convert the js bigint into a java long
-                            val highLong = high.toLong() shl 32
-                            val lowLong = low.toLong() and 0xFFFFFFFFL
-                            val expectedLong = highLong or lowLong
-                            when (actual) {
-                                is BigInteger -> Assertions.assertThat(actual.toLong()).isEqualTo(expectedLong)
-                                is Int -> Assertions.assertThat(actual.toLong()).isEqualTo(expectedLong)
-                                is Long -> Assertions.assertThat(actual).isEqualTo(expectedLong)
-                                else -> Assertions.fail<Any>("Unexpected type ${actual::class.java}")
-                            }
-                            return
-                        }
-                    }
-                    if (actual is Map<*, *>) {
-                        Assertions.assertThat(actual).hasSize(expected.count())
-                        expected.forEach { key, value ->
-                            assertCypherParam(value, actual.get(key))
-                        }
-                        return
-                    }
-                }
-
-                is Iterable<*> -> {
-                    if (actual is Iterable<*>) {
-                        Assertions.assertThat(actual).hasSize(expected.count())
-                        expected.forEachIndexed { index, expectedValue ->
-                            assertCypherParam(expectedValue, actual.elementAt(index))
-                        }
-                        return
-                    }
-                }
-            }
-            Assertions.assertThat(actual).isEqualTo(expected)
-        }
-
-        private fun fixNumber(v: Any?): Any? = when (v) {
-            is Double -> v.toDouble().convertNumber()
-            is Float -> v.toDouble().convertNumber()
-            is Int -> v.toLong()
-            is BigInteger -> v.toLong()
-            is Iterable<*> -> v.map { fixNumber(it) }
-            is Sequence<*> -> v.map { fixNumber(it) }
-            is Map<*, *> -> {
-                val low = v["low"] as? Number
-                val high = v["high"] as? Number
-                if (low != null && high != null && v.size == 2) {
-                    // this is to convert th js bigint into a java long
-                    val highLong = high.toLong() shl 32
-                    val lowLong = low.toLong() and 0xFFFFFFFFL
-                    highLong or lowLong
-                } else {
-                    v.mapValues { fixNumber(it.value) }
-                }
-            }
-
-            else -> v
-        }
-
-        private fun fixNumbers(params: Map<String, Any?>) = params.mapValues { (_, v) -> fixNumber(v) }
-        private fun Double.convertNumber() = when {
-            CONVERT_NUMBER && this == toLong().toDouble() -> toLong()
-            else -> this
-        }
     }
 }
diff --git a/core/src/test/kotlin/org/neo4j/graphql/factories/GraphQLSchemaTestFactory.kt b/core/src/test/kotlin/org/neo4j/graphql/factories/GraphQLSchemaTestFactory.kt
index cb196966..8940cb14 100644
--- a/core/src/test/kotlin/org/neo4j/graphql/factories/GraphQLSchemaTestFactory.kt
+++ b/core/src/test/kotlin/org/neo4j/graphql/factories/GraphQLSchemaTestFactory.kt
@@ -1,51 +1,38 @@
 package org.neo4j.graphql.factories
 
-import graphql.language.InterfaceTypeDefinition
-import graphql.language.UnionTypeDefinition
-import graphql.schema.GraphQLScalarType
 import graphql.schema.GraphQLSchema
 import graphql.schema.diff.SchemaDiff
 import graphql.schema.diff.SchemaDiffSet
 import graphql.schema.diff.reporting.CapturingReporter
-import graphql.schema.idl.*
 import org.assertj.core.api.Assertions.assertThat
 import org.bouncycastle.asn1.x500.style.RFC4519Style.title
 import org.junit.jupiter.api.Assertions
 import org.junit.jupiter.api.Assumptions
 import org.junit.jupiter.api.DynamicNode
 import org.junit.jupiter.api.DynamicTest
-import org.neo4j.graphql.NoOpCoercing
 import org.neo4j.graphql.SchemaBuilder
 import org.neo4j.graphql.SchemaConfig
-import org.neo4j.graphql.asciidoc.ast.CodeBlock
 import org.neo4j.graphql.asciidoc.ast.Section
+import org.neo4j.graphql.domain.TestCase
+import org.neo4j.graphql.utils.JsonUtils
+import org.neo4j.graphql.utils.SchemaUtils
+import org.neo4j.graphql.utils.TestUtils.TEST_RESOURCES
 import org.opentest4j.AssertionFailedError
+import java.nio.file.Path
 import java.util.*
 
-class GraphQLSchemaTestFactory(fileName: String) : AsciiDocTestFactory<GraphQLSchemaTestFactory.TestCase>(
-    fileName,
-    listOf(
-        matcher("graphql", exactly = true, setter = TestCase::augmentedSchema),
-    )
-) {
+class GraphQLSchemaTestFactory(file: Path) : AsciiDocTestFactory(file) {
 
-    data class TestCase(
-        var schema: CodeBlock,
-        var schemaConfig: CodeBlock?,
-        var augmentedSchema: CodeBlock? = null,
-    )
-
-    override fun createTestCase(section: Section): TestCase? {
-        val schema = findSetupCodeBlocks(section, "graphql", mapOf("schema" to "true")).firstOrNull() ?: return null
-        val schemaConfig = findSetupCodeBlocks(section, "json", mapOf("schema-config" to "true")).firstOrNull()
-        return TestCase(schema, schemaConfig)
-    }
+    constructor(file: String) : this(Path.of(TEST_RESOURCES, file))
 
     override fun createTests(testCase: TestCase, section: Section, ignoreReason: String?): List<DynamicNode> {
+        if (testCase.setup.schema == null) {
+            return emptyList()
+        }
         val targetSchemaBlock = testCase.augmentedSchema
         targetSchemaBlock?.let {
             try {
-                it.reformattedContent = SCHEMA_PRINTER.print(createMockSchema(it.content))
+                it.reformattedContent = SchemaUtils.prettyPrintSchema(it.content)
             } catch (ignore: Exception) {
             }
         }
@@ -53,21 +40,21 @@ class GraphQLSchemaTestFactory(fileName: String) : AsciiDocTestFactory<GraphQLSc
             return emptyList()
         }
         val compareSchemaTest = DynamicTest.dynamicTest("compare schema", targetSchemaBlock.uri) {
-            val configBlock = testCase.schemaConfig
-            val config = configBlock?.content?.let { MAPPER.readValue(it, SchemaConfig::class.java) } ?: SchemaConfig()
+            val configBlock = testCase.setup.schemaConfig
+            val config = configBlock?.content?.let { JsonUtils.parseJson<SchemaConfig>(it) } ?: SchemaConfig()
 
             val targetSchema = targetSchemaBlock.content
 
             var augmentedSchema: GraphQLSchema? = null
             var expectedSchema: GraphQLSchema? = null
             try {
-                val schema = testCase.schema.content
+                val schema = testCase.setup.schema.content
                 augmentedSchema = SchemaBuilder.buildSchema(schema, config, addLibraryDirectivesToSchema = false)
-                expectedSchema = createMockSchema(targetSchema)
+                expectedSchema = SchemaUtils.createMockSchema(targetSchema)
 
                 diff(expectedSchema, augmentedSchema)
                 diff(augmentedSchema, expectedSchema)
-                targetSchemaBlock.generatedContent = SCHEMA_PRINTER.print(augmentedSchema)
+                targetSchemaBlock.generatedContent = SchemaUtils.prettyPrintSchema(augmentedSchema)
             } catch (e: Throwable) {
                 if (ignoreReason != null) {
                     Assumptions.assumeFalse(true) { "$ignoreReason ${e.message}" }
@@ -75,11 +62,11 @@ class GraphQLSchemaTestFactory(fileName: String) : AsciiDocTestFactory<GraphQLSc
                     if (augmentedSchema == null) {
                         Assertions.fail<Throwable>(e)
                     }
-                    val actualSchema = SCHEMA_PRINTER.print(augmentedSchema)
+                    val actualSchema = SchemaUtils.prettyPrintSchema(augmentedSchema)
                     targetSchemaBlock.generatedContent = actualSchema
                     throw AssertionFailedError(
                         "augmented schema differs for '$title'",
-                        expectedSchema?.let { SCHEMA_PRINTER.print(it) } ?: targetSchema,
+                        expectedSchema?.let { SchemaUtils.prettyPrintSchema(it) } ?: targetSchema,
                         actualSchema,
                         e)
 
@@ -89,50 +76,11 @@ class GraphQLSchemaTestFactory(fileName: String) : AsciiDocTestFactory<GraphQLSc
         return Collections.singletonList(compareSchemaTest)
     }
 
-
-    private fun createMockSchema(targetSchema: String): GraphQLSchema {
-        val schemaParser = SchemaParser()
-
-        val reg = schemaParser.parse(targetSchema)
-        val schemaGenerator = SchemaGenerator()
-        val runtimeWiring = RuntimeWiring.newRuntimeWiring()
-        (reg.getTypes(InterfaceTypeDefinition::class.java)
-                + reg.getTypes(UnionTypeDefinition::class.java))
-            .forEach { typeDefinition -> runtimeWiring.type(typeDefinition.name) { it.typeResolver { null } } }
-        reg
-            .scalars()
-            .filterNot { entry -> ScalarInfo.GRAPHQL_SPECIFICATION_SCALARS_DEFINITIONS.containsKey(entry.key) }
-            .forEach { (name, definition) ->
-                runtimeWiring.scalar(
-                    GraphQLScalarType.newScalar()
-                        .name(name)
-                        .definition(definition)
-                        .coercing(NoOpCoercing)
-                        .build()
-                )
-            }
-        return schemaGenerator.makeExecutableSchema(reg, runtimeWiring.build())
-    }
-
-    companion object {
-
-        private val SCHEMA_PRINTER = SchemaPrinter(
-            SchemaPrinter.Options.defaultOptions()
-                .includeScalarTypes(true)
-                .includeSchemaDefinition(true)
-                .includeIntrospectionTypes(false)
-                .includeDirectiveDefinition {
-                    // skip printing of graphql native directives
-                    setOf("deprecated", "include", "oneOf", "skip", "specifiedBy").contains(it).not()
-                }
-        )
-
-        fun diff(augmentedSchema: GraphQLSchema, expected: GraphQLSchema) {
-            val diffSet = SchemaDiffSet.diffSetFromIntrospection(augmentedSchema, expected)
-            val capture = CapturingReporter()
-            SchemaDiff().diffSchema(diffSet, capture)
-            assertThat(capture.dangers).isEmpty()
-            assertThat(capture.breakages).isEmpty()
-        }
+    private fun diff(augmentedSchema: GraphQLSchema, expected: GraphQLSchema) {
+        val diffSet = SchemaDiffSet.diffSetFromIntrospection(augmentedSchema, expected)
+        val capture = CapturingReporter()
+        SchemaDiff().diffSchema(diffSet, capture)
+        assertThat(capture.dangers).isEmpty()
+        assertThat(capture.breakages).isEmpty()
     }
 }
diff --git a/core/src/test/kotlin/org/neo4j/graphql/tools/AsciidocReformater.kt b/core/src/test/kotlin/org/neo4j/graphql/tools/AsciidocReformater.kt
new file mode 100644
index 00000000..b5053b5e
--- /dev/null
+++ b/core/src/test/kotlin/org/neo4j/graphql/tools/AsciidocReformater.kt
@@ -0,0 +1,110 @@
+package org.neo4j.graphql.tools
+
+import org.neo4j.graphql.asciidoc.AsciiDocParser
+import org.neo4j.graphql.asciidoc.ast.CodeBlock
+import org.neo4j.graphql.asciidoc.ast.Document
+import org.neo4j.graphql.asciidoc.ast.StructuralNode
+import org.neo4j.graphql.domain.CodeBlockPredicate
+import org.neo4j.graphql.utils.CypherUtils
+import org.neo4j.graphql.utils.JsonUtils
+import org.neo4j.graphql.utils.JsonUtils.parseJson
+import org.neo4j.graphql.utils.SchemaUtils
+import org.neo4j.graphql.utils.TestUtils
+import org.neo4j.graphql.utils.TestUtils.IS_TEST_FILE
+import org.neo4j.graphql.utils.TestUtils.TEST_RESOURCES
+import java.nio.file.*
+import java.nio.file.attribute.BasicFileAttributes
+
+open class AsciidocReformater {
+
+    fun run() {
+        listOf(
+            "tck-test-files/schema/v2",
+            "tck-test-files/cypher/v2",
+            "integration-test-files"
+        )
+            .forEach {
+                val root = Paths.get("$TEST_RESOURCES$it")
+                Files.walkFileTree(root, object : SimpleFileVisitor<Path>() {
+                    override fun visitFile(path: Path, attrs: BasicFileAttributes): FileVisitResult {
+                        handleFile(path)
+                        return FileVisitResult.CONTINUE
+                    }
+                })
+            }
+    }
+
+    open fun handleFile(file: Path) {
+        if (!IS_TEST_FILE.test(file)) {
+            return
+        }
+
+        val targetDocument = AsciiDocParser(file).parse()
+
+        val blocks = collectCodeBlocks(targetDocument)
+        for (block in blocks) {
+            reformatBlock(block)
+        }
+        writeDocument(targetDocument, file)
+    }
+
+    fun reformatBlock(block: CodeBlock) {
+        if (block.reformattedContent != null) {
+            // already reformatted
+            return
+        }
+        try {
+            when {
+                // pretty print the schema
+                CodeBlockPredicate.GRAPHQL_AUGMENTED_SCHEMA.matches(block) ->
+                    block.reformattedContent = SchemaUtils.prettyPrintSchema(block.content)
+
+                // pretty print the json
+                block.matches("json") -> reformatJson(block)
+
+                // pretty print the cypher
+                CodeBlockPredicate.CYPHER.matches(block) -> block.reformattedContent =
+                    CypherUtils.prettyPrintCypher(block.content)
+            }
+        } catch (ignore: Exception) {
+        }
+    }
+
+    fun reformatJson(block: CodeBlock) {
+        val map = parseJson<Map<String, Any?>>(block.content)
+        block.reformattedContent = JsonUtils.prettyPrintJson(map)
+        if (block.attributes.containsKey("response")) {
+
+            val hasOrder = block.parent.blocks
+                .filterIsInstance<CodeBlock>()
+                .any { it.matches("cypher") && it.content.contains("ORDER BY") }
+            if (!hasOrder && TestUtils.hasArrayWithMoreThenOneItems(map)) {
+                block.adjustedAttributes = block.attributes.toMutableMap()
+                    .also { it["ignore-order"] = null }
+            }
+        }
+    }
+
+    fun writeDocument(
+        document: Document,
+        testFilePath: Path,
+    ) {
+        val content = document.buildContent { it.reformattedContent ?: it.content }
+        Files.write(testFilePath, content.toByteArray())
+    }
+
+    fun collectCodeBlocks(node: StructuralNode): List<CodeBlock> {
+        return when (node) {
+            is CodeBlock -> listOf(node)
+            else -> node.blocks.flatMap { collectCodeBlocks(it) }
+        }
+    }
+
+    companion object {
+
+        @JvmStatic
+        fun main(args: Array<String>) {
+            AsciidocReformater().run()
+        }
+    }
+}
diff --git a/core/src/test/kotlin/org/neo4j/graphql/tools/JsTestCaseSync.kt b/core/src/test/kotlin/org/neo4j/graphql/tools/JsTestCaseSync.kt
new file mode 100644
index 00000000..ff6c52f1
--- /dev/null
+++ b/core/src/test/kotlin/org/neo4j/graphql/tools/JsTestCaseSync.kt
@@ -0,0 +1,469 @@
+package org.neo4j.graphql.tools
+
+import org.neo4j.graphql.asciidoc.AsciiDocParser
+import org.neo4j.graphql.asciidoc.ast.*
+import org.neo4j.graphql.domain.CodeBlockPredicate
+import org.neo4j.graphql.domain.TestCase
+import org.neo4j.graphql.domain.TestCase.Setup
+import org.neo4j.graphql.utils.Assertions
+import org.neo4j.graphql.utils.CypherUtils
+import org.neo4j.graphql.utils.JsonUtils
+import org.neo4j.graphql.utils.JsonUtils.parseJson
+import org.neo4j.graphql.utils.SchemaUtils
+import org.neo4j.graphql.utils.TestUtils.IS_TEMPLATE
+import org.neo4j.graphql.utils.TestUtils.IS_TEST_FILE
+import org.neo4j.graphql.utils.TestUtils.TEST_RESOURCES
+import java.io.BufferedReader
+import java.io.InputStreamReader
+import java.nio.file.Files
+import java.nio.file.Path
+import kotlin.reflect.KProperty1
+
+object JsTestCaseSync : AsciidocReformater() {
+
+
+    @JvmStatic
+    fun main(args: Array<String>) {
+        run()
+    }
+
+    override fun handleFile(file: Path) {
+        if (IS_TEST_FILE.test(file)) {
+            val templateFile = file.parent
+                .resolve(file.fileName.toString().replace(Regex("\\.adoc$"), ".js.adoc"))
+            if (!Files.exists(templateFile)) {
+                println("Template file not found: $templateFile, deleting $file")
+                Files.delete(file)
+            }
+            return
+        }
+        if (!IS_TEMPLATE.test(file)) {
+            return
+        }
+
+        val currentSourceContent = Files.readString(file)
+        val currentSourceDocument = AsciiDocParser(file).parseContent(currentSourceContent)
+
+        val targetFilePath = file.parent
+            .resolve(file.fileName.toString().replace(Regex("\\.js.adoc$"), ".adoc"))
+
+        // if the test file does not exist, create it based on the template
+        if (!Files.exists(targetFilePath)) {
+            println("Test file not found: $file, creating it based on its template")
+
+            val blocks = collectCodeBlocks(currentSourceDocument)
+            for (block in blocks) {
+                reformatBlock(block)
+            }
+
+            currentSourceDocument.blocks
+                .filterIsInstance<Block>()
+                .firstOrNull()?.let {
+                    it.content = it.content.replace(
+                        "// This file was generated by the Test-Case extractor of neo4j-graphql\n",
+                        ""
+                    )
+                }
+            writeDocument(currentSourceDocument, targetFilePath)
+            return
+        }
+
+        // else compare the content of the test file with the template diff
+
+        // execute `git show HEAD:file` to get the content of the file in the HEAD commit
+        val previousSourceContent = runGitCommand("git show HEAD:core/$TEST_RESOURCES$file")
+        if (previousSourceContent.isEmpty()) {
+            println("File not found in HEAD: $file")
+            return
+        }
+
+        if (previousSourceContent == currentSourceContent) {
+            // nothing to do since the source (template) file has not changed
+            return
+        }
+
+
+        println("File is outdated: $file")
+        val previousSourceDocument = AsciiDocParser(file).parseContent(previousSourceContent)
+
+        val targetDocument = AsciiDocParser(targetFilePath).parse()
+
+        mergeSections(currentSourceDocument, previousSourceDocument, targetDocument)
+
+        val blocks = collectCodeBlocks(targetDocument)
+        for (block in blocks) {
+            reformatBlock(block)
+        }
+        writeDocument(targetDocument, targetFilePath)
+        writeDocument(currentSourceDocument, file)
+    }
+
+    private fun removeRedundantThematicBreaks(section: Section) {
+        // remove ThematicBreaks that are followed by a Section or that are the last element in the section
+        val iterator = section.blocks.asReversed().iterator()
+        var hasFollowUpCodeBlock = false
+        while (iterator.hasNext()) {
+            val block = iterator.next()
+            if (block is ThematicBreak) {
+                if (!hasFollowUpCodeBlock) {
+                    iterator.remove()
+                }
+            }
+            if (block is CodeBlock || block is Table) {
+                hasFollowUpCodeBlock = true
+            }
+            if (block is Section) {
+                removeRedundantThematicBreaks(block)
+                hasFollowUpCodeBlock = false
+            }
+        }
+    }
+
+    private fun mergeSections(currentSource: Section, previousSource: Section?, target: Section) {
+
+        val currentSections = currentSource.blocks.filterIsInstance<Section>()
+        val previousSections = previousSource?.blocks?.filterIsInstance<Section>() ?: emptyList()
+
+        val sourceToTargetSectionMapping = mutableMapOf<Section, Section?>()
+        val targetToSourceSectionMapping = mutableMapOf<Section, Section>()
+        val iterator = target.blocks.iterator()
+        while (iterator.hasNext()) {
+            val targetSection = iterator.next() as? Section ?: continue
+            val currentSection = currentSections
+                .filterNot { sourceToTargetSectionMapping.contains(it) }
+                .find { it.title == targetSection.title }
+            targetToSourceSectionMapping[targetSection] = currentSource
+            if (currentSection == null) {
+                iterator.remove()
+            } else {
+                sourceToTargetSectionMapping[currentSection] = targetSection
+                val previousSection = previousSections.find { it.title == targetSection.title }
+                mergeSections(currentSection, previousSection, targetSection)
+            }
+        }
+
+        var lastMatchedTargetSection: Section? = null
+        for (currentSection in currentSections) {
+            val targetSection = sourceToTargetSectionMapping[currentSection]
+            if (targetSection == null) {
+                val newSection = Section(currentSection.title, currentSection.uri, target)
+                newSection.blocks.addAll(currentSection.blocks)
+                target.addAfter(lastMatchedTargetSection, newSection)
+            } else {
+                lastMatchedTargetSection = targetSection
+            }
+        }
+
+        if (previousSource != null) {
+            sync(
+                currentSource, previousSource, target, CodeBlockPredicate.TEST_DATA,
+                { a, b -> a?.content == b?.content },
+            )
+            sync(
+                currentSource, previousSource, target, CodeBlockPredicate.GRAPHQL_SOURCE_SCHEMA,
+                { a, b -> a?.content == b?.content },
+            )
+
+            val currentTestCases = extractTestCases(currentSource)
+            val previousTestCases = extractTestCases(previousSource)
+            val targetTestCases = extractTestCases(target)
+
+            val count = maxOf(currentTestCases.size, targetTestCases.size)
+            for (i in 0 until count) {
+                val currentTestCase = currentTestCases.getOrNull(i)
+                val previousTestCase = previousTestCases.getOrNull(i)
+                val targetTestCase = targetTestCases.getOrNull(i)
+
+                syncTestCases(currentTestCase, previousTestCase, targetTestCase, target)
+            }
+        }
+    }
+
+    private fun syncTestCases(
+        currentTestCase: TestCase?,
+        previousTestCase: TestCase?,
+        targetTestCase: TestCase?,
+        target: Section
+    ) {
+        sync(
+            currentTestCase, previousTestCase, targetTestCase,
+            target,
+            TestCase::queryConfig,
+            { a, b -> a?.content == b?.content },
+            JsonUtils::prettyPrintJson,
+        )
+        sync(
+            currentTestCase, previousTestCase, targetTestCase,
+            target,
+            TestCase::graphqlRequest,
+            { a, b -> a?.content == b?.content },
+            insertPoint = targetTestCase?.queryConfig,
+        )
+        sync(
+            currentTestCase, previousTestCase, targetTestCase,
+            target,
+            TestCase::graphqlRequestVariables,
+            { a, b -> a?.content == b?.content },
+            JsonUtils::prettyPrintJson,
+            targetTestCase?.graphqlRequest,
+        )
+        sync(
+            currentTestCase, previousTestCase, targetTestCase,
+            target,
+            TestCase::augmentedSchema,
+            { a, b ->
+                if (a == null || b == null) {
+                    return@sync a == b
+                }
+                if (a.content == b.content) {
+                    return@sync true
+                }
+                return@sync SchemaUtils.prettyPrintSchema(a.content) == SchemaUtils.prettyPrintSchema(b.content)
+            },
+            SchemaUtils::prettyPrintSchema,
+        )
+        syncCypher(currentTestCase, previousTestCase, targetTestCase, target)
+        syncGraphqlResponse(currentTestCase, previousTestCase, targetTestCase, target)
+    }
+
+    private fun sync(
+        currentSection: Section,
+        previousSection: Section,
+        targetSection: Section,
+        predicate: CodeBlockPredicate,
+        compartor: (CodeBlock?, CodeBlock?) -> Boolean,
+        formatter: (String) -> String = { it },
+        insertPoint: CodeBlock? = null
+    ) = sync(
+        currentSection.findSingleOrNullCodeBlock(predicate),
+        previousSection.findSingleOrNullCodeBlock(predicate),
+        targetSection.findSingleOrNullCodeBlock(predicate),
+        targetSection, compartor, formatter, insertPoint
+    )
+
+    private fun sync(
+        currentTestCase: TestCase?,
+        previousTestCase: TestCase?,
+        targetTestCase: TestCase?,
+        targetSection: Section,
+        prop: KProperty1<TestCase, CodeBlock?>,
+        compartor: (CodeBlock?, CodeBlock?) -> Boolean,
+        formatter: (String) -> String = { it },
+        insertPoint: CodeBlock? = null
+    ) = sync(
+        currentTestCase?.let { prop(it) },
+        previousTestCase?.let { prop(it) },
+        targetTestCase?.let { prop(it) },
+        targetSection, compartor, formatter, insertPoint
+    )
+
+    private fun sync(
+        current: CodeBlock?,
+        previous: CodeBlock?,
+        target: CodeBlock?,
+        targetSection: Section,
+        compartor: (CodeBlock?, CodeBlock?) -> Boolean,
+        formatter: (String) -> String = { it },
+        insertPoint: CodeBlock? = null
+    ) {
+        if (current == null) {
+            if (target != null) {
+                targetSection.blocks.remove(target)
+            }
+            return
+        }
+
+        if (compartor(current, previous)) {
+            // we have no diff between the current and the previous file, so nothing to update
+            return
+        }
+
+        if (target != null) {
+            // there is a diff in the target file, we can compare the content
+
+            target.reformattedContent = formatter(current.content)
+            return
+        }
+
+        val newTarget = CodeBlock(targetSection.uri, current.language, targetSection, current.attributes)
+            .also {
+                it.caption = current.caption
+                it.content = formatter(current.content)
+            }
+        targetSection.addAfter(insertPoint, newTarget)
+    }
+
+    private fun syncCypher(
+        currentTestCase: TestCase?,
+        previousTestCase: TestCase?,
+        targetTestCase: TestCase?,
+        targetSection: Section
+    ) {
+        val currentCypher = currentTestCase?.cypher
+        val previousCypher = previousTestCase?.cypher
+        var targetCypher = targetTestCase?.cypher
+
+        val currentCypherParams = currentTestCase?.cypherParams
+        val previousCypherParams = previousTestCase?.cypherParams
+        var targetCypherParams = targetTestCase?.cypherParams
+
+        if (currentCypher == null) {
+            if (targetCypher != null) {
+                targetSection.blocks.remove(targetCypher)
+            }
+            if (targetCypherParams != null) {
+                targetSection.blocks.remove(targetCypherParams)
+            }
+            return
+        }
+
+        if (currentCypher.content == previousCypher?.content && currentCypherParams?.content == previousCypherParams?.content) {
+            // we have no diff between the current and the previous file, so nothing to update
+            return
+        }
+
+        if (targetCypher != null) {
+            if (currentCypher.content != previousCypher?.content) {
+                // we need to update the target file
+                targetCypher.reformattedContent = CypherUtils.prettyPrintCypher(currentCypher.content)
+            }
+        } else {
+            if (targetTestCase?.graphqlResponse != null || targetTestCase?.graphqlResponseAssertions != null) {
+                // we have an integration test, where the cypher check was deleted, so keep the cypher deleted
+                return
+            }
+            targetCypher = CodeBlock(targetSection.uri, currentCypher.language, targetSection, currentCypher.attributes)
+                .also {
+                    it.caption = currentCypher.caption
+                    it.content = CypherUtils.prettyPrintCypher(currentCypher.content)
+                }
+            targetSection.addAfter(targetTestCase?.graphqlResponse, targetCypher)
+        }
+
+        if (currentCypherParams != null) {
+            if (targetCypherParams != null) {
+                if (currentCypherParams.content != previousCypherParams?.content) {
+                    // we need to update the target file
+                    targetCypherParams.reformattedContent = JsonUtils.prettyPrintJson(currentCypherParams.content)
+                }
+            } else {
+                targetCypherParams =
+                    CodeBlock(
+                        targetSection.uri,
+                        currentCypherParams.language,
+                        targetSection,
+                        currentCypherParams.attributes
+                    )
+                        .also {
+                            it.caption = currentCypherParams.caption
+                            it.content = JsonUtils.prettyPrintJson(currentCypherParams.content)
+                        }
+                targetSection.addAfter(targetCypher, targetCypherParams)
+            }
+        }
+    }
+
+    private fun syncGraphqlResponse(
+        currentTestCase: TestCase?,
+        previousTestCase: TestCase?,
+        targetTestCase: TestCase?,
+        targetSection: Section
+    ) {
+        val currentResponse = currentTestCase?.graphqlResponse
+        val previousResponse = previousTestCase?.graphqlResponse
+        val targetResponse = targetTestCase?.graphqlResponse
+        val targetResponseAssertions = targetTestCase?.graphqlResponseAssertions
+
+        if (currentResponse == null) {
+            if (targetResponse != null) {
+                targetSection.blocks.remove(targetResponse)
+            }
+            if (targetResponseAssertions != null) {
+                targetSection.blocks.remove(targetResponseAssertions)
+            }
+            return
+        }
+
+        if (currentResponse.content == previousResponse?.content) {
+            // we have no diff between the current and the previous file, so nothing to update
+            return
+        }
+
+        if (targetResponse != null) {
+            // there is a response in the target file, we can compare the content
+
+            if (targetResponse.attributes.containsKey("ignore-order")) {
+                // check for equality ignoring the order
+
+                val expected = parseJson<Map<String, Any?>>(currentResponse.content)
+                val actual = parseJson<Map<String, Any?>>(targetResponse.content)
+
+                try {
+                    Assertions.assertEqualIgnoreOrder(expected, actual)
+
+                    // if the content is equal, we can use the previous content to prevent cahnges in the template
+                    currentResponse.reformattedContent = previousResponse?.content
+                    return
+                } catch (ignore: AssertionError) {
+                    // handled below
+                }
+            }
+
+            // we need to update the target file
+            targetResponse.reformattedContent = JsonUtils.prettyPrintJson(currentResponse.content)
+            return
+        }
+
+        if (targetResponseAssertions != null) {
+            // we remove the direct content validation and added some JsonPath assertions
+            try {
+                val expected = parseJson<Map<String, Any?>>(currentResponse.content)
+                Assertions.assertWithJsonPath(targetResponseAssertions, expected)
+
+                // if the assertions matches with the current content, we can use the previous content
+                currentResponse.reformattedContent = previousResponse?.content
+            } catch (e: AssertionError) {
+                // otherwise we need to update the target file
+                targetSection.addAfter(targetResponseAssertions, currentResponse)
+            }
+            return
+        }
+
+        TODO("target file does not contain a response assertions")
+    }
+
+    private fun extractTestCases(section: Section): List<TestCase> {
+        val tests = mutableListOf<TestCase>()
+        val setup = Setup(section)
+        var testCase = TestCase(setup).also { tests += it }
+        for (node in section.blocks) {
+            when (node) {
+                is CodeBlock -> testCase.parseCodeBlock(node)
+                is Table -> testCase.parseTable(node)
+                is ThematicBreak -> testCase = TestCase(setup).also { tests += it }
+                is Block, is Section -> {
+                    // ignore
+                }
+            }
+        }
+        return tests.filter {
+            it.setup.schema != null && (it.graphqlRequest != null || it.augmentedSchema != null)
+        }
+    }
+
+    private fun runGitCommand(command: String): String {
+        val processBuilder = ProcessBuilder(command.split(" "))
+        processBuilder.redirectErrorStream(true)
+        val process = processBuilder.start()
+        val result = StringBuilder()
+        BufferedReader(InputStreamReader(process.inputStream)).use { reader ->
+            var line: String?
+            while (reader.readLine().also { line = it } != null) {
+                result.append(line).append("\n")
+            }
+        }
+        process.waitFor()
+        return result.toString()
+    }
+
+}
diff --git a/core/src/test/kotlin/org/neo4j/graphql/utils/Assertions.kt b/core/src/test/kotlin/org/neo4j/graphql/utils/Assertions.kt
new file mode 100644
index 00000000..0d9ec418
--- /dev/null
+++ b/core/src/test/kotlin/org/neo4j/graphql/utils/Assertions.kt
@@ -0,0 +1,209 @@
+package org.neo4j.graphql.utils
+
+import com.jayway.jsonpath.JsonPath
+import org.assertj.core.api.Assertions
+import org.assertj.core.api.InstanceOfAssertFactories
+import org.neo4j.graphql.asciidoc.ast.Table
+import org.neo4j.graphql.scalars.TemporalScalar
+import org.threeten.extra.PeriodDuration
+import java.math.BigInteger
+import java.time.*
+import java.time.format.DateTimeFormatter
+import java.time.format.DateTimeParseException
+import java.time.temporal.TemporalAccessor
+import java.util.function.Consumer
+
+object Assertions {
+
+    fun assertEqualIgnoreOrder(expected: Any?, actual: Any?) {
+        when (expected) {
+            is Map<*, *> -> {
+                val mapAssert = Assertions.assertThat(actual).asInstanceOf(InstanceOfAssertFactories.MAP)
+                    .hasSize(expected.size)
+                    .containsOnlyKeys(*expected.keys.toTypedArray())
+                expected.forEach { (key, value) ->
+                    mapAssert.extractingByKey(key)
+                        .satisfies(Consumer { assertEqualIgnoreOrder(value, (actual as Map<*, *>)[key]) })
+                }
+            }
+
+            is Collection<*> -> {
+                val assertions: List<Consumer<Any>> =
+                    expected.map { e -> Consumer<Any> { a -> assertEqualIgnoreOrder(e, a) } }
+                Assertions.assertThat(actual).asInstanceOf(InstanceOfAssertFactories.LIST)
+                    .hasSize(expected.size)
+                    .withFailMessage { "Expecting actual:\n  ${actual}\n to satisfy\n  ${expected}\n in any order." }
+                    .satisfiesExactlyInAnyOrder(*assertions.toTypedArray())
+            }
+
+            else -> Assertions.assertThat(actual).isEqualTo(expected)
+        }
+    }
+
+    fun assertWithJsonPath(table: Table, result: Any?) {
+        for (record in table.records) {
+            val jsonPath = record.get("Path")
+            val condition = record.get("Condition")
+            val expectedValue = record.get("Expected Value")
+
+            val actualValue = JsonPath.read<Any>(result, jsonPath)
+
+            // try to convert the expected value to the type of the current value
+            val typedExpectedValue = if (expectedValue.isNullOrBlank()) {
+                null
+            } else when (actualValue) {
+                is Int -> expectedValue.toInt()
+                else -> expectedValue
+            }
+
+            val assertion = Assertions.assertThat(actualValue).describedAs(jsonPath)
+            when (condition) {
+                "==" -> assertion.isEqualTo(typedExpectedValue)
+                ">=" -> when (actualValue) {
+                    is Int -> assertion.asInstanceOf(InstanceOfAssertFactories.INTEGER)
+                        .isGreaterThanOrEqualTo(typedExpectedValue as? Int)
+
+                    else -> TODO()
+                }
+
+                "notEmpty" -> {
+                    when (actualValue) {
+                        is Collection<*> -> {
+                            assertion.asInstanceOf(InstanceOfAssertFactories.COLLECTION).isNotEmpty()
+                        }
+
+                        is String -> {
+                            assertion.asInstanceOf(InstanceOfAssertFactories.STRING).isNotEmpty()
+                        }
+
+                        else -> {
+                            TODO()
+                        }
+                    }
+                }
+
+                else -> TODO("$condition not implemented")
+            }
+        }
+    }
+
+    fun assertCypherParams(expected: Map<String, Any?>, actual: Map<String, Any?>) {
+        Assertions.assertThat(actual).asInstanceOf(InstanceOfAssertFactories.MAP)
+            .hasSize(expected.size)
+            .containsOnlyKeys(*expected.keys.toTypedArray())
+            .allSatisfy({ key, value -> assertCypherParam(expected[key], value) })
+    }
+
+    private fun assertCypherParam(expected: Any?, actual: Any?) {
+        when (expected) {
+            is Int -> when (actual) {
+                is Double -> {
+                    Assertions.assertThat(actual).isEqualTo(expected.toDouble())
+                    return
+                }
+
+                is Long -> {
+                    Assertions.assertThat(actual).isEqualTo(expected.toLong())
+                    return
+                }
+
+                is BigInteger -> {
+                    Assertions.assertThat(actual).isEqualTo(expected.toBigInteger())
+                    return
+                }
+            }
+
+            is String -> {
+                when (actual) {
+                    is TemporalAccessor -> {
+                        Assertions.assertThat(actual).isEqualTo(TemporalScalar.parse(expected))
+                        return
+                    }
+                }
+                try {
+                    val expectedDate = ZonedDateTime.parse(expected)
+                    val actualDate = ZonedDateTime.parse(actual as String)
+                    Assertions.assertThat(actualDate).isEqualTo(expectedDate)
+                    return
+                } catch (ignore: DateTimeParseException) {
+                }
+                try {
+                    val expectedDate = LocalDateTime.parse(expected)
+                    val actualDate = LocalDateTime.parse(actual as String)
+                    Assertions.assertThat(actualDate).isEqualTo(expectedDate)
+                    return
+                } catch (ignore: DateTimeParseException) {
+                }
+                try {
+                    val expectedTime = LocalDate.parse(expected, DateTimeFormatter.ISO_DATE)
+                    val actualTime = LocalDate.parse(actual as String)
+                    Assertions.assertThat(actualTime).isEqualTo(expectedTime)
+                    return
+                } catch (ignore: DateTimeParseException) {
+                }
+                try {
+                    val expectedTime = LocalTime.parse(expected, DateTimeFormatter.ISO_TIME)
+                    val actualTime = LocalTime.parse(actual as String)
+                    Assertions.assertThat(actualTime).isEqualTo(expectedTime)
+                    return
+                } catch (ignore: DateTimeParseException) {
+                }
+                try {
+                    PeriodDuration.parse(expected)?.let { expectedDuration ->
+                        when (actual) {
+                            is PeriodDuration -> Assertions.assertThat(actual).isEqualTo(expectedDuration)
+                            is Period -> Assertions.assertThat(PeriodDuration.of(actual))
+                                .isEqualTo(expectedDuration)
+
+                            is Duration -> Assertions.assertThat(PeriodDuration.of(actual))
+                                .isEqualTo(expectedDuration)
+
+                            is String -> Assertions.assertThat(actual).isEqualTo(expected)
+                            else -> Assertions.fail<Any>("Unexpected type ${actual!!::class.java}")
+                        }
+                        return
+                    }
+                } catch (ignore: DateTimeParseException) {
+                }
+            }
+
+            is Map<*, *> -> {
+                if (actual is Number) {
+                    val low = expected["low"] as? Number
+                    val high = expected["high"] as? Number
+                    if (low != null && high != null && expected.size == 2) {
+                        // this is to convert the js bigint into a java long
+                        val highLong = high.toLong() shl 32
+                        val lowLong = low.toLong() and 0xFFFFFFFFL
+                        val expectedLong = highLong or lowLong
+                        when (actual) {
+                            is BigInteger -> Assertions.assertThat(actual.toLong()).isEqualTo(expectedLong)
+                            is Int -> Assertions.assertThat(actual.toLong()).isEqualTo(expectedLong)
+                            is Long -> Assertions.assertThat(actual).isEqualTo(expectedLong)
+                            else -> Assertions.fail<Any>("Unexpected type ${actual::class.java}")
+                        }
+                        return
+                    }
+                }
+                if (actual is Map<*, *>) {
+                    Assertions.assertThat(actual).hasSize(expected.count())
+                    expected.forEach { key, value ->
+                        assertCypherParam(value, actual[key])
+                    }
+                    return
+                }
+            }
+
+            is Iterable<*> -> {
+                if (actual is Iterable<*>) {
+                    Assertions.assertThat(actual).hasSize(expected.count())
+                    expected.forEachIndexed { index, expectedValue ->
+                        assertCypherParam(expectedValue, actual.elementAt(index))
+                    }
+                    return
+                }
+            }
+        }
+        Assertions.assertThat(actual).isEqualTo(expected)
+    }
+}
diff --git a/core/src/test/kotlin/org/neo4j/graphql/utils/CypherUtils.kt b/core/src/test/kotlin/org/neo4j/graphql/utils/CypherUtils.kt
new file mode 100644
index 00000000..81bc2111
--- /dev/null
+++ b/core/src/test/kotlin/org/neo4j/graphql/utils/CypherUtils.kt
@@ -0,0 +1,47 @@
+package org.neo4j.graphql.utils
+
+import org.neo4j.cypherdsl.core.Statement
+import org.neo4j.cypherdsl.core.renderer.Configuration
+import org.neo4j.cypherdsl.core.renderer.Dialect
+import org.neo4j.cypherdsl.core.renderer.Renderer
+import org.neo4j.cypherdsl.parser.CypherParser
+import org.neo4j.cypherdsl.parser.Options
+
+object CypherUtils {
+
+    private val NORMALIZING_PARSE_OPTIONS = Options.newOptions()
+        .createSortedMaps(true)
+        .alwaysCreateRelationshipsLTR(true)
+        .build()
+
+    private val NORMALIZING_RENDER_OPTIONS = Configuration.newConfig()
+        .withPrettyPrint(true)
+        .withGeneratedNames(
+            setOf(
+                Configuration.GeneratedNames.ALL_ALIASES,
+                Configuration.GeneratedNames.PARAMETER_NAMES,
+                Configuration.GeneratedNames.ENTITY_NAMES,
+            )
+        )
+        .build()
+
+    fun prettyPrintCypher(cypher: String, dialect: Dialect = Dialect.NEO4J_5): String {
+        val statement = CypherParser.parse(cypher, Options.defaultOptions())
+        return Renderer.getRenderer(
+            Configuration
+                .newConfig()
+                .withDialect(dialect)
+                .withIndentStyle(Configuration.IndentStyle.TAB)
+                .withPrettyPrint(true)
+                .build()
+        ).render(statement)
+    }
+
+    fun normalizeCypher(cypher: String): String {
+        val renderer = Renderer.getRenderer(NORMALIZING_RENDER_OPTIONS)
+        return renderer.render(parseNormalized(cypher))
+    }
+
+    fun parseNormalized(cypher: String): Statement =
+        CypherParser.parse(cypher, NORMALIZING_PARSE_OPTIONS)
+}
diff --git a/core/src/test/kotlin/org/neo4j/graphql/utils/InvalidQueryException.kt b/core/src/test/kotlin/org/neo4j/graphql/utils/InvalidQueryException.kt
deleted file mode 100644
index 5da9a8ce..00000000
--- a/core/src/test/kotlin/org/neo4j/graphql/utils/InvalidQueryException.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package org.neo4j.graphql.utils
-
-import graphql.GraphQLError
-
-class InvalidQueryException(@Suppress("MemberVisibilityCanBePrivate") val error: GraphQLError) :
-    RuntimeException(error.message)
diff --git a/core/src/test/kotlin/org/neo4j/graphql/utils/JsonUtils.kt b/core/src/test/kotlin/org/neo4j/graphql/utils/JsonUtils.kt
new file mode 100644
index 00000000..6b744c52
--- /dev/null
+++ b/core/src/test/kotlin/org/neo4j/graphql/utils/JsonUtils.kt
@@ -0,0 +1,49 @@
+package org.neo4j.graphql.utils
+
+import com.fasterxml.jackson.core.JsonGenerator
+import com.fasterxml.jackson.databind.JsonSerializer
+import com.fasterxml.jackson.databind.ObjectMapper
+import com.fasterxml.jackson.databind.SerializerProvider
+import com.fasterxml.jackson.databind.module.SimpleModule
+import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule
+import com.fasterxml.jackson.module.kotlin.registerKotlinModule
+import java.time.temporal.TemporalAmount
+
+object JsonUtils {
+    val MAPPER = ObjectMapper()
+        .registerKotlinModule()
+        .registerModules(JavaTimeModule())
+        .registerModule(
+            SimpleModule().addSerializer(
+                TemporalAmount::class.java,
+                object : JsonSerializer<TemporalAmount?>() {
+                    override fun serialize(
+                        value: TemporalAmount?,
+                        gen: JsonGenerator?,
+                        serializers: SerializerProvider?
+                    ) {
+                        gen?.writeString(value.toString())
+                    }
+                })
+        )
+        .disable(com.fasterxml.jackson.databind.SerializationFeature.WRITE_DATES_AS_TIMESTAMPS)
+        .disable(com.fasterxml.jackson.databind.SerializationFeature.WRITE_DURATIONS_AS_TIMESTAMPS)
+
+    inline fun <reified T> parseJson(content: String?): T = MAPPER.readValue(content, T::class.java)
+
+
+    fun prettyPrintJson(jsonString: String): String {
+        val map = parseJson<Map<String, Any?>>(jsonString)
+        return prettyPrintJson(map)
+    }
+
+    fun prettyPrintJson(map: Map<String, Any?>): String {
+        return prettyPrintJson(map.toSortedMap() as Any)
+    }
+
+    fun prettyPrintJson(data: Any?): String {
+        return MAPPER
+            .writerWithDefaultPrettyPrinter()
+            .writeValueAsString(data)
+    }
+}
diff --git a/core/src/test/kotlin/org/neo4j/graphql/utils/SchemaUtils.kt b/core/src/test/kotlin/org/neo4j/graphql/utils/SchemaUtils.kt
new file mode 100644
index 00000000..eb5715e8
--- /dev/null
+++ b/core/src/test/kotlin/org/neo4j/graphql/utils/SchemaUtils.kt
@@ -0,0 +1,51 @@
+package org.neo4j.graphql.utils
+
+import graphql.language.InterfaceTypeDefinition
+import graphql.language.UnionTypeDefinition
+import graphql.schema.GraphQLScalarType
+import graphql.schema.GraphQLSchema
+import graphql.schema.idl.*
+import org.neo4j.graphql.NoOpCoercing
+
+object SchemaUtils {
+
+    private val SCHEMA_PRINTER = SchemaPrinter(
+        SchemaPrinter.Options.defaultOptions()
+            .includeScalarTypes(true)
+            .includeSchemaDefinition(true)
+            .includeIntrospectionTypes(false)
+            .includeDirectiveDefinition {
+                // skip printing of graphql native directives
+                setOf("deprecated", "include", "oneOf", "skip", "specifiedBy").contains(it).not()
+            }
+    )
+
+    fun prettyPrintSchema(schema: String): String = SCHEMA_PRINTER.print(createMockSchema(schema))
+
+    fun prettyPrintSchema(schema: GraphQLSchema?): String = SCHEMA_PRINTER.print(schema)
+
+    fun createMockSchema(schema: String): GraphQLSchema {
+        val schemaParser = SchemaParser()
+
+        val reg = schemaParser.parse(schema)
+        val schemaGenerator = SchemaGenerator()
+        val runtimeWiring = RuntimeWiring.newRuntimeWiring()
+        (reg.getTypes(InterfaceTypeDefinition::class.java)
+                + reg.getTypes(UnionTypeDefinition::class.java))
+            .forEach { typeDefinition -> runtimeWiring.type(typeDefinition.name) { it.typeResolver { null } } }
+        reg
+            .scalars()
+            .filterNot { entry -> ScalarInfo.GRAPHQL_SPECIFICATION_SCALARS_DEFINITIONS.containsKey(entry.key) }
+            .forEach { (name, definition) ->
+                runtimeWiring.scalar(
+                    GraphQLScalarType.newScalar()
+                        .name(name)
+                        .definition(definition)
+                        .coercing(NoOpCoercing)
+                        .build()
+                )
+            }
+        return schemaGenerator.makeExecutableSchema(reg, runtimeWiring.build())
+    }
+
+}
diff --git a/core/src/test/kotlin/org/neo4j/graphql/utils/TestUtils.kt b/core/src/test/kotlin/org/neo4j/graphql/utils/TestUtils.kt
index c7f25dd2..672aeaf3 100644
--- a/core/src/test/kotlin/org/neo4j/graphql/utils/TestUtils.kt
+++ b/core/src/test/kotlin/org/neo4j/graphql/utils/TestUtils.kt
@@ -3,21 +3,46 @@ package org.neo4j.graphql.utils
 import org.junit.jupiter.api.DynamicContainer
 import org.junit.jupiter.api.DynamicNode
 import java.nio.file.Files
+import java.nio.file.Path
 import java.nio.file.Paths
+import java.util.function.Predicate
 import java.util.stream.Stream
+import kotlin.io.path.extension
 
 object TestUtils {
 
-    fun createTestsInPath(path: String, factory: (testFile: String) -> Stream<DynamicNode>): Stream<DynamicNode>? =
+    const val TEST_RESOURCES = "src/test/resources/"
+    val IS_TEMPLATE = Predicate<Path> { it.fileName.toString().endsWith(".js.adoc") }
+    val IS_TEST_FILE = Predicate<Path> { it.extension == "adoc" && !IS_TEMPLATE.test(it) }
+
+    fun createTestsInPath(path: String, factory: (file: Path) -> Stream<DynamicNode>): Stream<DynamicNode> =
         Files
-            .list(Paths.get("src/test/resources/$path"))
+            .list(Paths.get(TEST_RESOURCES, path))
             .sorted()
             .map {
                 val tests = if (Files.isDirectory(it)) {
                     createTestsInPath("$path/${it.fileName}", factory)
+                } else if (IS_TEST_FILE.test(it)) {
+                    factory(it)
                 } else {
-                    factory("$path/${it.fileName}")
+                    Stream.empty()
                 }
                 DynamicContainer.dynamicContainer(it.fileName.toString(), it.toUri(), tests)
             }
+
+    fun hasArrayWithMoreThenOneItems(value: Any): Boolean {
+        when (value) {
+            is Map<*, *> -> {
+                return value.any {
+                    val mapValue = it.value
+                    mapValue != null && hasArrayWithMoreThenOneItems(mapValue)
+                }
+            }
+
+            is Collection<*> -> {
+                return value.size > 1 || value.filterNotNull().any { hasArrayWithMoreThenOneItems(it) }
+            }
+        }
+        return false
+    }
 }
diff --git a/core/src/test/resources/augmentation-tests.adoc b/core/src/test/resources/augmentation-tests.adoc
index 8c9c708c..e827bdaf 100644
--- a/core/src/test/resources/augmentation-tests.adoc
+++ b/core/src/test/resources/augmentation-tests.adoc
@@ -65,7 +65,7 @@ schema {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -386,7 +386,7 @@ input _Neo4jPointInput {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -1146,7 +1146,7 @@ input _PublisherFilter {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
diff --git a/core/src/test/resources/custom-fields.adoc b/core/src/test/resources/custom-fields.adoc
index 04b35704..7e5620ff 100644
--- a/core/src/test/resources/custom-fields.adoc
+++ b/core/src/test/resources/custom-fields.adoc
@@ -59,7 +59,7 @@ CREATE (:Person {name:'Jane'}), (:Person {name:'John'})
 == Mutation conflicts with auto-generated field
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 mutation { createPerson(name:"Jill") {name} }
 ----
@@ -105,7 +105,7 @@ CREATE (:Person {name:'Jane'}), (:Person {name:'John'})
 == Query conflicts with auto-generated field
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query { Person(name:"Jane") {name} }
 ----
@@ -145,7 +145,7 @@ RETURN person {
 == Query non nullable value
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query { Person(name:"Jane") {name, label} }
 ----
@@ -192,7 +192,7 @@ RETURN person {
 == Query nullable value
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query { Person(name:"Jane") {name, nullable} }
 ----
@@ -239,7 +239,7 @@ RETURN person {
 == Query field by getter
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query { OrderPosition { amount } }
 ----
diff --git a/core/src/test/resources/cypher-directive-tests.adoc b/core/src/test/resources/cypher-directive-tests.adoc
index b5b02b3e..aa7846b8 100644
--- a/core/src/test/resources/cypher-directive-tests.adoc
+++ b/core/src/test/resources/cypher-directive-tests.adoc
@@ -47,7 +47,7 @@ schema {
 === Simple Cypher Directive on Field
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 { person { name }}
 ----
@@ -77,7 +77,7 @@ RETURN person {
 === render cypher query directive params args
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query($pname:String) { p3(name:$pname) { id }}
 ----
@@ -113,7 +113,7 @@ RETURN p3 {
 === render cypher field directive with params defaults
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 { person { age }}
 ----
@@ -155,7 +155,7 @@ RETURN person {
 === render cypher query directive
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 { p2 { id }}
 ----
@@ -188,7 +188,7 @@ RETURN p2 {
 === render cypher mutation directive
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 mutation { person: createPerson(name:"Joe") { id }}
 ----
@@ -224,7 +224,7 @@ RETURN person {
 === render cypher field directive with params
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 { person { age(mult:25) }}
 ----
@@ -266,7 +266,7 @@ RETURN person {
 === render cypher field directive nested
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 { person { friends { id } }}
 ----
@@ -308,7 +308,7 @@ RETURN person {
 === render cypher query directive params
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 { p3(name:"Jane") { id }}
 ----
@@ -344,7 +344,7 @@ RETURN p3 {
 === render cypher field directive scalar
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 { person { name }}
 ----
@@ -380,7 +380,7 @@ RETURN person {
 === pass through directives' result in query
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query queriesRootQuery {
   user: getUser(userId: "123") {
@@ -419,7 +419,7 @@ RETURN user AS user
 === pass through directives result in field
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query queriesRootQuery {
   person { id, data { firstName } }
diff --git a/core/src/test/resources/cypher-tests.adoc b/core/src/test/resources/cypher-tests.adoc
index 969d5693..c071f4ac 100644
--- a/core/src/test/resources/cypher-tests.adoc
+++ b/core/src/test/resources/cypher-tests.adoc
@@ -276,7 +276,7 @@ This is a migration of the tests located at https://github.com/neo4j-graphql/neo
 === simple Cypher query
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
     Movie(title: "River Runs Through It, A") {
@@ -300,7 +300,7 @@ MATCH (`movie`:`Movie`:`u_user-id`:`newMovieLabel` {title:$title}) RETURN `movie
 === Simple skip limit
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   Movie(title: "River Runs Through It, A", first: 2, offset: 1) {
@@ -326,7 +326,7 @@ MATCH (`movie`:`Movie`:`u_user-id`:`newMovieLabel` {title:$title}) RETURN `movie
 === Cypher projection skip limit
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
     Movie(title: "River Runs Through It, A") {
@@ -356,7 +356,7 @@ MATCH (`movie`:`Movie`:`u_user-id`:`newMovieLabel` {title:$title}) RETURN `movie
 === Handle Query with name not aligning to type
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   MoviesByYear(year: 2010) {
@@ -381,7 +381,7 @@ MATCH (`movie`:`Movie`:`u_user-id`:`newMovieLabel` {year:$year}) RETURN `movie`
 === Query without arguments, non-null type
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query {
   Movie {
@@ -405,7 +405,7 @@ MATCH (`movie`:`Movie`:`u_user-id`:`newMovieLabel`) RETURN `movie` { .movieId }
 === Query single object
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 
   {
@@ -430,7 +430,7 @@ MATCH (`movie`:`Movie`:`u_user-id`:`newMovieLabel` {movieId:$movieId}) RETURN `m
 === Query single object relation
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 
     {
@@ -459,7 +459,7 @@ MATCH (`movie`:`Movie`:`u_user-id`:`newMovieLabel` {movieId:$movieId}) RETURN `m
 === Query single object and array of objects relations
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 
     {
@@ -490,7 +490,7 @@ MATCH (`movie`:`Movie`:`u_user-id`:`newMovieLabel` {movieId:$movieId}) RETURN `m
 === Deeply nested object query
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 
  {
@@ -532,7 +532,7 @@ MATCH (`movie`:`Movie`:`u_user-id`:`newMovieLabel` {title:$title}) RETURN `movie
 === Handle meta field at beginning of selection set
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 
   {
@@ -558,7 +558,7 @@ MATCH (`movie`:`Movie`:`u_user-id`:`newMovieLabel` {title:$title}) RETURN `movie
 === Handle meta field at end of selection set
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 
   {
@@ -585,7 +585,7 @@ MATCH (`movie`:`Movie`:`u_user-id`:`newMovieLabel` {title:$title}) RETURN `movie
 === Handle meta field in middle of selection set
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 
   {
@@ -613,7 +613,7 @@ MATCH (`movie`:`Movie`:`u_user-id`:`newMovieLabel` {title:$title}) RETURN `movie
 === Handle @cypher directive without any params for sub-query
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
     Movie(title: "River Runs Through It, A") {
@@ -641,7 +641,7 @@ MATCH (`movie`:`Movie`:`u_user-id`:`newMovieLabel` {title:$title}) RETURN `movie
 === Pass @cypher directive default params to sub-query
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
     Movie(title: "River Runs Through It, A") {
@@ -666,7 +666,7 @@ MATCH (`movie`:`Movie`:`u_user-id`:`newMovieLabel` {title:$title}) RETURN `movie
 === Pass @cypher directive params to sub-query
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
     Movie(title: "River Runs Through It, A") {
@@ -691,7 +691,7 @@ MATCH (`movie`:`Movie`:`u_user-id`:`newMovieLabel` {title:$title}) RETURN `movie
 === Query for Neo4js internal _id
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
     Movie(_id: "0") {
@@ -717,7 +717,7 @@ MATCH (`movie`:`Movie`:`u_user-id`:`newMovieLabel`) WHERE id(`movie`)=0 RETURN `
 === Query for Neo4js internal _id and another param before _id
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
     Movie(title: "River Runs Through It, A", _id: "0") {
@@ -743,7 +743,7 @@ MATCH (`movie`:`Movie`:`u_user-id`:`newMovieLabel` {title:$title}) WHERE id(`mov
 === Query for Neo4js internal _id and another param after _id
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
     Movie(_id: "0", year: 2010) {
@@ -769,7 +769,7 @@ MATCH (`movie`:`Movie`:`u_user-id`:`newMovieLabel` {year:$year}) WHERE id(`movie
 === Query for Neo4js internal _id by dedicated Query MovieBy_Id(_id: String!)
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
     MovieBy_Id(_id: "0") {
@@ -795,7 +795,7 @@ MATCH (`movie`:`Movie`:`u_user-id`:`newMovieLabel`) WHERE id(`movie`)=0 RETURN `
 === Query for null value translates to 'IS NULL' WHERE clause
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
     Movie(poster: null) {
@@ -820,7 +820,7 @@ MATCH (`movie`:`Movie`:`u_user-id`:`newMovieLabel`) WHERE movie.poster IS NULL R
 === Query for null value combined with internal ID and another param
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
       Movie(poster: null, _id: "0", year: 2010) {
@@ -845,7 +845,7 @@ MATCH (`movie`:`Movie`:`u_user-id`:`newMovieLabel` {year:$year}) WHERE id(`movie
 === Cypher subquery filters
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 
   {
@@ -876,7 +876,7 @@ MATCH (`movie`:`Movie`:`u_user-id`:`newMovieLabel` {title:$title}) RETURN `movie
 === Cypher subquery filters with paging
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 
   {
@@ -907,7 +907,7 @@ MATCH (`movie`:`Movie`:`user-id`:`newMovieLabel` {title:$title}) RETURN `movie`
 === Handle @cypher directive on Query Type
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 
   {
@@ -936,7 +936,7 @@ WITH apoc.cypher.runFirstColumn('MATCH (g:Genre) WHERE toLower(g.name) CONTAINS
 === Add relationship mutation
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 mutation someMutation {
     AddMovieGenres(
@@ -977,7 +977,7 @@ mutation someMutation {
 === Add relationship mutation with GraphQL variables
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 mutation someMutation($from: _MovieInput!) {
     AddMovieGenres(
@@ -1018,7 +1018,7 @@ mutation someMutation($from: _MovieInput!) {
 === Add relationship mutation with relationship property
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 mutation someMutation {
     AddUserRated(
@@ -1083,7 +1083,7 @@ mutation someMutation {
 === Add reflexive relationship mutation with relationship property
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 mutation {
     AddUserFriends(
@@ -1180,7 +1180,7 @@ mutation {
 === Remove relationship mutation
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 mutation someMutation {
     RemoveMovieGenres(
@@ -1221,7 +1221,7 @@ mutation someMutation {
 === Remove reflexive relationship mutation
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 mutation {
     RemoveUserFriends(
@@ -1299,7 +1299,7 @@ mutation {
 === Handle GraphQL variables in nested selection - first/offset
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query ($year: Int!, $first: Int!) {
 
@@ -1328,7 +1328,7 @@ MATCH (`movie`:`Movie`:`u_user-id`:`newMovieLabel` {year:$year}) RETURN `movie`
 === Handle GraphQL variables in nest selection - @cypher param (not first/offset)
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query ($year: Int = 2016, $first: Int = 2, $scale:Int) {
 
@@ -1359,7 +1359,7 @@ MATCH (`movie`:`Movie`:`u_user-id`:`newMovieLabel` {year:$year}) RETURN `movie`
 === Return internal node id for _id field
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   Movie(year: 2016) {
@@ -1390,7 +1390,7 @@ MATCH (`movie`:`Movie`:`u_user-id`:`newMovieLabel` {year:$year}) RETURN `movie`
 === Treat enum as a scalar
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 
   {
@@ -1415,7 +1415,7 @@ MATCH (`book`:`Book`) RETURN `book` { .genre } AS `book`
 === Handle query fragment
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 
 fragment myTitle on Movie {
@@ -1448,7 +1448,7 @@ MATCH (`movie`:`Movie`:`u_user-id`:`newMovieLabel` {title:$title}) RETURN `movie
 === Handle multiple query fragments
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 
     fragment myTitle on Movie {
@@ -1486,7 +1486,7 @@ MATCH (`movie`:`Movie`:`u_user-id`:`newMovieLabel` {title:$title}) RETURN `movie
 === nested fragments
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 
     query movieItems {
@@ -1520,7 +1520,7 @@ MATCH (`movie`:`Movie`:`u_user-id`:`newMovieLabel` {year:$year}) RETURN `movie`
 === fragments on relations
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 
     query movieItems {
@@ -1552,7 +1552,7 @@ MATCH (`movie`:`Movie`:`u_user-id`:`newMovieLabel` {year:$year}) RETURN `movie`
 === nested fragments on relations
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 
     query movieItems {
@@ -1588,7 +1588,7 @@ MATCH (`movie`:`Movie`:`u_user-id`:`newMovieLabel` {year:$year}) RETURN `movie`
 === orderBy test - descending, top level - augmented schema
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
     Movie(year: 2010, orderBy:title_desc, first: 10) {
@@ -1616,7 +1616,7 @@ MATCH (`movie`:`Movie`:`u_user-id`:`newMovieLabel` {year:$year}) WITH `movie` OR
 === query for relationship properties
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
     Movie(title: "River Runs Through It, A") {
@@ -1646,7 +1646,7 @@ MATCH (`movie`:`Movie`:`u_user-id`:`newMovieLabel` {title:$title}) RETURN `movie
 === query reflexive relation nested in non-reflexive relation
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query {
     Movie {
@@ -1720,7 +1720,7 @@ MATCH (`movie`:`Movie`:`u_user-id`:`newMovieLabel`) RETURN `movie` { .movieId ,
 === query non-reflexive relation nested in reflexive relation
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query {
     User {
@@ -1793,7 +1793,7 @@ MATCH (`user`:`User`) RETURN `user` {_id: ID(`user`), .name ,friends: {FROM: [(`
 === query relation type with argument
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query {
     User {
@@ -1824,7 +1824,7 @@ MATCH (`user`:`User`) RETURN `user` {_id: ID(`user`), .name ,rated: [(`user`)-[`
 === query reflexive relation type with arguments
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query {
     User {
@@ -1864,7 +1864,7 @@ MATCH (`user`:`User`) RETURN `user` { .userId , .name ,friends: {FROM: [(`user`)
 === query using inline fragment
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 
   {
@@ -1899,7 +1899,7 @@ MATCH (`movie`:`Movie`:`u_user-id`:`newMovieLabel` {title:$title}) RETURN `movie
 === Create node with temporal properties
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 mutation {
     CreateTemporalNode(
@@ -2023,7 +2023,7 @@ mutation {
 === Query node with temporal properties using temporal arguments
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query {
     TemporalNode(
@@ -2145,7 +2145,7 @@ MATCH (`temporalNode`:`TemporalNode`) WHERE `temporalNode`.datetime.year = $date
 === Nested Query with temporal property arguments
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query {
     TemporalNode(
@@ -2310,7 +2310,7 @@ MATCH (`temporalNode`:`TemporalNode`) WHERE `temporalNode`.datetime.year = $date
 === Update temporal and non-temporal properties on node using temporal property node selection
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 mutation {
     UpdateTemporalNode(
@@ -2403,7 +2403,7 @@ MATCH (`temporalNode`:`TemporalNode`) WHERE `temporalNode`.datetime.year = $para
 === Update temporal list property on node using temporal property node selection
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 mutation {
     UpdateTemporalNode(
@@ -2462,7 +2462,7 @@ MATCH (`temporalNode`:`TemporalNode`) WHERE `temporalNode`.datetime.year = $para
 === Delete node using temporal property node selection
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 mutation {
     DeleteTemporalNode(
@@ -2553,7 +2553,7 @@ RETURN `temporalNode`
 === Add relationship mutation using temporal property node selection
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 mutation {
     AddTemporalNodeTemporalNodes(
@@ -2716,7 +2716,7 @@ mutation {
 === Remove relationship mutation using temporal property node selection
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 mutation {
     RemoveTemporalNodeTemporalNodes(
@@ -2881,7 +2881,7 @@ mutation {
 === Query relationship with temporal properties
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query {
     Movie {
@@ -2916,7 +2916,7 @@ MATCH (`movie`:`Movie`:`u_user-id`:`newMovieLabel`) RETURN `movie` {_id: ID(`mov
 === Add relationship mutation with temporal properties
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 mutation {
     AddUserRated(
@@ -3071,7 +3071,7 @@ mutation {
 === Add relationship mutation with list properties
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 mutation {
     AddUserRated(
@@ -3156,7 +3156,7 @@ mutation {
 === Add reflexive relationship mutation with temporal properties
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 mutation {
     AddUserFriends(
@@ -3373,7 +3373,7 @@ mutation {
 === Remove relationship mutation for relation type field
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 mutation {
     RemoveUserRated(
@@ -3429,7 +3429,7 @@ mutation {
 === Query nested temporal properties on reflexive relationship using temporal arguments
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query {
     User {
@@ -3679,7 +3679,7 @@ MATCH (`user`:`User`) RETURN `user` { .userId , .name ,friends: {FROM: [(`user`)
 === Query nested temporal properties on relationships using temporal arguments
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query {
     Movie {
@@ -3866,7 +3866,7 @@ MATCH (`movie`:`Movie`:`u_user-id`:`newMovieLabel`) RETURN `movie` {_id: ID(`mov
 === Query nested list properties on relationship
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query {
     Movie {
@@ -4028,7 +4028,7 @@ MATCH (`movie`:`Movie`:`u_user-id`:`newMovieLabel`) RETURN `movie` {_id: ID(`mov
 === UUID value generated if no id value provided
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 mutation {
     CreateMovie(title: "Yo Dawg", released: {year: 2009, month: 6, day: 9}) {
@@ -4055,7 +4055,7 @@ mutation {
 === Create node with list arguments
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 mutation {
     CreateMovie(
@@ -4117,7 +4117,7 @@ mutation {
 === Cypher array queries
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 
   {
@@ -4142,7 +4142,7 @@ MATCH (`movie`:`Movie`:`u_user-id`:`newMovieLabel`) WHERE `movie`.`year` IN $yea
 === Cypher array sub queries
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 
   {
@@ -4170,7 +4170,7 @@ MATCH (`movie`:`Movie`:`u_user-id`:`newMovieLabel`) WHERE `movie`.`year` IN $yea
 === Create node with non-null field
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 mutation {
     CreateState(
@@ -4199,7 +4199,7 @@ mutation {
 === Query node with ignored field
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query {
     State {
@@ -4224,7 +4224,7 @@ MATCH (`state`:`State`) RETURN `state` { .name } AS `state`
 === Deeply nested orderBy
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query {
     Movie(orderBy:title_desc) {
@@ -4254,7 +4254,7 @@ MATCH (`movie`:`Movie`:`u_user-id`:`newMovieLabel`) WITH `movie` ORDER BY movie.
 === Optimize performance - not requesting attributes with @cypher directive - early ORDER BY
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
     User(orderBy: name_desc) {
@@ -4279,7 +4279,7 @@ MATCH (`user`:`User`) WITH `user` ORDER BY user.name DESC RETURN `user` {_id: ID
 === Optimize performance - attributes with @cypher directive requested - no optimization
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
     User(orderBy: currentUserId_desc) {
@@ -4305,7 +4305,7 @@ MATCH (`user`:`User`) RETURN `user` {_id: ID(`user`), .name ,currentUserId: apoc
 === Query using enum orderBy
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query {
     Book(orderBy: [genre_asc]) {
@@ -4330,7 +4330,7 @@ MATCH (`book`:`Book`) WITH `book` ORDER BY book.genre ASC RETURN `book` {_id: ID
 === Query using temporal orderBy
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query {
     TemporalNode(
@@ -4358,7 +4358,7 @@ MATCH (`temporalNode`:`TemporalNode`) WITH `temporalNode` ORDER BY temporalNode.
 === Deeply nested query using temporal orderBy
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query {
     TemporalNode(orderBy: [datetime_desc]) {
@@ -4424,7 +4424,7 @@ MATCH (`temporalNode`:`TemporalNode`) WITH `temporalNode` ORDER BY temporalNode.
 === Handle the @cypher field with String payload using cypherParams
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query {
     User {
@@ -4450,7 +4450,7 @@ MATCH (`user`:`User`) RETURN `user` { .userId ,currentUserId: apoc.cypher.runFir
 === Handle nested @cypher fields that use cypherParams
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query {
     User {
@@ -4498,7 +4498,7 @@ MATCH (`user`:`User`) RETURN `user` { .userId ,currentUserId: apoc.cypher.runFir
 === Handle @cypher query using cypherParams with String payload
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query {
     currentUserId
@@ -4520,7 +4520,7 @@ WITH apoc.cypher.runFirstColumn('RETURN $cypherParams.currentUserId AS currentUs
 === Handle @cypher query using cypherParams with Object payload
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query {
     computedObjectWithCypherParams {
@@ -4544,7 +4544,7 @@ WITH apoc.cypher.runFirstColumn('RETURN { userId: $cypherParams.currentUserId }'
 === Handle the @cypher query with Boolean payload
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query {
     computedBoolean
@@ -4566,7 +4566,7 @@ WITH apoc.cypher.runFirstColumn('RETURN true', {offset:$offset, first:$first, cy
 === Handle the @cypher query with Int payload
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query {
     computedInt
@@ -4588,7 +4588,7 @@ WITH apoc.cypher.runFirstColumn('RETURN 1', {offset:$offset, first:$first, cyphe
 === Handle the @cypher query with Float payload
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query {
     computedFloat
@@ -4610,7 +4610,7 @@ WITH apoc.cypher.runFirstColumn('RETURN 3.14', {offset:$offset, first:$first, cy
 === Handle the @cypher query with String list payload
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query {
     computedStringList
@@ -4632,7 +4632,7 @@ WITH apoc.cypher.runFirstColumn("UNWIND ['hello', 'world'] AS stringList RETURN
 === Handle the @cypher query with Int list payload
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query {
     computedIntList
@@ -4654,7 +4654,7 @@ WITH apoc.cypher.runFirstColumn('UNWIND [1, 2, 3] AS intList RETURN intList', {o
 === Handle the @cypher query with Temporal payload
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query {
     computedTemporal {
@@ -4688,7 +4688,7 @@ WITH apoc.cypher.runFirstColumn('WITH datetime() AS now RETURN { year: now.year,
 === Handle @cypher mutation using cypherParams with String payload
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 mutation {
     currentUserId
@@ -4712,7 +4712,7 @@ CALL apoc.cypher.doIt('RETURN $cypherParams.currentUserId', {first:$first, offse
 === Handle @cypher mutation using cypherParams with Object payload
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 mutation {
     computedObjectWithCypherParams {
@@ -4738,7 +4738,7 @@ CALL apoc.cypher.doIt('RETURN { userId: $cypherParams.currentUserId }', {first:$
 === Handle @cypher mutation with String list payload
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 mutation {
     computedStringList
@@ -4762,7 +4762,7 @@ CALL apoc.cypher.doIt("UNWIND ['hello', 'world'] AS stringList RETURN stringList
 === Handle @cypher mutation with Temporal payload
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 mutation {
     computedTemporal {
@@ -4798,7 +4798,7 @@ CALL apoc.cypher.doIt('WITH datetime() AS now RETURN { year: now.year, month: no
 === Handle nested @cypher fields using parameterized arguments and cypherParams
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query someQuery(
     $strArg1: String
@@ -4835,7 +4835,7 @@ MATCH (`movie`:`Movie`:`u_user-id`:`newMovieLabel`) RETURN `movie` {_id: ID(`mov
 === Handle @cypher mutation with input type argument
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 mutation someMutation($strArg: String, $strInputArg: strInput) {
     customWithArguments(strArg: $strArg, strInputArg: $strInputArg )
@@ -4859,7 +4859,7 @@ CALL apoc.cypher.doIt('RETURN $strInputArg.strArg', {strArg:$strArg, strInputArg
 === Handle the @cypher query with parameterized input type argument
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query someQuery ($strArg: String, $strInputArg: strInput) {
     customWithArguments(strArg: $strArg, strInputArg: $strInputArg )
@@ -4881,7 +4881,7 @@ WITH apoc.cypher.runFirstColumn('RETURN $strInputArg.strArg', {offset:$offset, f
 === Handle the @cypher field on root query type with scalar payload, no args
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query {
     TemporalNode {
@@ -4905,7 +4905,7 @@ MATCH (`temporalNode`:`TemporalNode`) RETURN `temporalNode` {computedTimestamp:
 === Handle the @cypher field with parameterized value for field of input type argument
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query someQuery(
     $strArg: String
diff --git a/core/src/test/resources/dynamic-property-tests.adoc b/core/src/test/resources/dynamic-property-tests.adoc
index 0818d7fb..25fc4ffa 100644
--- a/core/src/test/resources/dynamic-property-tests.adoc
+++ b/core/src/test/resources/dynamic-property-tests.adoc
@@ -28,7 +28,7 @@ type Knows @relation(name:"KNOWS", from: "source", to: "knows"){
 === load dynamic properties
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   person(id:"32") {
@@ -104,7 +104,7 @@ RETURN person {
 === update dynamic properties
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 mutation {
   updatePerson(id:32, json: {foo: "bar", x: 42}) {
@@ -144,7 +144,7 @@ RETURN updatePerson {
 === merge dynamic properties
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 mutation {
   mergePerson(id:32, json: {foo: "bar", x: 42}) {
@@ -184,7 +184,7 @@ RETURN mergePerson {
 === create relation with dynamic properties
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 mutation {
   createKnows(source_id:2, knows_id: 3, json: {foo: "bar"}) {
@@ -228,7 +228,7 @@ RETURN createKnows {
 === update relation with dynamic properties
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 mutation {
   updateKnows(_id:2, json: {foo: "bar"}) {
@@ -265,7 +265,7 @@ RETURN updateKnows {
 === update relation with dynamic properties
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 mutation {
   mergeKnows(_id:2, json: {foo: "bar"}) {
diff --git a/core/src/test/resources/filter-tests.adoc b/core/src/test/resources/filter-tests.adoc
index fbce4d35..0cd0ab1b 100644
--- a/core/src/test/resources/filter-tests.adoc
+++ b/core/src/test/resources/filter-tests.adoc
@@ -80,7 +80,7 @@ SET p = props
 === Filter array _includes_some_
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 { person(filter: { hobbies_includes_some: ["Cycling", "Reading"] }) { name hobbies }}
 ----
@@ -125,7 +125,7 @@ RETURN person {
 === Filter array _includes_all_
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 { person(filter: { hobbies_includes_all: ["Cycling", "Reading"] }) { name hobbies }}
 ----
@@ -164,7 +164,7 @@ RETURN person {
 === Filter array _includes_none
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 { person(filter: { hobbies_includes_none: ["Dancing"] }) { name hobbies }}
 ----
@@ -203,7 +203,7 @@ RETURN person {
 === Filter array _includes_single
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 { person(filter: { hobbies_includes_single: ["Dancing"] }) { name hobbies }}
 ----
@@ -245,7 +245,7 @@ RETURN person {
 === Filter array _eq_
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 { person(filter: { hobbies: ["Cycling", "Reading"] }) { name hobbies }}
 ----
@@ -283,7 +283,7 @@ RETURN person {
 === Filter array _not_
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 { person(filter: { hobbies_not: ["Cycling", "Reading"] }) { name hobbies }}
 ----
@@ -326,7 +326,7 @@ RETURN person {
 === Filter enum _eq_
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 { person(filter: { gender: male }) { name }}
 ----
@@ -364,7 +364,7 @@ RETURN person {
 === Filter enum _not_
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 { person(filter: { gender_not: male }) { name }}
 ----
@@ -404,7 +404,7 @@ RETURN person {
 === Filter enum _not_in_
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 { person(filter: { gender_not_in: [male] }) { name }}
 ----
@@ -444,7 +444,7 @@ RETURN person {
 === Filter enum _in_
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 { person(filter: { gender_in: [male] }) { name }}
 ----
@@ -482,7 +482,7 @@ RETURN person {
 === Filter enum _null_
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 { person(filter: { gender: null }) { name }}
 ----
@@ -516,7 +516,7 @@ RETURN person {
 === Filter enum _not_null_
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 { person(filter: { gender_not: null }) { name }}
 ----
@@ -558,7 +558,7 @@ RETURN person {
 === Filter id _eq_
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 { person(filter: { id: "jane" }) { name }}
 ----
@@ -596,7 +596,7 @@ RETURN person {
 === Filter id _starts_with_
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 { person(filter: { id_starts_with: "ja" }) { name }}
 ----
@@ -634,7 +634,7 @@ RETURN person {
 === Filter id _not_starts_with_
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 { person(filter: { id_not_starts_with: "ja" }) { name }}
 ----
@@ -674,7 +674,7 @@ RETURN person {
 === Filter id _ends_with_
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 { person(filter: { id_ends_with: "ne" }) { name }}
 ----
@@ -712,7 +712,7 @@ RETURN person {
 === Filter id _not_ends_with_
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 { person(filter: { id_not_ends_with: "ne" }) { name }}
 ----
@@ -752,7 +752,7 @@ RETURN person {
 === Filter id _matches_
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 { person(filter: { id_matches:"ja.*" }) { name }}
 ----
@@ -790,7 +790,7 @@ RETURN person {
 === Filter id _contains_
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 { person(filter: { id_contains: "an" }) { name }}
 ----
@@ -828,7 +828,7 @@ RETURN person {
 === Filter id _not_contains_
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 { person(filter: { id_not_contains: "an" }) { name }}
 ----
@@ -868,7 +868,7 @@ RETURN person {
 === Filter id _in_
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 { person(filter: { id_in: ["jane"] }) { name }}
 ----
@@ -906,7 +906,7 @@ RETURN person {
 === Filter id _not_in_
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 { person(filter: { id_not_in: ["joe"] }) { name }}
 ----
@@ -946,7 +946,7 @@ RETURN person {
 === Filter id _not_
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 { person(filter: { id_not: "joe" }) { name }}
 ----
@@ -988,7 +988,7 @@ RETURN person {
 === filter _@nativeId_ _eq_
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 { company(filter: { _id: 1 }) { name, _id }}
 ----
@@ -1017,7 +1017,7 @@ RETURN company {
 === filter _@nativeId_ _in_
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 { company(filter: { _id_in: [1,2] }) { name, _id }}
 ----
@@ -1046,7 +1046,7 @@ RETURN company {
 === filter _@nativeId_ _not_in_
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 { company(filter: { _id_not_in: [1,2] }) { name, _id }}
 ----
@@ -1075,7 +1075,7 @@ RETURN company {
 === filter _@nativeId_ _not_
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 { company(filter: { _id_not: 1 }) { name, _id }}
 ----
@@ -1106,7 +1106,7 @@ RETURN company {
 === Filter number _eq_
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 { person(filter: { age: 38 }) { name }}
 ----
@@ -1144,7 +1144,7 @@ RETURN person {
 === Filter number _in_
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 { person(filter: { age_in: [38] }) { name }}
 ----
@@ -1182,7 +1182,7 @@ RETURN person {
 === Filter number _not_in_
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 { person(filter: { age_not_in: [38] }) { name }}
 ----
@@ -1222,7 +1222,7 @@ RETURN person {
 === Filter number _lte_
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 { person(filter: { age_lte: 40 }) { name }}
 ----
@@ -1262,7 +1262,7 @@ RETURN person {
 === Filter number _lt_
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 { person(filter: { age_lt: 40 }) { name }}
 ----
@@ -1302,7 +1302,7 @@ RETURN person {
 === Filter number _gt_
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 { person(filter: { age_gt: 40 }) { name }}
 ----
@@ -1340,7 +1340,7 @@ RETURN person {
 === Filter number _gte_
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 { person(filter: { age_gte: 40 }) { name }}
 ----
@@ -1378,7 +1378,7 @@ RETURN person {
 === Filter number _null_
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 { person(filter: { age: null }) { name }}
 ----
@@ -1412,7 +1412,7 @@ RETURN person {
 === Filter number _not_null_
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 { person(filter: { age_not: null }) { name }}
 ----
@@ -1454,7 +1454,7 @@ RETURN person {
 === Filter float _eq_
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 { person(filter: { height: 1.75 }) { name }}
 ----
@@ -1492,7 +1492,7 @@ RETURN person {
 === Filter float _not_
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 { person(filter: { height_not: 1.75 }) { name }}
 ----
@@ -1532,7 +1532,7 @@ RETURN person {
 === Filter float _in_
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 { person(filter: { height_in: [1.75] }) { name }}
 ----
@@ -1570,7 +1570,7 @@ RETURN person {
 === Filter float _not_in_
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 { person(filter: { height_not_in: [1.75] }) { name }}
 ----
@@ -1610,7 +1610,7 @@ RETURN person {
 === Filter float _lte_
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 { person(filter: { height_lte: 1.80 }) { name }}
 ----
@@ -1650,7 +1650,7 @@ RETURN person {
 === Filter float _lt_
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 { person(filter: { height_lt: 1.80 }) { name }}
 ----
@@ -1690,7 +1690,7 @@ RETURN person {
 === Filter float _gte_
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 { person(filter: { height_gte: 1.80 }) { name }}
 ----
@@ -1728,7 +1728,7 @@ RETURN person {
 === Filter float _gt_
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 { person(filter: { height_gt: 1.80 }) { name }}
 ----
@@ -1766,7 +1766,7 @@ RETURN person {
 === Filter float _null_
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 { person(filter: { height: null }) { name }}
 ----
@@ -1800,7 +1800,7 @@ RETURN person {
 === Filter float _not_null_
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 { person(filter: { height_not: null }) { name }}
 ----
@@ -1842,7 +1842,7 @@ RETURN person {
 === Filter string _eq_
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 { person(filter: { name: "Jane" }) { name }}
 ----
@@ -1880,7 +1880,7 @@ RETURN person {
 === Filter string _starts_with_
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 { person(filter: { name_starts_with: "Ja" }) { name }}
 ----
@@ -1918,7 +1918,7 @@ RETURN person {
 === Filter string _not_starts_with_
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 { person(filter: { name_not_starts_with: "Ja" }) { name }}
 ----
@@ -1958,7 +1958,7 @@ RETURN person {
 === Filter string _ends_with_
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 { person(filter: { name_ends_with: "ne" }) { name }}
 ----
@@ -1996,7 +1996,7 @@ RETURN person {
 === Filter string _not_ends_with_
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 { person(filter: { name_not_ends_with: "ne" }) { name }}
 ----
@@ -2036,7 +2036,7 @@ RETURN person {
 === Filter string _matches_
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 { person(filter: { name_matches: "Ja.*" }) { name }}
 ----
@@ -2074,7 +2074,7 @@ RETURN person {
 === Filter string _contains_
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 { person(filter: { name_contains: "an" }) { name }}
 ----
@@ -2112,7 +2112,7 @@ RETURN person {
 === Filter string _not_contains_
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 { person(filter: { name_not_contains: "an" }) { name }}
 ----
@@ -2152,7 +2152,7 @@ RETURN person {
 === Filter string _in_
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 { person(filter: { name_in: ["Jane"] }) { name }}
 ----
@@ -2190,7 +2190,7 @@ RETURN person {
 === Filter string _not_in_
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 { person(filter: { name_not_in: ["Joe"] }) { name }}
 ----
@@ -2230,7 +2230,7 @@ RETURN person {
 === Filter string _not_
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 { person(filter: { name_not: "Joe" }) { name }}
 ----
@@ -2270,7 +2270,7 @@ RETURN person {
 === Filter string _null_
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 { person(filter: { name: null }) { name }}
 ----
@@ -2304,7 +2304,7 @@ RETURN person {
 === Filter string _not_null_
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 { person(filter: { name_not: null }) { name }}
 ----
@@ -2346,7 +2346,7 @@ RETURN person {
 === Filter boolean _eq_
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 { person(filter: { fun: true }) { name }}
 ----
@@ -2386,7 +2386,7 @@ RETURN person {
 === Filter boolean _not_
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 { person(filter: { fun_not: true }) { name }}
 ----
@@ -2424,7 +2424,7 @@ RETURN person {
 === Filter boolean _null_
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 { person(filter: { fun: null }) { name }}
 ----
@@ -2458,7 +2458,7 @@ RETURN person {
 === Filter boolean _not_null_
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 { person(filter: { fun_not: null }) { name }}
 ----
@@ -2500,7 +2500,7 @@ RETURN person {
 === Filter spatial _eq_
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 { person(filter: { location: {longitude: 1, latitude: 2} }) { name }}
 ----
@@ -2540,7 +2540,7 @@ RETURN person {
 === Filter spatial _not_
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 { person(filter: { location_not: {longitude: 1, latitude: 2} }) { name }}
 ----
@@ -2580,7 +2580,7 @@ RETURN person {
 === Filter spatial _null_
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 { person(filter: { location: null }) { name }}
 ----
@@ -2616,7 +2616,7 @@ RETURN person {
 === Filter spatial _not_null_
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 { person(filter: { location_not: null }) { name }}
 ----
@@ -2654,7 +2654,7 @@ RETURN person {
 === Filter spatial _distance eq_
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   person(filter:{ location_distance: { distance: 3, point: {longitude: 1, latitude:2, height: 3}}}){
@@ -2701,7 +2701,7 @@ RETURN person {
 === Filter spatial _distance lt_
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   person(filter:{ location_distance_lt: { distance: 3, point: {longitude: 1, latitude:2, height: 3}}}){
@@ -2750,7 +2750,7 @@ RETURN person {
 === Filter spatial _distance lte_
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   person(filter:{ location_distance_lte: { distance: 3, point: {longitude: 1, latitude:2, height: 3}}}){
@@ -2799,7 +2799,7 @@ RETURN person {
 === Filter spatial _distance gt_
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   person(filter:{ location_distance_gt: { distance: 3, point: {longitude: 1, latitude:2, height: 3}}}){
@@ -2848,7 +2848,7 @@ RETURN person {
 === Filter spatial _distance gte_
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   person(filter:{ location_distance_gte: { distance: 3, point: {longitude: 1, latitude:2, height: 3}}}){
@@ -2899,7 +2899,7 @@ RETURN person {
 === Filter _null_ on relation
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 { person(filter: { company: null }) { name }}
 ----
@@ -2929,7 +2929,7 @@ RETURN person {
 === Filter _not null_ on relation
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 { person(filter: { company_not: null }) { name }}
 ----
@@ -2967,7 +2967,7 @@ RETURN person {
 === Filter _AND_
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 { person(filter: { AND: [{ fun: true, name: "Jane"}]  }) { name }}
 ----
@@ -3005,7 +3005,7 @@ RETURN person {
 '''
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 { person(filter: { AND: [{ fun: true},{name: "Jane"}]  }) { name }}
 ----
@@ -3047,7 +3047,7 @@ RETURN person {
 ==== Multiple fields
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 { person(filter: { OR: [{ fun: false, name_not: "Jane"}]  }) { name }}
 ----
@@ -3087,7 +3087,7 @@ RETURN person {
 ==== Same field multiple values
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 { person(filter: { OR: [{ name: "Jane"}, { name: "Joe"}]  }) { name }}
 ----
@@ -3129,7 +3129,7 @@ RETURN person {
 ==== Multiple fields + array
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 { person(filter: { OR: [{ fun: true},{name_in: ["Jane"]}]  }) { name }}
 ----
@@ -3171,7 +3171,7 @@ RETURN person {
 === Complex filter
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 { person(filter: { OR: [{ AND: [{fun: true},{height:1.75}]},{name_in: ["Jane"]}]  }) { name }}
 ----
@@ -3215,7 +3215,7 @@ RETURN person {
 === Filter object _some_ (cypher _ANY_)
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 { p: company(filter: { employees_some : { name : "Jane" } }) { name }}
 ----
@@ -3252,7 +3252,7 @@ RETURN p {
 '''
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 { p: company(filter: { employees_some : { name : "Jill" } }) { name }}
 ----
@@ -3291,7 +3291,7 @@ RETURN p {
 === Filter object _every_ (cypher _ALL_)
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 { p: company(filter: { employees_every : { name : "Jill" } }) { name }}
 ----
@@ -3330,7 +3330,7 @@ RETURN p {
 === Filter object _none_ (cypher _NONE_)
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 { p: company(filter: { employees_none : { name : "Jane" } }) { name }}
 ----
@@ -3367,7 +3367,7 @@ RETURN p {
 '''
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 { p: company(filter: { employees_none : { name : "Jill" } }) { name }}
 ----
@@ -3406,7 +3406,7 @@ RETURN p {
 === Filter object _single_ (cypher _SINGLE_)
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 { p: company(filter: { employees_single : { name : "Jill" } }) { name }}
 ----
@@ -3445,7 +3445,7 @@ RETURN p {
 === Filter object _null_
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 { p: person(filter: { company : null }) { name }}
 ----
@@ -3481,7 +3481,7 @@ RETURN p {
 === Filter object _not_null_
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 { p: person(filter: { company_not : null }) { name }}
 ----
@@ -3523,7 +3523,7 @@ RETURN p {
 === Filter object whose parent is relationship
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 { person { skills(filter: {skill: {name_starts_with: "F"}}) { skill { name } proficiencyLevel }}}
 ----
@@ -3561,7 +3561,7 @@ RETURN person {
 === Cascaded filter object string _eq_
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 { person(filter: { company : { name : "ACME" } }) { name }}
 ----
@@ -3602,7 +3602,7 @@ RETURN person {
 === Cascaded filter object _not_ string _eq_
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 { person(filter: { company_not : { name : "ACME" } }) { name }}
 ----
@@ -3641,7 +3641,7 @@ RETURN person {
 === Cascaded filter object string _in_
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 { p: company(filter: { employees : { name_in : ["Jane","Joe"] } }) { name }}
 ----
@@ -3680,7 +3680,7 @@ RETURN p {
 === Cascaded logical operator filter on object
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 { p: company { employees(filter: { OR: [{ name: "Jane" },{name:"Joe"}]}) { name }}}
 ----
@@ -3735,7 +3735,7 @@ RETURN p {
 === Filter as variable
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query filterQuery($filter: _PersonFilter) { person(filter: $filter) { name }}
 ----
@@ -3789,7 +3789,7 @@ RETURN person {
 === Variable pass through
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query filterQuery($name: String) { person(filter: {name : $name}) { name }}
 ----
@@ -3833,7 +3833,7 @@ RETURN person {
 === Handle _null_ via variable
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query filterQuery($name: String) { person(filter: {name : $name}) { name }}
 ----
@@ -3873,7 +3873,7 @@ RETURN person {
 === Handle _not_null_ via variable
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query filterQuery($name: String) { person(filter: {name_not : $name}) { name }}
 ----
@@ -3921,7 +3921,7 @@ RETURN person {
 === Filter with alias
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 { p: company { employees(filter: { name: "Jane" }) { name }}}
 ----
diff --git a/core/src/test/resources/integration-test-files/aliasing.adoc b/core/src/test/resources/integration-test-files/aliasing.adoc
index 5648eaba..90afb89f 100644
--- a/core/src/test/resources/integration-test-files/aliasing.adoc
+++ b/core/src/test/resources/integration-test-files/aliasing.adoc
@@ -25,7 +25,7 @@ CREATE (movie:Movie)
 == should correctly alias an ID field
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query ($id: ID!) {
   movies(where: {id: $id}) {
@@ -40,7 +40,7 @@ query ($id: ID!) {
 [source,json,request=true]
 ----
 {
-  "id": "RandomString1"
+  "id" : "RandomString1"
 }
 ----
 
@@ -48,7 +48,7 @@ query ($id: ID!) {
 [source,json]
 ----
 {
-  "param0": "RandomString1"
+  "param0" : "RandomString1"
 }
 ----
 
@@ -68,22 +68,18 @@ RETURN this {
 [source,json,response=true]
 ----
 {
-  "movies": [
-    {
-      "aliased": "RandomString1",
-      "budget": 63,
-      "boxOffice": 465.3
-    }
-  ]
+  "movies" : [ {
+    "aliased" : "RandomString1",
+    "budget" : 63,
+    "boxOffice" : 465.3
+  } ]
 }
 ----
 
-'''
-
 == should correctly alias an Int field
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query ($id: ID!) {
   movies(where: {id: $id}) {
@@ -98,7 +94,7 @@ query ($id: ID!) {
 [source,json,request=true]
 ----
 {
-  "id": "RandomString1"
+  "id" : "RandomString1"
 }
 ----
 
@@ -106,7 +102,7 @@ query ($id: ID!) {
 [source,json]
 ----
 {
-  "param0": "RandomString1"
+  "param0" : "RandomString1"
 }
 ----
 
@@ -126,22 +122,18 @@ RETURN this {
 [source,json,response=true]
 ----
 {
-  "movies": [
-    {
-      "id": "RandomString1",
-      "aliased": 63,
-      "boxOffice": 465.3
-    }
-  ]
+  "movies" : [ {
+    "id" : "RandomString1",
+    "aliased" : 63,
+    "boxOffice" : 465.3
+  } ]
 }
 ----
 
-'''
-
 == should correctly alias an Float field
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query ($id: ID!) {
   movies(where: {id: $id}) {
@@ -156,7 +148,7 @@ query ($id: ID!) {
 [source,json,request=true]
 ----
 {
-  "id": "RandomString1"
+  "id" : "RandomString1"
 }
 ----
 
@@ -164,7 +156,7 @@ query ($id: ID!) {
 [source,json]
 ----
 {
-  "param0": "RandomString1"
+  "param0" : "RandomString1"
 }
 ----
 
@@ -184,15 +176,10 @@ RETURN this {
 [source,json,response=true]
 ----
 {
-  "movies": [
-    {
-      "id": "RandomString1",
-      "budget": 63,
-      "aliased": 465.3
-    }
-  ]
+  "movies" : [ {
+    "id" : "RandomString1",
+    "budget" : 63,
+    "aliased" : 465.3
+  } ]
 }
 ----
-
-'''
-
diff --git a/core/src/test/resources/integration-test-files/aliasing.js.adoc b/core/src/test/resources/integration-test-files/aliasing.js.adoc
new file mode 100644
index 00000000..d4899c6c
--- /dev/null
+++ b/core/src/test/resources/integration-test-files/aliasing.js.adoc
@@ -0,0 +1,180 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= Aliasing
+
+== Setup
+
+.Schema
+[source,graphql,schema=true]
+----
+type Movie {
+  id: ID!
+  budget: Int!
+  boxOffice: Float!
+}
+----
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (movie:Movie)
+ SET movie += {id: "RandomString1", boxOffice: 465.3, budget: 63}
+----
+
+== should correctly alias an ID field
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+query ($id: ID!) {
+  movies(where: {id: $id}) {
+    aliased: id
+    budget
+    boxOffice
+  }
+}
+----
+
+.GraphQL params input
+[source,json,request=true]
+----
+{
+  "id": "RandomString1"
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "RandomString1"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE this.id = $param0
+RETURN this { .budget, .boxOffice, aliased: this.id } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "movies": [
+    {
+      "aliased": "RandomString1",
+      "budget": 63,
+      "boxOffice": 465.3
+    }
+  ]
+}
+----
+
+== should correctly alias an Int field
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+query ($id: ID!) {
+  movies(where: {id: $id}) {
+    id
+    aliased: budget
+    boxOffice
+  }
+}
+----
+
+.GraphQL params input
+[source,json,request=true]
+----
+{
+  "id": "RandomString1"
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "RandomString1"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE this.id = $param0
+RETURN this { .id, .boxOffice, aliased: this.budget } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "movies": [
+    {
+      "id": "RandomString1",
+      "aliased": 63,
+      "boxOffice": 465.3
+    }
+  ]
+}
+----
+
+== should correctly alias an Float field
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+query ($id: ID!) {
+  movies(where: {id: $id}) {
+    id
+    budget
+    aliased: boxOffice
+  }
+}
+----
+
+.GraphQL params input
+[source,json,request=true]
+----
+{
+  "id": "RandomString1"
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "RandomString1"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE this.id = $param0
+RETURN this { .id, .budget, aliased: this.boxOffice } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "movies": [
+    {
+      "id": "RandomString1",
+      "budget": 63,
+      "aliased": 465.3
+    }
+  ]
+}
+----
diff --git a/core/src/test/resources/integration-test-files/config-options/query-options.adoc b/core/src/test/resources/integration-test-files/config-options/query-options.adoc
index ae2778b5..228fe9c6 100644
--- a/core/src/test/resources/integration-test-files/config-options/query-options.adoc
+++ b/core/src/test/resources/integration-test-files/config-options/query-options.adoc
@@ -29,7 +29,7 @@ CREATE (:Movie {id: "RandomString1"}), (:Movie {id: "RandomString1"}), (:Movie {
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query ($id: ID) {
   movies(where: {id: $id}) {
@@ -42,7 +42,7 @@ query ($id: ID) {
 [source,json,request=true]
 ----
 {
-  "id": "RandomString1"
+  "id" : "RandomString1"
 }
 ----
 
@@ -50,7 +50,7 @@ query ($id: ID) {
 [source,json]
 ----
 {
-  "param0": "RandomString1"
+  "param0" : "RandomString1"
 }
 ----
 
@@ -68,19 +68,12 @@ RETURN this {
 [source,json,response=true,ignore-order]
 ----
 {
-  "movies": [
-    {
-      "id": "RandomString1"
-    },
-    {
-      "id": "RandomString1"
-    },
-    {
-      "id": "RandomString1"
-    }
-  ]
+  "movies" : [ {
+    "id" : "RandomString1"
+  }, {
+    "id" : "RandomString1"
+  }, {
+    "id" : "RandomString1"
+  } ]
 }
 ----
-
-'''
-
diff --git a/core/src/test/resources/integration-test-files/config-options/query-options.js.adoc b/core/src/test/resources/integration-test-files/config-options/query-options.js.adoc
new file mode 100644
index 00000000..e8c1356e
--- /dev/null
+++ b/core/src/test/resources/integration-test-files/config-options/query-options.js.adoc
@@ -0,0 +1,82 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= query options
+
+== Setup
+
+.Schema
+[source,graphql,schema=true]
+----
+type Actor {
+  name: String
+  movies: [Movie!]! @relationship(type: "ACTED_IN", direction: IN)
+}
+
+type Movie {
+  id: ID!
+  title: String!
+  actors: [Actor!]! @relationship(type: "ACTED_IN", direction: OUT)
+}
+----
+
+== queries should work with runtime set to interpreted
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (:Movie {id: "RandomString1"}), (:Movie {id: "RandomString1"}), (:Movie {id: "RandomString1"})
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+query ($id: ID) {
+  movies(where: {id: $id}) {
+    id
+  }
+}
+----
+
+.GraphQL params input
+[source,json,request=true]
+----
+{
+  "id": "RandomString1"
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "RandomString1"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE this.id = $param0
+RETURN this { .id } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "movies": [
+    {
+      "id": "RandomString1"
+    },
+    {
+      "id": "RandomString1"
+    },
+    {
+      "id": "RandomString1"
+    }
+  ]
+}
+----
diff --git a/core/src/test/resources/integration-test-files/config-options/startup-validation.adoc b/core/src/test/resources/integration-test-files/config-options/startup-validation.adoc
deleted file mode 100644
index af65a318..00000000
--- a/core/src/test/resources/integration-test-files/config-options/startup-validation.adoc
+++ /dev/null
@@ -1,833 +0,0 @@
-:toc:
-:toclevels: 42
-
-= Startup Validation
-
-== should not throw an error for valid type defs when running startup validation
-
-.Schema
-[source,graphql,schema=true]
-----
-type User {
-  id: ID!
-  firstName: String!
-  lastName: String!
-}
-----
-
-.Augmented Schema
-[source,graphql]
-----
-schema {
-  query: Query
-}
-
-"""Pagination information (Relay)"""
-type PageInfo {
-  endCursor: String
-  hasNextPage: Boolean!
-  hasPreviousPage: Boolean!
-  startCursor: String
-}
-
-type Query {
-  users(options: UserOptions, where: UserWhere): [User!]!
-  usersConnection(after: String, first: Int, sort: [UserSort], where: UserWhere): UsersConnection!
-}
-
-"""An enum for sorting in either ascending or descending order."""
-enum SortDirection {
-  """Sort by field values in ascending order."""
-  ASC
-  """Sort by field values in descending order."""
-  DESC
-}
-
-type User {
-  firstName: String!
-  id: ID!
-  lastName: String!
-}
-
-type UserEdge {
-  cursor: String!
-  node: User!
-}
-
-input UserOptions {
-  limit: Int
-  offset: Int
-  """
-  Specify one or more UserSort objects to sort Users by. The sorts will be applied in the order in which they are arranged in the array.
-  """
-  sort: [UserSort!]
-}
-
-"""
-Fields to sort Users by. The order in which sorts are applied is not guaranteed when specifying many fields in one UserSort object.
-"""
-input UserSort {
-  firstName: SortDirection
-  id: SortDirection
-  lastName: SortDirection
-}
-
-input UserWhere {
-  AND: [UserWhere!]
-  NOT: UserWhere
-  OR: [UserWhere!]
-  firstName: String
-  firstName_CONTAINS: String
-  firstName_ENDS_WITH: String
-  firstName_IN: [String!]
-  firstName_STARTS_WITH: String
-  id: ID
-  id_CONTAINS: ID
-  id_ENDS_WITH: ID
-  id_IN: [ID!]
-  id_STARTS_WITH: ID
-  lastName: String
-  lastName_CONTAINS: String
-  lastName_ENDS_WITH: String
-  lastName_IN: [String!]
-  lastName_STARTS_WITH: String
-}
-
-type UsersConnection {
-  edges: [UserEdge!]!
-  pageInfo: PageInfo!
-  totalCount: Int!
-}
-----
-
-'''
-
-== should not throw an error for invalid type defs when validate is false
-
-.Schema
-[source,graphql,schema=true]
-----
-type Point {
-  latitude: Float!
-  longitude: Float!
-}
-----
-
-.Augmented Schema
-[source,graphql]
-----
-schema {
-  query: Query
-}
-
-"""Pagination information (Relay)"""
-type PageInfo {
-  endCursor: String
-  hasNextPage: Boolean!
-  hasPreviousPage: Boolean!
-  startCursor: String
-}
-
-type Point {
-  latitude: Float!
-  longitude: Float!
-}
-
-type PointEdge {
-  cursor: String!
-  node: Point!
-}
-
-input PointOptions {
-  limit: Int
-  offset: Int
-  """
-  Specify one or more PointSort objects to sort Points by. The sorts will be applied in the order in which they are arranged in the array.
-  """
-  sort: [PointSort!]
-}
-
-"""
-Fields to sort Points by. The order in which sorts are applied is not guaranteed when specifying many fields in one PointSort object.
-"""
-input PointSort {
-  latitude: SortDirection
-  longitude: SortDirection
-}
-
-input PointWhere {
-  AND: [PointWhere!]
-  NOT: PointWhere
-  OR: [PointWhere!]
-  latitude: Float
-  latitude_GT: Float
-  latitude_GTE: Float
-  latitude_IN: [Float!]
-  latitude_LT: Float
-  latitude_LTE: Float
-  longitude: Float
-  longitude_GT: Float
-  longitude_GTE: Float
-  longitude_IN: [Float!]
-  longitude_LT: Float
-  longitude_LTE: Float
-}
-
-type PointsConnection {
-  edges: [PointEdge!]!
-  pageInfo: PageInfo!
-  totalCount: Int!
-}
-
-type Query {
-  points(options: PointOptions, where: PointWhere): [Point!]!
-  pointsConnection(after: String, first: Int, sort: [PointSort], where: PointWhere): PointsConnection!
-}
-
-"""An enum for sorting in either ascending or descending order."""
-enum SortDirection {
-  """Sort by field values in ascending order."""
-  ASC
-  """Sort by field values in descending order."""
-  DESC
-}
-----
-
-'''
-
-== @customResolver
-
-=== should warn for missing custom resolvers
-
-.Schema
-[source,graphql,schema=true]
-----
-type User {
-  id: ID!
-  firstName: String!
-  lastName: String!
-  fullName: String @customResolver(requires: "firstName lastName")
-}
-----
-
-.Augmented Schema
-[source,graphql]
-----
-schema {
-  query: Query
-}
-
-"""Pagination information (Relay)"""
-type PageInfo {
-  endCursor: String
-  hasNextPage: Boolean!
-  hasPreviousPage: Boolean!
-  startCursor: String
-}
-
-type Query {
-  users(options: UserOptions, where: UserWhere): [User!]!
-  usersConnection(after: String, first: Int, sort: [UserSort], where: UserWhere): UsersConnection!
-}
-
-"""An enum for sorting in either ascending or descending order."""
-enum SortDirection {
-  """Sort by field values in ascending order."""
-  ASC
-  """Sort by field values in descending order."""
-  DESC
-}
-
-type User {
-  firstName: String!
-  fullName: String
-  id: ID!
-  lastName: String!
-}
-
-type UserEdge {
-  cursor: String!
-  node: User!
-}
-
-input UserOptions {
-  limit: Int
-  offset: Int
-  """
-  Specify one or more UserSort objects to sort Users by. The sorts will be applied in the order in which they are arranged in the array.
-  """
-  sort: [UserSort!]
-}
-
-"""
-Fields to sort Users by. The order in which sorts are applied is not guaranteed when specifying many fields in one UserSort object.
-"""
-input UserSort {
-  firstName: SortDirection
-  id: SortDirection
-  lastName: SortDirection
-}
-
-input UserWhere {
-  AND: [UserWhere!]
-  NOT: UserWhere
-  OR: [UserWhere!]
-  firstName: String
-  firstName_CONTAINS: String
-  firstName_ENDS_WITH: String
-  firstName_IN: [String!]
-  firstName_STARTS_WITH: String
-  id: ID
-  id_CONTAINS: ID
-  id_ENDS_WITH: ID
-  id_IN: [ID!]
-  id_STARTS_WITH: ID
-  lastName: String
-  lastName_CONTAINS: String
-  lastName_ENDS_WITH: String
-  lastName_IN: [String!]
-  lastName_STARTS_WITH: String
-}
-
-type UsersConnection {
-  edges: [UserEdge!]!
-  pageInfo: PageInfo!
-  totalCount: Int!
-}
-----
-
-'''
-
-=== should throw no errors when validate is false, but warn for custom resolvers
-
-.Schema
-[source,graphql,schema=true]
-----
-type User {
-  id: ID!
-  firstName: String!
-  lastName: String!
-  fullName: String @customResolver(requires: "firstName lastName")
-}
-
-type Point {
-  latitude: Float!
-  longitude: Float!
-}
-----
-
-.Augmented Schema
-[source,graphql]
-----
-schema {
-  query: Query
-}
-
-"""Pagination information (Relay)"""
-type PageInfo {
-  endCursor: String
-  hasNextPage: Boolean!
-  hasPreviousPage: Boolean!
-  startCursor: String
-}
-
-type Point {
-  latitude: Float!
-  longitude: Float!
-}
-
-type PointEdge {
-  cursor: String!
-  node: Point!
-}
-
-input PointOptions {
-  limit: Int
-  offset: Int
-  """
-  Specify one or more PointSort objects to sort Points by. The sorts will be applied in the order in which they are arranged in the array.
-  """
-  sort: [PointSort!]
-}
-
-"""
-Fields to sort Points by. The order in which sorts are applied is not guaranteed when specifying many fields in one PointSort object.
-"""
-input PointSort {
-  latitude: SortDirection
-  longitude: SortDirection
-}
-
-input PointWhere {
-  AND: [PointWhere!]
-  NOT: PointWhere
-  OR: [PointWhere!]
-  latitude: Float
-  latitude_GT: Float
-  latitude_GTE: Float
-  latitude_IN: [Float!]
-  latitude_LT: Float
-  latitude_LTE: Float
-  longitude: Float
-  longitude_GT: Float
-  longitude_GTE: Float
-  longitude_IN: [Float!]
-  longitude_LT: Float
-  longitude_LTE: Float
-}
-
-type PointsConnection {
-  edges: [PointEdge!]!
-  pageInfo: PageInfo!
-  totalCount: Int!
-}
-
-type Query {
-  points(options: PointOptions, where: PointWhere): [Point!]!
-  pointsConnection(after: String, first: Int, sort: [PointSort], where: PointWhere): PointsConnection!
-  users(options: UserOptions, where: UserWhere): [User!]!
-  usersConnection(after: String, first: Int, sort: [UserSort], where: UserWhere): UsersConnection!
-}
-
-"""An enum for sorting in either ascending or descending order."""
-enum SortDirection {
-  """Sort by field values in ascending order."""
-  ASC
-  """Sort by field values in descending order."""
-  DESC
-}
-
-type User {
-  firstName: String!
-  fullName: String
-  id: ID!
-  lastName: String!
-}
-
-type UserEdge {
-  cursor: String!
-  node: User!
-}
-
-input UserOptions {
-  limit: Int
-  offset: Int
-  """
-  Specify one or more UserSort objects to sort Users by. The sorts will be applied in the order in which they are arranged in the array.
-  """
-  sort: [UserSort!]
-}
-
-"""
-Fields to sort Users by. The order in which sorts are applied is not guaranteed when specifying many fields in one UserSort object.
-"""
-input UserSort {
-  firstName: SortDirection
-  id: SortDirection
-  lastName: SortDirection
-}
-
-input UserWhere {
-  AND: [UserWhere!]
-  NOT: UserWhere
-  OR: [UserWhere!]
-  firstName: String
-  firstName_CONTAINS: String
-  firstName_ENDS_WITH: String
-  firstName_IN: [String!]
-  firstName_STARTS_WITH: String
-  id: ID
-  id_CONTAINS: ID
-  id_ENDS_WITH: ID
-  id_IN: [ID!]
-  id_STARTS_WITH: ID
-  lastName: String
-  lastName_CONTAINS: String
-  lastName_ENDS_WITH: String
-  lastName_IN: [String!]
-  lastName_STARTS_WITH: String
-}
-
-type UsersConnection {
-  edges: [UserEdge!]!
-  pageInfo: PageInfo!
-  totalCount: Int!
-}
-----
-
-'''
-
-== should not throw an error for duplicate relationship fields validate is false
-
-.Schema
-[source,graphql,schema=true]
-----
-type User {
-  id: ID!
-  firstName: String!
-  lastName: String!
-  friend1: User! @relationship(type: "FRIENDS_WITH", direction: IN)
-  friend2: User! @relationship(type: "FRIENDS_WITH", direction: IN)
-}
-----
-
-.Augmented Schema
-[source,graphql]
-----
-schema {
-  query: Query
-}
-
-"""Pagination information (Relay)"""
-type PageInfo {
-  endCursor: String
-  hasNextPage: Boolean!
-  hasPreviousPage: Boolean!
-  startCursor: String
-}
-
-type Query {
-  users(options: UserOptions, where: UserWhere): [User!]!
-  usersConnection(after: String, first: Int, sort: [UserSort], where: UserWhere): UsersConnection!
-}
-
-"""An enum for sorting in either ascending or descending order."""
-enum SortDirection {
-  """Sort by field values in ascending order."""
-  ASC
-  """Sort by field values in descending order."""
-  DESC
-}
-
-type User {
-  firstName: String!
-  friend1(directed: Boolean = true, options: UserOptions, where: UserWhere): User!
-  friend1Connection(after: String, directed: Boolean = true, first: Int, sort: [UserFriend1ConnectionSort!], where: UserFriend1ConnectionWhere): UserFriend1Connection!
-  friend2(directed: Boolean = true, options: UserOptions, where: UserWhere): User!
-  friend2Connection(after: String, directed: Boolean = true, first: Int, sort: [UserFriend2ConnectionSort!], where: UserFriend2ConnectionWhere): UserFriend2Connection!
-  id: ID!
-  lastName: String!
-}
-
-type UserEdge {
-  cursor: String!
-  node: User!
-}
-
-type UserFriend1Connection {
-  edges: [UserFriend1Relationship!]!
-  pageInfo: PageInfo!
-  totalCount: Int!
-}
-
-input UserFriend1ConnectionSort {
-  node: UserSort
-}
-
-input UserFriend1ConnectionWhere {
-  AND: [UserFriend1ConnectionWhere!]
-  NOT: UserFriend1ConnectionWhere
-  OR: [UserFriend1ConnectionWhere!]
-  node: UserWhere
-}
-
-type UserFriend1Relationship {
-  cursor: String!
-  node: User!
-}
-
-type UserFriend2Connection {
-  edges: [UserFriend2Relationship!]!
-  pageInfo: PageInfo!
-  totalCount: Int!
-}
-
-input UserFriend2ConnectionSort {
-  node: UserSort
-}
-
-input UserFriend2ConnectionWhere {
-  AND: [UserFriend2ConnectionWhere!]
-  NOT: UserFriend2ConnectionWhere
-  OR: [UserFriend2ConnectionWhere!]
-  node: UserWhere
-}
-
-type UserFriend2Relationship {
-  cursor: String!
-  node: User!
-}
-
-input UserOptions {
-  limit: Int
-  offset: Int
-  """
-  Specify one or more UserSort objects to sort Users by. The sorts will be applied in the order in which they are arranged in the array.
-  """
-  sort: [UserSort!]
-}
-
-"""
-Fields to sort Users by. The order in which sorts are applied is not guaranteed when specifying many fields in one UserSort object.
-"""
-input UserSort {
-  firstName: SortDirection
-  id: SortDirection
-  lastName: SortDirection
-}
-
-input UserWhere {
-  AND: [UserWhere!]
-  NOT: UserWhere
-  OR: [UserWhere!]
-  firstName: String
-  firstName_CONTAINS: String
-  firstName_ENDS_WITH: String
-  firstName_IN: [String!]
-  firstName_STARTS_WITH: String
-  friend1: UserWhere
-  friend1Connection: UserFriend1ConnectionWhere
-  friend1Connection_NOT: UserFriend1ConnectionWhere
-  friend1_NOT: UserWhere
-  friend2: UserWhere
-  friend2Connection: UserFriend2ConnectionWhere
-  friend2Connection_NOT: UserFriend2ConnectionWhere
-  friend2_NOT: UserWhere
-  id: ID
-  id_CONTAINS: ID
-  id_ENDS_WITH: ID
-  id_IN: [ID!]
-  id_STARTS_WITH: ID
-  lastName: String
-  lastName_CONTAINS: String
-  lastName_ENDS_WITH: String
-  lastName_IN: [String!]
-  lastName_STARTS_WITH: String
-}
-
-type UsersConnection {
-  edges: [UserEdge!]!
-  pageInfo: PageInfo!
-  totalCount: Int!
-}
-----
-
-'''
-
-== should throw no errors when validate is false
-
-.Schema
-[source,graphql,schema=true]
-----
-type User {
-  id: ID!
-  firstName: String!
-  lastName: String!
-  fullName: String @customResolver(requires: "firstName lastName")
-  friend1: User! @relationship(type: "FRIENDS_WITH", direction: IN)
-  friend2: User! @relationship(type: "FRIENDS_WITH", direction: IN)
-}
-
-type Point {
-  latitude: Float!
-  longitude: Float!
-}
-----
-
-.Augmented Schema
-[source,graphql]
-----
-schema {
-  query: Query
-}
-
-"""Pagination information (Relay)"""
-type PageInfo {
-  endCursor: String
-  hasNextPage: Boolean!
-  hasPreviousPage: Boolean!
-  startCursor: String
-}
-
-type Point {
-  latitude: Float!
-  longitude: Float!
-}
-
-type PointEdge {
-  cursor: String!
-  node: Point!
-}
-
-input PointOptions {
-  limit: Int
-  offset: Int
-  """
-  Specify one or more PointSort objects to sort Points by. The sorts will be applied in the order in which they are arranged in the array.
-  """
-  sort: [PointSort!]
-}
-
-"""
-Fields to sort Points by. The order in which sorts are applied is not guaranteed when specifying many fields in one PointSort object.
-"""
-input PointSort {
-  latitude: SortDirection
-  longitude: SortDirection
-}
-
-input PointWhere {
-  AND: [PointWhere!]
-  NOT: PointWhere
-  OR: [PointWhere!]
-  latitude: Float
-  latitude_GT: Float
-  latitude_GTE: Float
-  latitude_IN: [Float!]
-  latitude_LT: Float
-  latitude_LTE: Float
-  longitude: Float
-  longitude_GT: Float
-  longitude_GTE: Float
-  longitude_IN: [Float!]
-  longitude_LT: Float
-  longitude_LTE: Float
-}
-
-type PointsConnection {
-  edges: [PointEdge!]!
-  pageInfo: PageInfo!
-  totalCount: Int!
-}
-
-type Query {
-  points(options: PointOptions, where: PointWhere): [Point!]!
-  pointsConnection(after: String, first: Int, sort: [PointSort], where: PointWhere): PointsConnection!
-  users(options: UserOptions, where: UserWhere): [User!]!
-  usersConnection(after: String, first: Int, sort: [UserSort], where: UserWhere): UsersConnection!
-}
-
-"""An enum for sorting in either ascending or descending order."""
-enum SortDirection {
-  """Sort by field values in ascending order."""
-  ASC
-  """Sort by field values in descending order."""
-  DESC
-}
-
-type User {
-  firstName: String!
-  friend1(directed: Boolean = true, options: UserOptions, where: UserWhere): User!
-  friend1Connection(after: String, directed: Boolean = true, first: Int, sort: [UserFriend1ConnectionSort!], where: UserFriend1ConnectionWhere): UserFriend1Connection!
-  friend2(directed: Boolean = true, options: UserOptions, where: UserWhere): User!
-  friend2Connection(after: String, directed: Boolean = true, first: Int, sort: [UserFriend2ConnectionSort!], where: UserFriend2ConnectionWhere): UserFriend2Connection!
-  fullName: String
-  id: ID!
-  lastName: String!
-}
-
-type UserEdge {
-  cursor: String!
-  node: User!
-}
-
-type UserFriend1Connection {
-  edges: [UserFriend1Relationship!]!
-  pageInfo: PageInfo!
-  totalCount: Int!
-}
-
-input UserFriend1ConnectionSort {
-  node: UserSort
-}
-
-input UserFriend1ConnectionWhere {
-  AND: [UserFriend1ConnectionWhere!]
-  NOT: UserFriend1ConnectionWhere
-  OR: [UserFriend1ConnectionWhere!]
-  node: UserWhere
-}
-
-type UserFriend1Relationship {
-  cursor: String!
-  node: User!
-}
-
-type UserFriend2Connection {
-  edges: [UserFriend2Relationship!]!
-  pageInfo: PageInfo!
-  totalCount: Int!
-}
-
-input UserFriend2ConnectionSort {
-  node: UserSort
-}
-
-input UserFriend2ConnectionWhere {
-  AND: [UserFriend2ConnectionWhere!]
-  NOT: UserFriend2ConnectionWhere
-  OR: [UserFriend2ConnectionWhere!]
-  node: UserWhere
-}
-
-type UserFriend2Relationship {
-  cursor: String!
-  node: User!
-}
-
-input UserOptions {
-  limit: Int
-  offset: Int
-  """
-  Specify one or more UserSort objects to sort Users by. The sorts will be applied in the order in which they are arranged in the array.
-  """
-  sort: [UserSort!]
-}
-
-"""
-Fields to sort Users by. The order in which sorts are applied is not guaranteed when specifying many fields in one UserSort object.
-"""
-input UserSort {
-  firstName: SortDirection
-  id: SortDirection
-  lastName: SortDirection
-}
-
-input UserWhere {
-  AND: [UserWhere!]
-  NOT: UserWhere
-  OR: [UserWhere!]
-  firstName: String
-  firstName_CONTAINS: String
-  firstName_ENDS_WITH: String
-  firstName_IN: [String!]
-  firstName_STARTS_WITH: String
-  friend1: UserWhere
-  friend1Connection: UserFriend1ConnectionWhere
-  friend1Connection_NOT: UserFriend1ConnectionWhere
-  friend1_NOT: UserWhere
-  friend2: UserWhere
-  friend2Connection: UserFriend2ConnectionWhere
-  friend2Connection_NOT: UserFriend2ConnectionWhere
-  friend2_NOT: UserWhere
-  id: ID
-  id_CONTAINS: ID
-  id_ENDS_WITH: ID
-  id_IN: [ID!]
-  id_STARTS_WITH: ID
-  lastName: String
-  lastName_CONTAINS: String
-  lastName_ENDS_WITH: String
-  lastName_IN: [String!]
-  lastName_STARTS_WITH: String
-}
-
-type UsersConnection {
-  edges: [UserEdge!]!
-  pageInfo: PageInfo!
-  totalCount: Int!
-}
-----
-
-'''
-
diff --git a/core/src/test/resources/integration-test-files/connection-resolvers.adoc b/core/src/test/resources/integration-test-files/connection-resolvers.adoc
index 39968d8d..1b9f4ac0 100644
--- a/core/src/test/resources/integration-test-files/connection-resolvers.adoc
+++ b/core/src/test/resources/integration-test-files/connection-resolvers.adoc
@@ -34,7 +34,7 @@ CREATE (:Movie { id: "RandomString1" })
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query GetMovie($movieId: ID) {
   movies(where: {id: $movieId}) {
@@ -56,7 +56,7 @@ query GetMovie($movieId: ID) {
 [source,json,request=true]
 ----
 {
-  "movieId": "RandomString1"
+  "movieId" : "RandomString1"
 }
 ----
 
@@ -64,7 +64,7 @@ query GetMovie($movieId: ID) {
 [source,json]
 ----
 {
-  "param0": "RandomString1"
+  "param0" : "RandomString1"
 }
 ----
 
@@ -107,22 +107,17 @@ RETURN this {
 [source,json,response=true]
 ----
 {
-  "movies": [
-    {
-      "id": "RandomString1",
-      "actorsConnection": {
-        "totalCount": 0,
-        "pageInfo": {
-          "startCursor": null,
-          "endCursor": null,
-          "hasNextPage": false,
-          "hasPreviousPage": false
-        }
+  "movies" : [ {
+    "id" : "RandomString1",
+    "actorsConnection" : {
+      "totalCount" : 0,
+      "pageInfo" : {
+        "startCursor" : null,
+        "endCursor" : null,
+        "hasNextPage" : false,
+        "hasPreviousPage" : false
       }
     }
-  ]
+  } ]
 }
 ----
-
-'''
-
diff --git a/core/src/test/resources/integration-test-files/connection-resolvers.js.adoc b/core/src/test/resources/integration-test-files/connection-resolvers.js.adoc
new file mode 100644
index 00000000..d2cd18a5
--- /dev/null
+++ b/core/src/test/resources/integration-test-files/connection-resolvers.js.adoc
@@ -0,0 +1,112 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= Connection Resolvers
+
+== Setup
+
+.Schema
+[source,graphql,schema=true]
+----
+type Actor {
+  id: ID
+  name: String!
+  movies: [Movie!]! @relationship(type: "ACTED_IN", direction: OUT, properties: "ActedIn")
+}
+
+type Movie {
+  id: ID
+  title: String!
+  actors: [Actor!]! @relationship(type: "ACTED_IN", direction: IN, properties: "ActedIn")
+}
+
+type ActedIn @relationshipProperties {
+  screenTime: Int!
+}
+----
+
+== should return a total count of zero and correct pageInfo if no edges
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (:Movie { id: "RandomString1" })
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+query GetMovie($movieId: ID) {
+  movies(where: {id: $movieId}) {
+    id
+    actorsConnection {
+      totalCount
+      pageInfo {
+        startCursor
+        endCursor
+        hasNextPage
+        hasPreviousPage
+      }
+    }
+  }
+}
+----
+
+.GraphQL params input
+[source,json,request=true]
+----
+{
+  "movieId": "RandomString1"
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "RandomString1"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE this.id = $param0
+CALL {
+    WITH this
+    MATCH (this)<-[this0:ACTED_IN]-(this1:Actor)
+    WITH collect({ node: this1, relationship: this0 }) AS edges
+    WITH edges, size(edges) AS totalCount
+    CALL {
+        WITH edges
+        UNWIND edges AS edge
+        WITH edge.node AS this1, edge.relationship AS this0
+        RETURN collect({ node: { __id: toString(id(this1)), __typename: "Actor" } }) AS var2
+    }
+    RETURN { edges: var2, totalCount: totalCount } AS var3
+}
+RETURN this { .id, actorsConnection: var3 } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "movies": [
+    {
+      "id": "RandomString1",
+      "actorsConnection": {
+        "totalCount": 0,
+        "pageInfo": {
+          "startCursor": null,
+          "endCursor": null,
+          "hasNextPage": false,
+          "hasPreviousPage": false
+        }
+      }
+    }
+  ]
+}
+----
diff --git a/core/src/test/resources/integration-test-files/connections/alias.adoc b/core/src/test/resources/integration-test-files/connections/alias.adoc
index 680e1cc2..49bf02e9 100644
--- a/core/src/test/resources/integration-test-files/connections/alias.adoc
+++ b/core/src/test/resources/integration-test-files/connections/alias.adoc
@@ -29,7 +29,7 @@ CREATE (m:Movie {title: "RandomString1"})
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies(where: {title: "RandomString1"}) {
@@ -44,7 +44,7 @@ CREATE (m:Movie {title: "RandomString1"})
 [source,json]
 ----
 {
-  "param0": "RandomString1"
+  "param0" : "RandomString1"
 }
 ----
 
@@ -86,18 +86,14 @@ RETURN this {
 [source,json,response=true]
 ----
 {
-  "movies": [
-    {
-      "actors": {
-        "totalCount": 3
-      }
+  "movies" : [ {
+    "actors" : {
+      "totalCount" : 3
     }
-  ]
+  } ]
 }
 ----
 
-'''
-
 == should alias totalCount
 
 .Schema
@@ -124,7 +120,7 @@ CREATE (m:Movie {title: "RandomString1"})
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies(where: {title: "RandomString1"}) {
@@ -139,7 +135,7 @@ CREATE (m:Movie {title: "RandomString1"})
 [source,json]
 ----
 {
-  "param0": "RandomString1"
+  "param0" : "RandomString1"
 }
 ----
 
@@ -181,18 +177,14 @@ RETURN this {
 [source,json,response=true]
 ----
 {
-  "movies": [
-    {
-      "actorsConnection": {
-        "count": 3
-      }
+  "movies" : [ {
+    "actorsConnection" : {
+      "count" : 3
     }
-  ]
+  } ]
 }
 ----
 
-'''
-
 == should alias pageInfo top level key
 
 .Schema
@@ -219,7 +211,7 @@ CREATE (m:Movie {title: "RandomString1"})
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies(where: {title: "RandomString1"}) {
@@ -236,7 +228,7 @@ CREATE (m:Movie {title: "RandomString1"})
 [source,json]
 ----
 {
-  "param0": "RandomString1"
+  "param0" : "RandomString1"
 }
 ----
 
@@ -278,20 +270,16 @@ RETURN this {
 [source,json,response=true]
 ----
 {
-  "movies": [
-    {
-      "actorsConnection": {
-        "pi": {
-          "hasNextPage": false
-        }
+  "movies" : [ {
+    "actorsConnection" : {
+      "pi" : {
+        "hasNextPage" : false
       }
     }
-  ]
+  } ]
 }
 ----
 
-'''
-
 == should alias startCursor
 
 .Schema
@@ -318,7 +306,7 @@ CREATE (m:Movie {title: "RandomString1"})
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies(where: {title: "RandomString1"}) {
@@ -335,7 +323,7 @@ CREATE (m:Movie {title: "RandomString1"})
 [source,json]
 ----
 {
-  "param0": "RandomString1"
+  "param0" : "RandomString1"
 }
 ----
 
@@ -377,20 +365,16 @@ RETURN this {
 [source,json,response=true]
 ----
 {
-  "movies": [
-    {
-      "actorsConnection": {
-        "pageInfo": {
-          "sc": "YXJyYXljb25uZWN0aW9uOjA="
-        }
+  "movies" : [ {
+    "actorsConnection" : {
+      "pageInfo" : {
+        "sc" : "YXJyYXljb25uZWN0aW9uOjA="
       }
     }
-  ]
+  } ]
 }
 ----
 
-'''
-
 == should alias endCursor
 
 .Schema
@@ -417,7 +401,7 @@ CREATE (m:Movie {title: "RandomString1"})
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies(where: {title: "RandomString1"}) {
@@ -434,7 +418,7 @@ CREATE (m:Movie {title: "RandomString1"})
 [source,json]
 ----
 {
-  "param0": "RandomString1"
+  "param0" : "RandomString1"
 }
 ----
 
@@ -476,20 +460,16 @@ RETURN this {
 [source,json,response=true]
 ----
 {
-  "movies": [
-    {
-      "actorsConnection": {
-        "pageInfo": {
-          "ec": "YXJyYXljb25uZWN0aW9uOjI="
-        }
+  "movies" : [ {
+    "actorsConnection" : {
+      "pageInfo" : {
+        "ec" : "YXJyYXljb25uZWN0aW9uOjI="
       }
     }
-  ]
+  } ]
 }
 ----
 
-'''
-
 == should alias hasPreviousPage
 
 .Schema
@@ -516,7 +496,7 @@ CREATE (m:Movie {title: "RandomString1"})
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies(where: {title: "RandomString1"}) {
@@ -533,7 +513,7 @@ CREATE (m:Movie {title: "RandomString1"})
 [source,json]
 ----
 {
-  "param0": "RandomString1"
+  "param0" : "RandomString1"
 }
 ----
 
@@ -575,20 +555,16 @@ RETURN this {
 [source,json,response=true]
 ----
 {
-  "movies": [
-    {
-      "actorsConnection": {
-        "pageInfo": {
-          "hPP": false
-        }
+  "movies" : [ {
+    "actorsConnection" : {
+      "pageInfo" : {
+        "hPP" : false
       }
     }
-  ]
+  } ]
 }
 ----
 
-'''
-
 == should alias hasNextPage
 
 .Schema
@@ -615,7 +591,7 @@ CREATE (m:Movie {title: "RandomString1"})
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies(where: {title: "RandomString1"}) {
@@ -632,8 +608,8 @@ CREATE (m:Movie {title: "RandomString1"})
 [source,json]
 ----
 {
-  "param0": "RandomString1",
-  "param1": 1
+  "param0" : "RandomString1",
+  "param1" : 1
 }
 ----
 
@@ -675,20 +651,16 @@ RETURN this {
 [source,json,response=true]
 ----
 {
-  "movies": [
-    {
-      "actorsConnection": {
-        "pageInfo": {
-          "hNP": true
-        }
+  "movies" : [ {
+    "actorsConnection" : {
+      "pageInfo" : {
+        "hNP" : true
       }
     }
-  ]
+  } ]
 }
 ----
 
-'''
-
 == should alias the top level edges key
 
 .Schema
@@ -715,7 +687,7 @@ CREATE (m:Movie {title: "RandomString1"})
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies(where: {title: "RandomString1"}) {
@@ -732,8 +704,8 @@ CREATE (m:Movie {title: "RandomString1"})
 [source,json]
 ----
 {
-  "param0": "RandomString1",
-  "param1": 1
+  "param0" : "RandomString1",
+  "param1" : 1
 }
 ----
 
@@ -775,22 +747,16 @@ RETURN this {
 [source,json,response=true]
 ----
 {
-  "movies": [
-    {
-      "actorsConnection": {
-        "e": [
-          {
-            "cursor": "YXJyYXljb25uZWN0aW9uOjA="
-          }
-        ]
-      }
+  "movies" : [ {
+    "actorsConnection" : {
+      "e" : [ {
+        "cursor" : "YXJyYXljb25uZWN0aW9uOjA="
+      } ]
     }
-  ]
+  } ]
 }
 ----
 
-'''
-
 == should alias cursor
 
 .Schema
@@ -817,7 +783,7 @@ CREATE (m:Movie {title: "RandomString1"})
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies(where: {title: "RandomString1"}) {
@@ -834,8 +800,8 @@ CREATE (m:Movie {title: "RandomString1"})
 [source,json]
 ----
 {
-  "param0": "RandomString1",
-  "param1": 1
+  "param0" : "RandomString1",
+  "param1" : 1
 }
 ----
 
@@ -877,22 +843,16 @@ RETURN this {
 [source,json,response=true]
 ----
 {
-  "movies": [
-    {
-      "actorsConnection": {
-        "edges": [
-          {
-            "c": "YXJyYXljb25uZWN0aW9uOjA="
-          }
-        ]
-      }
+  "movies" : [ {
+    "actorsConnection" : {
+      "edges" : [ {
+        "c" : "YXJyYXljb25uZWN0aW9uOjA="
+      } ]
     }
-  ]
+  } ]
 }
 ----
 
-'''
-
 == should alias the top level node key
 
 .Schema
@@ -919,7 +879,7 @@ CREATE (m:Movie {title: "RandomString1"})
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies(where: {title: "RandomString1"}) {
@@ -938,8 +898,8 @@ CREATE (m:Movie {title: "RandomString1"})
 [source,json]
 ----
 {
-  "param0": "RandomString1",
-  "param1": 1
+  "param0" : "RandomString1",
+  "param1" : 1
 }
 ----
 
@@ -986,8 +946,6 @@ movies[0].actorsConnection.edges.size(),==,1
 movies[0].actorsConnection.edges[0].n.name,notEmpty,
 |===
 
-'''
-
 == should alias a property on the node
 
 .Schema
@@ -1014,7 +972,7 @@ CREATE (m:Movie {title: "RandomString1"})
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies(where: {title: "RandomString1"}) {
@@ -1033,8 +991,8 @@ CREATE (m:Movie {title: "RandomString1"})
 [source,json]
 ----
 {
-  "param0": "RandomString1",
-  "param1": 1
+  "param0" : "RandomString1",
+  "param1" : 1
 }
 ----
 
@@ -1081,8 +1039,6 @@ movies[0].actorsConnection.edges.size(),==,1
 movies[0].actorsConnection.edges[0].node.n,notEmpty,
 |===
 
-'''
-
 == should alias a property on the relationship
 
 .Schema
@@ -1113,7 +1069,7 @@ CREATE (m:Movie {title: "RandomString1"})
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies(where: {title: "RandomString1"}) {
@@ -1132,8 +1088,8 @@ CREATE (m:Movie {title: "RandomString1"})
 [source,json]
 ----
 {
-  "param0": "RandomString1",
-  "param1": 1
+  "param0" : "RandomString1",
+  "param1" : 1
 }
 ----
 
@@ -1180,8 +1136,6 @@ movies[0].actorsConnection.edges.size(),==,1
 movies[0].actorsConnection.edges[0].r.r,notEmpty,
 |===
 
-'''
-
 == should alias many keys on a connection
 
 .Schema
@@ -1209,7 +1163,7 @@ CREATE (m:Movie {title: "RandomString1"})
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies(where: {title: "RandomString1"}) {
@@ -1236,7 +1190,7 @@ CREATE (m:Movie {title: "RandomString1"})
 [source,json]
 ----
 {
-  "param0": "RandomString1"
+  "param0" : "RandomString1"
 }
 ----
 
@@ -1283,34 +1237,26 @@ RETURN this {
 [source,json,response=true]
 ----
 {
-  "movies": [
-    {
-      "title": "RandomString1",
-      "connection": {
-        "tC": 1,
-        "edges": [
-          {
-            "n": {
-              "n": "RandomString2"
-            },
-            "p": {
-              "r": [
-                "RandomString3"
-              ]
-            }
-          }
-        ],
-        "page": {
-          "hNP": false
+  "movies" : [ {
+    "title" : "RandomString1",
+    "connection" : {
+      "tC" : 1,
+      "edges" : [ {
+        "n" : {
+          "n" : "RandomString2"
+        },
+        "p" : {
+          "r" : [ "RandomString3" ]
         }
+      } ],
+      "page" : {
+        "hNP" : false
       }
     }
-  ]
+  } ]
 }
 ----
 
-'''
-
 == should allow multiple aliases on the same connection
 
 .Schema
@@ -1337,7 +1283,7 @@ CREATE (post:Post {title: "RandomString1"})
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   posts(where: {title: "RandomString1"}) {
@@ -1363,9 +1309,9 @@ CREATE (post:Post {title: "RandomString1"})
 [source,json]
 ----
 {
-  "param0": "RandomString1",
-  "param1": true,
-  "param2": false
+  "param0" : "RandomString1",
+  "param1" : true,
+  "param2" : false
 }
 ----
 
@@ -1434,38 +1380,29 @@ RETURN this {
 [source,json,response=true,ignore-order]
 ----
 {
-  "posts": [
-    {
-      "flagged": {
-        "edges": [
-          {
-            "node": {
-              "flag": true
-            }
-          },
-          {
-            "node": {
-              "flag": true
-            }
-          }
-        ]
-      },
-      "unflagged": {
-        "edges": [
-          {
-            "node": {
-              "flag": false
-            }
-          }
-        ]
-      }
+  "posts" : [ {
+    "flagged" : {
+      "edges" : [ {
+        "node" : {
+          "flag" : true
+        }
+      }, {
+        "node" : {
+          "flag" : true
+        }
+      } ]
+    },
+    "unflagged" : {
+      "edges" : [ {
+        "node" : {
+          "flag" : false
+        }
+      } ]
     }
-  ]
+  } ]
 }
 ----
 
-'''
-
 == should allow alias on nested connections
 
 .Schema
@@ -1495,7 +1432,7 @@ CREATE (movie:Movie {title: "The Matrix"})
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies(where: {title: "The Matrix"}) {
@@ -1528,9 +1465,9 @@ CREATE (movie:Movie {title: "The Matrix"})
 [source,json]
 ----
 {
-  "param0": "The Matrix",
-  "param1": "Keanu Reeves",
-  "param2": "The Matrix"
+  "param0" : "The Matrix",
+  "param1" : "Keanu Reeves",
+  "param2" : "The Matrix"
 }
 ----
 
@@ -1613,39 +1550,28 @@ RETURN this {
 [source,json,response=true]
 ----
 {
-  "movies": [
-    {
-      "title": "The Matrix",
-      "actorsConnection": {
-        "edges": [
-          {
-            "properties": {
-              "screenTime": 120
-            },
-            "node": {
-              "name": "Keanu Reeves",
-              "b": {
-                "edges": [
-                  {
-                    "node": {
-                      "title": "The Matrix",
-                      "a": [
-                        {
-                          "name": "Keanu Reeves"
-                        }
-                      ]
-                    }
-                  }
-                ]
+  "movies" : [ {
+    "title" : "The Matrix",
+    "actorsConnection" : {
+      "edges" : [ {
+        "properties" : {
+          "screenTime" : 120
+        },
+        "node" : {
+          "name" : "Keanu Reeves",
+          "b" : {
+            "edges" : [ {
+              "node" : {
+                "title" : "The Matrix",
+                "a" : [ {
+                  "name" : "Keanu Reeves"
+                } ]
               }
-            }
+            } ]
           }
-        ]
-      }
+        }
+      } ]
     }
-  ]
+  } ]
 }
 ----
-
-'''
-
diff --git a/core/src/test/resources/integration-test-files/connections/alias.js.adoc b/core/src/test/resources/integration-test-files/connections/alias.js.adoc
new file mode 100644
index 00000000..bab7450f
--- /dev/null
+++ b/core/src/test/resources/integration-test-files/connections/alias.js.adoc
@@ -0,0 +1,1442 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= Connections Alias
+
+== should alias top level connection field and return correct totalCount
+
+.Schema
+[source,graphql,schema=true]
+----
+type Movie {
+  title: String!
+  actors: [Actor!]! @relationship(type: "ACTED_IN", direction: IN)
+}
+
+type Actor {
+  name: String!
+  movies: [Movie!]! @relationship(type: "ACTED_IN", direction: OUT)
+}
+----
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (m:Movie {title: "RandomString1"})
+ CREATE (m)<-[:ACTED_IN]-(:Actor)
+ CREATE (m)<-[:ACTED_IN]-(:Actor)
+ CREATE (m)<-[:ACTED_IN]-(:Actor)
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies(where: {title: "RandomString1"}) {
+    actors: actorsConnection {
+      totalCount
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "RandomString1"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE this.title = $param0
+CALL {
+    WITH this
+    MATCH (this)<-[this0:ACTED_IN]-(this1:Actor)
+    WITH collect({ node: this1, relationship: this0 }) AS edges
+    WITH edges, size(edges) AS totalCount
+    CALL {
+        WITH edges
+        UNWIND edges AS edge
+        WITH edge.node AS this1, edge.relationship AS this0
+        RETURN collect({ node: { __id: toString(id(this1)), __typename: "Actor" } }) AS var2
+    }
+    RETURN { edges: var2, totalCount: totalCount } AS var3
+}
+RETURN this { actors: var3 } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "movies": [
+    {
+      "actors": {
+        "totalCount": 3
+      }
+    }
+  ]
+}
+----
+
+== should alias totalCount
+
+.Schema
+[source,graphql,schema=true]
+----
+type Movie {
+  title: String!
+  actors: [Actor!]! @relationship(type: "ACTED_IN", direction: IN)
+}
+
+type Actor {
+  name: String!
+  movies: [Movie!]! @relationship(type: "ACTED_IN", direction: OUT)
+}
+----
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (m:Movie {title: "RandomString1"})
+ CREATE (m)<-[:ACTED_IN]-(:Actor)
+ CREATE (m)<-[:ACTED_IN]-(:Actor)
+ CREATE (m)<-[:ACTED_IN]-(:Actor)
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies(where: {title: "RandomString1"}) {
+    actorsConnection {
+      count: totalCount
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "RandomString1"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE this.title = $param0
+CALL {
+    WITH this
+    MATCH (this)<-[this0:ACTED_IN]-(this1:Actor)
+    WITH collect({ node: this1, relationship: this0 }) AS edges
+    WITH edges, size(edges) AS totalCount
+    CALL {
+        WITH edges
+        UNWIND edges AS edge
+        WITH edge.node AS this1, edge.relationship AS this0
+        RETURN collect({ node: { __id: toString(id(this1)), __typename: "Actor" } }) AS var2
+    }
+    RETURN { edges: var2, totalCount: totalCount } AS var3
+}
+RETURN this { actorsConnection: var3 } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "movies": [
+    {
+      "actorsConnection": {
+        "count": 3
+      }
+    }
+  ]
+}
+----
+
+== should alias pageInfo top level key
+
+.Schema
+[source,graphql,schema=true]
+----
+type Movie {
+  title: String!
+  actors: [Actor!]! @relationship(type: "ACTED_IN", direction: IN)
+}
+
+type Actor {
+  name: String!
+  movies: [Movie!]! @relationship(type: "ACTED_IN", direction: OUT)
+}
+----
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (m:Movie {title: "RandomString1"})
+ CREATE (m)<-[:ACTED_IN]-(:Actor)
+ CREATE (m)<-[:ACTED_IN]-(:Actor)
+ CREATE (m)<-[:ACTED_IN]-(:Actor)
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies(where: {title: "RandomString1"}) {
+    actorsConnection {
+      pi: pageInfo {
+        hasNextPage
+      }
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "RandomString1"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE this.title = $param0
+CALL {
+    WITH this
+    MATCH (this)<-[this0:ACTED_IN]-(this1:Actor)
+    WITH collect({ node: this1, relationship: this0 }) AS edges
+    WITH edges, size(edges) AS totalCount
+    CALL {
+        WITH edges
+        UNWIND edges AS edge
+        WITH edge.node AS this1, edge.relationship AS this0
+        RETURN collect({ node: { __id: toString(id(this1)), __typename: "Actor" } }) AS var2
+    }
+    RETURN { edges: var2, totalCount: totalCount } AS var3
+}
+RETURN this { actorsConnection: var3 } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "movies": [
+    {
+      "actorsConnection": {
+        "pi": {
+          "hasNextPage": false
+        }
+      }
+    }
+  ]
+}
+----
+
+== should alias startCursor
+
+.Schema
+[source,graphql,schema=true]
+----
+type Movie {
+  title: String!
+  actors: [Actor!]! @relationship(type: "ACTED_IN", direction: IN)
+}
+
+type Actor {
+  name: String!
+  movies: [Movie!]! @relationship(type: "ACTED_IN", direction: OUT)
+}
+----
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (m:Movie {title: "RandomString1"})
+ CREATE (m)<-[:ACTED_IN]-(:Actor)
+ CREATE (m)<-[:ACTED_IN]-(:Actor)
+ CREATE (m)<-[:ACTED_IN]-(:Actor)
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies(where: {title: "RandomString1"}) {
+    actorsConnection {
+      pageInfo {
+        sc: startCursor
+      }
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "RandomString1"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE this.title = $param0
+CALL {
+    WITH this
+    MATCH (this)<-[this0:ACTED_IN]-(this1:Actor)
+    WITH collect({ node: this1, relationship: this0 }) AS edges
+    WITH edges, size(edges) AS totalCount
+    CALL {
+        WITH edges
+        UNWIND edges AS edge
+        WITH edge.node AS this1, edge.relationship AS this0
+        RETURN collect({ node: { __id: toString(id(this1)), __typename: "Actor" } }) AS var2
+    }
+    RETURN { edges: var2, totalCount: totalCount } AS var3
+}
+RETURN this { actorsConnection: var3 } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "movies": [
+    {
+      "actorsConnection": {
+        "pageInfo": {
+          "sc": "YXJyYXljb25uZWN0aW9uOjA="
+        }
+      }
+    }
+  ]
+}
+----
+
+== should alias endCursor
+
+.Schema
+[source,graphql,schema=true]
+----
+type Movie {
+  title: String!
+  actors: [Actor!]! @relationship(type: "ACTED_IN", direction: IN)
+}
+
+type Actor {
+  name: String!
+  movies: [Movie!]! @relationship(type: "ACTED_IN", direction: OUT)
+}
+----
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (m:Movie {title: "RandomString1"})
+ CREATE (m)<-[:ACTED_IN]-(:Actor)
+ CREATE (m)<-[:ACTED_IN]-(:Actor)
+ CREATE (m)<-[:ACTED_IN]-(:Actor)
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies(where: {title: "RandomString1"}) {
+    actorsConnection {
+      pageInfo {
+        ec: endCursor
+      }
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "RandomString1"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE this.title = $param0
+CALL {
+    WITH this
+    MATCH (this)<-[this0:ACTED_IN]-(this1:Actor)
+    WITH collect({ node: this1, relationship: this0 }) AS edges
+    WITH edges, size(edges) AS totalCount
+    CALL {
+        WITH edges
+        UNWIND edges AS edge
+        WITH edge.node AS this1, edge.relationship AS this0
+        RETURN collect({ node: { __id: toString(id(this1)), __typename: "Actor" } }) AS var2
+    }
+    RETURN { edges: var2, totalCount: totalCount } AS var3
+}
+RETURN this { actorsConnection: var3 } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "movies": [
+    {
+      "actorsConnection": {
+        "pageInfo": {
+          "ec": "YXJyYXljb25uZWN0aW9uOjI="
+        }
+      }
+    }
+  ]
+}
+----
+
+== should alias hasPreviousPage
+
+.Schema
+[source,graphql,schema=true]
+----
+type Movie {
+  title: String!
+  actors: [Actor!]! @relationship(type: "ACTED_IN", direction: IN)
+}
+
+type Actor {
+  name: String!
+  movies: [Movie!]! @relationship(type: "ACTED_IN", direction: OUT)
+}
+----
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (m:Movie {title: "RandomString1"})
+ CREATE (m)<-[:ACTED_IN]-(:Actor)
+ CREATE (m)<-[:ACTED_IN]-(:Actor)
+ CREATE (m)<-[:ACTED_IN]-(:Actor)
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies(where: {title: "RandomString1"}) {
+    actorsConnection {
+      pageInfo {
+        hPP: hasPreviousPage
+      }
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "RandomString1"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE this.title = $param0
+CALL {
+    WITH this
+    MATCH (this)<-[this0:ACTED_IN]-(this1:Actor)
+    WITH collect({ node: this1, relationship: this0 }) AS edges
+    WITH edges, size(edges) AS totalCount
+    CALL {
+        WITH edges
+        UNWIND edges AS edge
+        WITH edge.node AS this1, edge.relationship AS this0
+        RETURN collect({ node: { __id: toString(id(this1)), __typename: "Actor" } }) AS var2
+    }
+    RETURN { edges: var2, totalCount: totalCount } AS var3
+}
+RETURN this { actorsConnection: var3 } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "movies": [
+    {
+      "actorsConnection": {
+        "pageInfo": {
+          "hPP": false
+        }
+      }
+    }
+  ]
+}
+----
+
+== should alias hasNextPage
+
+.Schema
+[source,graphql,schema=true]
+----
+type Movie {
+  title: String!
+  actors: [Actor!]! @relationship(type: "ACTED_IN", direction: IN)
+}
+
+type Actor {
+  name: String!
+  movies: [Movie!]! @relationship(type: "ACTED_IN", direction: OUT)
+}
+----
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (m:Movie {title: "RandomString1"})
+ CREATE (m)<-[:ACTED_IN]-(:Actor {name: "A"})
+ CREATE (m)<-[:ACTED_IN]-(:Actor {name: "B"})
+ CREATE (m)<-[:ACTED_IN]-(:Actor {name: "C"})
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies(where: {title: "RandomString1"}) {
+    actorsConnection(first: 1) {
+      pageInfo {
+        hNP: hasNextPage
+      }
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "RandomString1",
+  "param1": 1
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE this.title = $param0
+CALL {
+    WITH this
+    MATCH (this)<-[this0:ACTED_IN]-(this1:Actor)
+    WITH collect({ node: this1, relationship: this0 }) AS edges
+    WITH edges, size(edges) AS totalCount
+    CALL {
+        WITH edges
+        UNWIND edges AS edge
+        WITH edge.node AS this1, edge.relationship AS this0
+        WITH *
+        
+        LIMIT $param1
+        RETURN collect({ node: { __id: toString(id(this1)), __typename: "Actor" } }) AS var2
+    }
+    RETURN { edges: var2, totalCount: totalCount } AS var3
+}
+RETURN this { actorsConnection: var3 } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "movies": [
+    {
+      "actorsConnection": {
+        "pageInfo": {
+          "hNP": true
+        }
+      }
+    }
+  ]
+}
+----
+
+== should alias the top level edges key
+
+.Schema
+[source,graphql,schema=true]
+----
+type Movie {
+  title: String!
+  actors: [Actor!]! @relationship(type: "ACTED_IN", direction: IN)
+}
+
+type Actor {
+  name: String!
+  movies: [Movie!]! @relationship(type: "ACTED_IN", direction: OUT)
+}
+----
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (m:Movie {title: "RandomString1"})
+ CREATE (m)<-[:ACTED_IN]-(:Actor {name: "A"})
+ CREATE (m)<-[:ACTED_IN]-(:Actor {name: "B"})
+ CREATE (m)<-[:ACTED_IN]-(:Actor {name: "C"})
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies(where: {title: "RandomString1"}) {
+    actorsConnection(first: 1) {
+      e: edges {
+        cursor
+      }
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "RandomString1",
+  "param1": 1
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE this.title = $param0
+CALL {
+    WITH this
+    MATCH (this)<-[this0:ACTED_IN]-(this1:Actor)
+    WITH collect({ node: this1, relationship: this0 }) AS edges
+    WITH edges, size(edges) AS totalCount
+    CALL {
+        WITH edges
+        UNWIND edges AS edge
+        WITH edge.node AS this1, edge.relationship AS this0
+        WITH *
+        
+        LIMIT $param1
+        RETURN collect({ node: { __id: toString(id(this1)), __typename: "Actor" } }) AS var2
+    }
+    RETURN { edges: var2, totalCount: totalCount } AS var3
+}
+RETURN this { actorsConnection: var3 } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "movies": [
+    {
+      "actorsConnection": {
+        "e": [
+          {
+            "cursor": "YXJyYXljb25uZWN0aW9uOjA="
+          }
+        ]
+      }
+    }
+  ]
+}
+----
+
+== should alias cursor
+
+.Schema
+[source,graphql,schema=true]
+----
+type Movie {
+  title: String!
+  actors: [Actor!]! @relationship(type: "ACTED_IN", direction: IN)
+}
+
+type Actor {
+  name: String!
+  movies: [Movie!]! @relationship(type: "ACTED_IN", direction: OUT)
+}
+----
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (m:Movie {title: "RandomString1"})
+ CREATE (m)<-[:ACTED_IN]-(:Actor {name: "A"})
+ CREATE (m)<-[:ACTED_IN]-(:Actor {name: "B"})
+ CREATE (m)<-[:ACTED_IN]-(:Actor {name: "C"})
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies(where: {title: "RandomString1"}) {
+    actorsConnection(first: 1) {
+      edges {
+        c: cursor
+      }
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "RandomString1",
+  "param1": 1
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE this.title = $param0
+CALL {
+    WITH this
+    MATCH (this)<-[this0:ACTED_IN]-(this1:Actor)
+    WITH collect({ node: this1, relationship: this0 }) AS edges
+    WITH edges, size(edges) AS totalCount
+    CALL {
+        WITH edges
+        UNWIND edges AS edge
+        WITH edge.node AS this1, edge.relationship AS this0
+        WITH *
+        
+        LIMIT $param1
+        RETURN collect({ node: { __id: toString(id(this1)), __typename: "Actor" } }) AS var2
+    }
+    RETURN { edges: var2, totalCount: totalCount } AS var3
+}
+RETURN this { actorsConnection: var3 } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "movies": [
+    {
+      "actorsConnection": {
+        "edges": [
+          {
+            "c": "YXJyYXljb25uZWN0aW9uOjA="
+          }
+        ]
+      }
+    }
+  ]
+}
+----
+
+== should alias the top level node key
+
+.Schema
+[source,graphql,schema=true]
+----
+type Movie {
+  title: String!
+  actors: [Actor!]! @relationship(type: "ACTED_IN", direction: IN)
+}
+
+type Actor {
+  name: String!
+  movies: [Movie!]! @relationship(type: "ACTED_IN", direction: OUT)
+}
+----
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (m:Movie {title: "RandomString1"})
+ CREATE (m)<-[:ACTED_IN]-(:Actor {name: "A"})
+ CREATE (m)<-[:ACTED_IN]-(:Actor {name: "B"})
+ CREATE (m)<-[:ACTED_IN]-(:Actor {name: "C"})
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies(where: {title: "RandomString1"}) {
+    actorsConnection(first: 1) {
+      edges {
+        n: node {
+          name
+        }
+      }
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "RandomString1",
+  "param1": 1
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE this.title = $param0
+CALL {
+    WITH this
+    MATCH (this)<-[this0:ACTED_IN]-(this1:Actor)
+    WITH collect({ node: this1, relationship: this0 }) AS edges
+    WITH edges, size(edges) AS totalCount
+    CALL {
+        WITH edges
+        UNWIND edges AS edge
+        WITH edge.node AS this1, edge.relationship AS this0
+        WITH *
+        
+        LIMIT $param1
+        RETURN collect({ node: { name: this1.name, __typename: "Actor" } }) AS var2
+    }
+    RETURN { edges: var2, totalCount: totalCount } AS var3
+}
+RETURN this { actorsConnection: var3 } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "movies": [
+    {
+      "actorsConnection": {
+        "edges": [
+          {
+            "n": {
+              "name": "C"
+            }
+          }
+        ]
+      }
+    }
+  ]
+}
+----
+
+== should alias a property on the node
+
+.Schema
+[source,graphql,schema=true]
+----
+type Movie {
+  title: String!
+  actors: [Actor!]! @relationship(type: "ACTED_IN", direction: IN)
+}
+
+type Actor {
+  name: String!
+  movies: [Movie!]! @relationship(type: "ACTED_IN", direction: OUT)
+}
+----
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (m:Movie {title: "RandomString1"})
+ CREATE (m)<-[:ACTED_IN]-(:Actor {name: "A"})
+ CREATE (m)<-[:ACTED_IN]-(:Actor {name: "B"})
+ CREATE (m)<-[:ACTED_IN]-(:Actor {name: "C"})
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies(where: {title: "RandomString1"}) {
+    actorsConnection(first: 1) {
+      edges {
+        node {
+          n: name
+        }
+      }
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "RandomString1",
+  "param1": 1
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE this.title = $param0
+CALL {
+    WITH this
+    MATCH (this)<-[this0:ACTED_IN]-(this1:Actor)
+    WITH collect({ node: this1, relationship: this0 }) AS edges
+    WITH edges, size(edges) AS totalCount
+    CALL {
+        WITH edges
+        UNWIND edges AS edge
+        WITH edge.node AS this1, edge.relationship AS this0
+        WITH *
+        
+        LIMIT $param1
+        RETURN collect({ node: { n: this1.name, __typename: "Actor" } }) AS var2
+    }
+    RETURN { edges: var2, totalCount: totalCount } AS var3
+}
+RETURN this { actorsConnection: var3 } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "movies": [
+    {
+      "actorsConnection": {
+        "edges": [
+          {
+            "node": {
+              "n": "A"
+            }
+          }
+        ]
+      }
+    }
+  ]
+}
+----
+
+== should alias a property on the relationship
+
+.Schema
+[source,graphql,schema=true]
+----
+type Movie {
+  title: String!
+  actors: [Actor!]! @relationship(type: "ACTED_IN", direction: IN, properties: "ActedIn")
+}
+
+type Actor {
+  name: String!
+  movies: [Movie!]! @relationship(type: "ACTED_IN", direction: OUT, properties: "ActedIn")
+}
+
+type ActedIn @relationshipProperties {
+  roles: [String]!
+}
+----
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (m:Movie {title: "RandomString1"})
+ CREATE (m)<-[:ACTED_IN {roles: ["R1"]}]-(:Actor {name: "A"})
+ CREATE (m)<-[:ACTED_IN {roles: ["R2"]}]-(:Actor {name: "B"})
+ CREATE (m)<-[:ACTED_IN {roles: ["R3"]}]-(:Actor {name: "B"})
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies(where: {title: "RandomString1"}) {
+    actorsConnection(first: 1) {
+      edges {
+        r: properties {
+          r: roles
+        }
+      }
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "RandomString1",
+  "param1": 1
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE this.title = $param0
+CALL {
+    WITH this
+    MATCH (this)<-[this0:ACTED_IN]-(this1:Actor)
+    WITH collect({ node: this1, relationship: this0 }) AS edges
+    WITH edges, size(edges) AS totalCount
+    CALL {
+        WITH edges
+        UNWIND edges AS edge
+        WITH edge.node AS this1, edge.relationship AS this0
+        WITH *
+        
+        LIMIT $param1
+        RETURN collect({ properties: { r: this0.roles, __typename: "ActedIn" }, node: { __id: toString(id(this1)), __typename: "Actor" } }) AS var2
+    }
+    RETURN { edges: var2, totalCount: totalCount } AS var3
+}
+RETURN this { actorsConnection: var3 } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "movies": [
+    {
+      "actorsConnection": {
+        "edges": [
+          {
+            "r": {
+              "r": [
+                "R1"
+              ]
+            }
+          }
+        ]
+      }
+    }
+  ]
+}
+----
+
+== should alias many keys on a connection
+
+.Schema
+[source,graphql,schema=true]
+----
+type Movie {
+  title: String!
+  actors: [Actor!]! @relationship(type: "ACTED_IN", direction: IN, properties: "ActedIn")
+}
+
+type Actor {
+  name: String!
+}
+
+type ActedIn @relationshipProperties {
+  roles: [String]!
+}
+----
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (m:Movie {title: "RandomString1"})
+ CREATE (m)<-[:ACTED_IN {roles: ["RandomString3"]}]-(:Actor {name: "RandomString2"})
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies(where: {title: "RandomString1"}) {
+    title
+    connection: actorsConnection {
+      tC: totalCount
+      edges {
+        n: node {
+          n: name
+        }
+        p: properties {
+          r: roles
+        }
+      }
+      page: pageInfo {
+        hNP: hasNextPage
+      }
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "RandomString1"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE this.title = $param0
+CALL {
+    WITH this
+    MATCH (this)<-[this0:ACTED_IN]-(this1:Actor)
+    WITH collect({ node: this1, relationship: this0 }) AS edges
+    WITH edges, size(edges) AS totalCount
+    CALL {
+        WITH edges
+        UNWIND edges AS edge
+        WITH edge.node AS this1, edge.relationship AS this0
+        RETURN collect({ properties: { r: this0.roles, __typename: "ActedIn" }, node: { n: this1.name, __typename: "Actor" } }) AS var2
+    }
+    RETURN { edges: var2, totalCount: totalCount } AS var3
+}
+RETURN this { .title, connection: var3 } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "movies": [
+    {
+      "title": "RandomString1",
+      "connection": {
+        "tC": 1,
+        "edges": [
+          {
+            "n": {
+              "n": "RandomString2"
+            },
+            "p": {
+              "r": [
+                "RandomString3"
+              ]
+            }
+          }
+        ],
+        "page": {
+          "hNP": false
+        }
+      }
+    }
+  ]
+}
+----
+
+== should allow multiple aliases on the same connection
+
+.Schema
+[source,graphql,schema=true]
+----
+type Post {
+  title: String!
+  comments: [Comment!]! @relationship(type: "HAS_COMMENT", direction: OUT)
+}
+
+type Comment {
+  flag: Boolean!
+  post: Post! @relationship(type: "HAS_COMMENT", direction: IN)
+}
+----
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (post:Post {title: "RandomString1"})
+ FOREACH(flag in [true, true, false] |
+ CREATE (:Comment {flag: flag})<-[:HAS_COMMENT]-(post)
+ )
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  posts(where: {title: "RandomString1"}) {
+    flagged: commentsConnection(where: {node: {flag: true}}) {
+      edges {
+        node {
+          flag
+        }
+      }
+    }
+    unflagged: commentsConnection(where: {node: {flag: false}}) {
+      edges {
+        node {
+          flag
+        }
+      }
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "RandomString1",
+  "param1": true,
+  "param2": false
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Post)
+WHERE this.title = $param0
+CALL {
+    WITH this
+    MATCH (this)-[this0:HAS_COMMENT]->(this1:Comment)
+    WHERE this1.flag = $param1
+    WITH collect({ node: this1, relationship: this0 }) AS edges
+    WITH edges, size(edges) AS totalCount
+    CALL {
+        WITH edges
+        UNWIND edges AS edge
+        WITH edge.node AS this1, edge.relationship AS this0
+        RETURN collect({ node: { flag: this1.flag, __typename: "Comment" } }) AS var2
+    }
+    RETURN { edges: var2, totalCount: totalCount } AS var3
+}
+CALL {
+    WITH this
+    MATCH (this)-[this4:HAS_COMMENT]->(this5:Comment)
+    WHERE this5.flag = $param2
+    WITH collect({ node: this5, relationship: this4 }) AS edges
+    WITH edges, size(edges) AS totalCount
+    CALL {
+        WITH edges
+        UNWIND edges AS edge
+        WITH edge.node AS this5, edge.relationship AS this4
+        RETURN collect({ node: { flag: this5.flag, __typename: "Comment" } }) AS var6
+    }
+    RETURN { edges: var6, totalCount: totalCount } AS var7
+}
+RETURN this { flagged: var3, unflagged: var7 } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "posts": [
+    {
+      "flagged": {
+        "edges": [
+          {
+            "node": {
+              "flag": true
+            }
+          },
+          {
+            "node": {
+              "flag": true
+            }
+          }
+        ]
+      },
+      "unflagged": {
+        "edges": [
+          {
+            "node": {
+              "flag": false
+            }
+          }
+        ]
+      }
+    }
+  ]
+}
+----
+
+== should allow alias on nested connections
+
+.Schema
+[source,graphql,schema=true]
+----
+type Movie {
+  title: String!
+  actors: [Actor!]! @relationship(type: "ACTED_IN", properties: "ActedIn", direction: IN)
+}
+
+type Actor {
+  name: String!
+  movies: [Movie!]! @relationship(type: "ACTED_IN", properties: "ActedIn", direction: OUT)
+}
+
+type ActedIn @relationshipProperties {
+  screenTime: Int!
+}
+----
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (movie:Movie {title: "The Matrix"})
+ CREATE (actor:Actor {name: "Keanu Reeves"})
+ CREATE (actor)-[:ACTED_IN {screenTime: 120}]->(movie)
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies(where: {title: "The Matrix"}) {
+    title
+    actorsConnection(where: {node: {name: "Keanu Reeves"}}) {
+      edges {
+        properties {
+          screenTime
+        }
+        node {
+          name
+          b: moviesConnection(where: {node: {title: "The Matrix"}}) {
+            edges {
+              node {
+                title
+                a: actors {
+                  name
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "The Matrix",
+  "param1": "Keanu Reeves",
+  "param2": "The Matrix"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE this.title = $param0
+CALL {
+    WITH this
+    MATCH (this)<-[this0:ACTED_IN]-(this1:Actor)
+    WHERE this1.name = $param1
+    WITH collect({ node: this1, relationship: this0 }) AS edges
+    WITH edges, size(edges) AS totalCount
+    CALL {
+        WITH edges
+        UNWIND edges AS edge
+        WITH edge.node AS this1, edge.relationship AS this0
+        CALL {
+            WITH this1
+            MATCH (this1)-[this2:ACTED_IN]->(this3:Movie)
+            WHERE this3.title = $param2
+            WITH collect({ node: this3, relationship: this2 }) AS edges
+            WITH edges, size(edges) AS totalCount
+            CALL {
+                WITH edges
+                UNWIND edges AS edge
+                WITH edge.node AS this3, edge.relationship AS this2
+                CALL {
+                    WITH this3
+                    MATCH (this3)<-[this4:ACTED_IN]-(this5:Actor)
+                    WITH this5 { .name } AS this5
+                    RETURN collect(this5) AS var6
+                }
+                RETURN collect({ node: { title: this3.title, a: var6, __typename: "Movie" } }) AS var7
+            }
+            RETURN { edges: var7, totalCount: totalCount } AS var8
+        }
+        RETURN collect({ properties: { screenTime: this0.screenTime, __typename: "ActedIn" }, node: { name: this1.name, b: var8, __typename: "Actor" } }) AS var9
+    }
+    RETURN { edges: var9, totalCount: totalCount } AS var10
+}
+RETURN this { .title, actorsConnection: var10 } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "movies": [
+    {
+      "title": "The Matrix",
+      "actorsConnection": {
+        "edges": [
+          {
+            "properties": {
+              "screenTime": 120
+            },
+            "node": {
+              "name": "Keanu Reeves",
+              "b": {
+                "edges": [
+                  {
+                    "node": {
+                      "title": "The Matrix",
+                      "a": [
+                        {
+                          "name": "Keanu Reeves"
+                        }
+                      ]
+                    }
+                  }
+                ]
+              }
+            }
+          }
+        ]
+      }
+    }
+  ]
+}
+----
diff --git a/core/src/test/resources/integration-test-files/connections/filtering.adoc b/core/src/test/resources/integration-test-files/connections/filtering.adoc
index 5ab09cba..c5aeb8d2 100644
--- a/core/src/test/resources/integration-test-files/connections/filtering.adoc
+++ b/core/src/test/resources/integration-test-files/connections/filtering.adoc
@@ -31,7 +31,7 @@ CREATE (movie:Movie {title: "My title"})
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies {
@@ -50,7 +50,7 @@ CREATE (movie:Movie {title: "My title"})
 [source,json]
 ----
 {
-  "param0": "Arthur"
+  "param0" : "Arthur"
 }
 ----
 
@@ -92,21 +92,14 @@ RETURN this {
 [source,json,response=true]
 ----
 {
-  "movies": [
-    {
-      "actorsConnection": {
-        "edges": [
-          {
-            "node": {
-              "name": "Zaphod"
-            }
-          }
-        ]
-      }
+  "movies" : [ {
+    "actorsConnection" : {
+      "edges" : [ {
+        "node" : {
+          "name" : "Zaphod"
+        }
+      } ]
     }
-  ]
+  } ]
 }
 ----
-
-'''
-
diff --git a/core/src/test/resources/integration-test-files/connections/filtering.js.adoc b/core/src/test/resources/integration-test-files/connections/filtering.js.adoc
new file mode 100644
index 00000000..d5b1c212
--- /dev/null
+++ b/core/src/test/resources/integration-test-files/connections/filtering.js.adoc
@@ -0,0 +1,97 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= Connections Filtering
+
+== Setup
+
+.Schema
+[source,graphql,schema=true]
+----
+type Movie {
+  title: String!
+  actors: [Actor!]! @relationship(type: "ACTED_IN", direction: IN)
+}
+
+type Actor {
+  name: String!
+  movies: [Movie!]! @relationship(type: "ACTED_IN", direction: OUT)
+}
+----
+
+== allows for NOT boolean operators on connection projection filters
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (movie:Movie {title: "My title"})
+					CREATE (actorOne:Actor {name: "Arthur"})
+					CREATE (actorTwo:Actor {name: "Zaphod"})
+					CREATE (actorOne)-[:ACTED_IN]->(movie)<-[:ACTED_IN]-(actorTwo)
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies {
+    actorsConnection(where: {NOT: {node: {name: "Arthur"}}}) {
+      edges {
+        node {
+          name
+        }
+      }
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "Arthur"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+CALL {
+    WITH this
+    MATCH (this)<-[this0:ACTED_IN]-(this1:Actor)
+    WHERE NOT (this1.name = $param0)
+    WITH collect({ node: this1, relationship: this0 }) AS edges
+    WITH edges, size(edges) AS totalCount
+    CALL {
+        WITH edges
+        UNWIND edges AS edge
+        WITH edge.node AS this1, edge.relationship AS this0
+        RETURN collect({ node: { name: this1.name, __typename: "Actor" } }) AS var2
+    }
+    RETURN { edges: var2, totalCount: totalCount } AS var3
+}
+RETURN this { actorsConnection: var3 } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "movies": [
+    {
+      "actorsConnection": {
+        "edges": [
+          {
+            "node": {
+              "name": "Zaphod"
+            }
+          }
+        ]
+      }
+    }
+  ]
+}
+----
diff --git a/core/src/test/resources/integration-test-files/connections/interfaces.adoc b/core/src/test/resources/integration-test-files/connections/interfaces.adoc
index 8c596c80..c4894238 100644
--- a/core/src/test/resources/integration-test-files/connections/interfaces.adoc
+++ b/core/src/test/resources/integration-test-files/connections/interfaces.adoc
@@ -44,7 +44,7 @@ CREATE (actor:Actor {name: "Jason Momoa"})
 == Projecting node and relationship properties with no arguments
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query Actors($name: String) {
   actors(where: {name: $name}) {
@@ -73,7 +73,7 @@ query Actors($name: String) {
 [source,json,request=true]
 ----
 {
-  "name": "Jason Momoa"
+  "name" : "Jason Momoa"
 }
 ----
 
@@ -81,7 +81,7 @@ query Actors($name: String) {
 [source,json]
 ----
 {
-  "param0": "Jason Momoa"
+  "param0" : "Jason Momoa"
 }
 ----
 
@@ -174,12 +174,10 @@ RETURN this {
 }
 ----
 
-'''
-
 == Projecting node and relationship properties with shared where argument
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query Actors($name: String) {
   actors(where: {name: $name}) {
@@ -208,7 +206,7 @@ query Actors($name: String) {
 [source,json,request=true]
 ----
 {
-  "name": "Jason Momoa"
+  "name" : "Jason Momoa"
 }
 ----
 
@@ -216,9 +214,9 @@ query Actors($name: String) {
 [source,json]
 ----
 {
-  "param0": "Jason Momoa",
-  "param1": "Game of Thrones",
-  "param2": "Game of Thrones"
+  "param0" : "Jason Momoa",
+  "param1" : "Game of Thrones",
+  "param2" : "Game of Thrones"
 }
 ----
 
@@ -280,33 +278,27 @@ RETURN this {
 [source,json,response=true]
 ----
 {
-  "actors": [
-    {
-      "name": "Jason Momoa",
-      "actedInConnection": {
-        "edges": [
-          {
-            "properties": {
-              "screenTime": 858
-            },
-            "node": {
-              "title": "Game of Thrones",
-              "episodes": 73
-            }
-          }
-        ]
-      }
+  "actors" : [ {
+    "name" : "Jason Momoa",
+    "actedInConnection" : {
+      "edges" : [ {
+        "properties" : {
+          "screenTime" : 858
+        },
+        "node" : {
+          "title" : "Game of Thrones",
+          "episodes" : 73
+        }
+      } ]
     }
-  ]
+  } ]
 }
 ----
 
-'''
-
 == Projecting node and relationship properties with sort argument
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query Actors($name: String) {
   actors(where: {name: $name}) {
@@ -335,7 +327,7 @@ query Actors($name: String) {
 [source,json,request=true]
 ----
 {
-  "name": "Jason Momoa"
+  "name" : "Jason Momoa"
 }
 ----
 
@@ -343,7 +335,7 @@ query Actors($name: String) {
 [source,json]
 ----
 {
-  "param0": "Jason Momoa"
+  "param0" : "Jason Momoa"
 }
 ----
 
@@ -409,51 +401,43 @@ RETURN this {
 [source,json,response=true]
 ----
 {
-  "actors": [
-    {
-      "name": "Jason Momoa",
-      "actedInConnection": {
-        "edges": [
-          {
-            "properties": {
-              "screenTime": 858
-            },
-            "node": {
-              "title": "Game of Thrones",
-              "episodes": 73
-            }
-          },
-          {
-            "properties": {
-              "screenTime": 120
-            },
-            "node": {
-              "title": "Aquaman",
-              "runtime": 144
-            }
-          },
-          {
-            "properties": {
-              "screenTime": 90
-            },
-            "node": {
-              "title": "Dune",
-              "runtime": 155
-            }
-          }
-        ]
-      }
+  "actors" : [ {
+    "name" : "Jason Momoa",
+    "actedInConnection" : {
+      "edges" : [ {
+        "properties" : {
+          "screenTime" : 858
+        },
+        "node" : {
+          "title" : "Game of Thrones",
+          "episodes" : 73
+        }
+      }, {
+        "properties" : {
+          "screenTime" : 120
+        },
+        "node" : {
+          "title" : "Aquaman",
+          "runtime" : 144
+        }
+      }, {
+        "properties" : {
+          "screenTime" : 90
+        },
+        "node" : {
+          "title" : "Dune",
+          "runtime" : 155
+        }
+      } ]
     }
-  ]
+  } ]
 }
 ----
 
-'''
-
 == Projecting node and relationship properties with pagination
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query Actors($name: String, $after: String) {
   actors(where: {name: $name}) {
@@ -487,7 +471,7 @@ query Actors($name: String, $after: String) {
 [source,json,request=true]
 ----
 {
-  "name": "Jason Momoa"
+  "name" : "Jason Momoa"
 }
 ----
 
@@ -495,8 +479,8 @@ query Actors($name: String, $after: String) {
 [source,json]
 ----
 {
-  "param0": "Jason Momoa",
-  "param1": 2
+  "param0" : "Jason Momoa",
+  "param1" : 2
 }
 ----
 
@@ -562,45 +546,40 @@ RETURN this {
 [source,json,response=true]
 ----
 {
-  "actors": [
-    {
-      "name": "Jason Momoa",
-      "actedInConnection": {
-        "pageInfo": {
-          "hasNextPage": true,
-          "hasPreviousPage": false,
-          "endCursor": "YXJyYXljb25uZWN0aW9uOjE="
+  "actors" : [ {
+    "name" : "Jason Momoa",
+    "actedInConnection" : {
+      "pageInfo" : {
+        "hasNextPage" : true,
+        "hasPreviousPage" : false,
+        "endCursor" : "YXJyYXljb25uZWN0aW9uOjE="
+      },
+      "edges" : [ {
+        "properties" : {
+          "screenTime" : 858
         },
-        "edges": [
-          {
-            "properties": {
-              "screenTime": 858
-            },
-            "node": {
-              "title": "Game of Thrones",
-              "episodes": 73
-            }
-          },
-          {
-            "properties": {
-              "screenTime": 120
-            },
-            "node": {
-              "title": "Aquaman",
-              "runtime": 144
-            }
-          }
-        ]
-      }
+        "node" : {
+          "title" : "Game of Thrones",
+          "episodes" : 73
+        }
+      }, {
+        "properties" : {
+          "screenTime" : 120
+        },
+        "node" : {
+          "title" : "Aquaman",
+          "runtime" : 144
+        }
+      } ]
     }
-  ]
+  } ]
 }
 ----
 
 '''
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query Actors($name: String, $after: String) {
   actors(where: {name: $name}) {
@@ -634,8 +613,8 @@ query Actors($name: String, $after: String) {
 [source,json,request=true]
 ----
 {
-  "name": "Jason Momoa",
-  "after": "YXJyYXljb25uZWN0aW9uOjE="
+  "after" : "YXJyYXljb25uZWN0aW9uOjE=",
+  "name" : "Jason Momoa"
 }
 ----
 
@@ -711,38 +690,32 @@ RETURN this {
 [source,json,response=true]
 ----
 {
-  "actors": [
-    {
-      "name": "Jason Momoa",
-      "actedInConnection": {
-        "pageInfo": {
-          "hasNextPage": false,
-          "hasPreviousPage": true,
-          "endCursor": "YXJyYXljb25uZWN0aW9uOjI="
+  "actors" : [ {
+    "name" : "Jason Momoa",
+    "actedInConnection" : {
+      "pageInfo" : {
+        "hasNextPage" : false,
+        "hasPreviousPage" : true,
+        "endCursor" : "YXJyYXljb25uZWN0aW9uOjI="
+      },
+      "edges" : [ {
+        "properties" : {
+          "screenTime" : 90
         },
-        "edges": [
-          {
-            "properties": {
-              "screenTime": 90
-            },
-            "node": {
-              "title": "Dune",
-              "runtime": 155
-            }
-          }
-        ]
-      }
+        "node" : {
+          "title" : "Dune",
+          "runtime" : 155
+        }
+      } ]
     }
-  ]
+  } ]
 }
 ----
 
-'''
-
 == With where argument for shared field on node with node in database
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query Actors($name: String, $title: String) {
   actors(where: {name: $name}) {
@@ -771,8 +744,8 @@ query Actors($name: String, $title: String) {
 [source,json,request=true]
 ----
 {
-  "name": "Jason Momoa",
-  "title": "Dune"
+  "name" : "Jason Momoa",
+  "title" : "Dune"
 }
 ----
 
@@ -780,9 +753,9 @@ query Actors($name: String, $title: String) {
 [source,json]
 ----
 {
-  "param0": "Jason Momoa",
-  "param1": "Dune",
-  "param2": "Dune"
+  "param0" : "Jason Momoa",
+  "param1" : "Dune",
+  "param2" : "Dune"
 }
 ----
 
@@ -844,26 +817,19 @@ RETURN this {
 [source,json,response=true]
 ----
 {
-  "actors": [
-    {
-      "name": "Jason Momoa",
-      "actedInConnection": {
-        "edges": [
-          {
-            "properties": {
-              "screenTime": 90
-            },
-            "node": {
-              "title": "Dune",
-              "runtime": 155
-            }
-          }
-        ]
-      }
+  "actors" : [ {
+    "name" : "Jason Momoa",
+    "actedInConnection" : {
+      "edges" : [ {
+        "properties" : {
+          "screenTime" : 90
+        },
+        "node" : {
+          "title" : "Dune",
+          "runtime" : 155
+        }
+      } ]
     }
-  ]
+  } ]
 }
 ----
-
-'''
-
diff --git a/core/src/test/resources/integration-test-files/connections/interfaces.js.adoc b/core/src/test/resources/integration-test-files/connections/interfaces.js.adoc
new file mode 100644
index 00000000..15000e57
--- /dev/null
+++ b/core/src/test/resources/integration-test-files/connections/interfaces.js.adoc
@@ -0,0 +1,707 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= Connections -> Interfaces
+
+== Setup
+
+.Schema
+[source,graphql,schema=true]
+----
+interface Production {
+  title: String!
+}
+
+type Movie implements Production {
+  title: String!
+  runtime: Int!
+}
+
+type Series implements Production {
+  title: String!
+  episodes: Int!
+}
+
+type ActedIn @relationshipProperties {
+  screenTime: Int!
+}
+
+type Actor {
+  name: String!
+  actedIn: [Production!]! @relationship(type: "ACTED_IN", direction: OUT, properties: "ActedIn")
+}
+----
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (actor:Actor {name: "Jason Momoa"})
+ CREATE (actor)-[:ACTED_IN {screenTime: 858}]->(:Series {title: "Game of Thrones", episodes: 73})
+ CREATE (actor)-[:ACTED_IN {screenTime: 90}]->(:Movie {title: "Dune", runtime: 155})
+ CREATE (actor)-[:ACTED_IN {screenTime: 120}]->(:Movie {title: "Aquaman", runtime: 144})
+----
+
+== Projecting node and relationship properties with no arguments
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+query Actors($name: String) {
+  actors(where: {name: $name}) {
+    name
+    actedInConnection {
+      edges {
+        properties {
+          screenTime
+        }
+        node {
+          title
+          ... on Movie {
+            runtime
+          }
+          ... on Series {
+            episodes
+          }
+        }
+      }
+    }
+  }
+}
+----
+
+.GraphQL params input
+[source,json,request=true]
+----
+{
+  "name": "Jason Momoa"
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "Jason Momoa"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Actor)
+WHERE this.name = $param0
+CALL {
+    WITH this
+    CALL {
+        WITH this
+        MATCH (this)-[this0:ACTED_IN]->(this1:Movie)
+        WITH { properties: { screenTime: this0.screenTime, __typename: "ActedIn" }, node: { __typename: "Movie", __id: toString(id(this1)), runtime: this1.runtime, title: this1.title } } AS edge
+        RETURN edge
+        UNION
+        WITH this
+        MATCH (this)-[this2:ACTED_IN]->(this3:Series)
+        WITH { properties: { screenTime: this2.screenTime, __typename: "ActedIn" }, node: { __typename: "Series", __id: toString(id(this3)), episodes: this3.episodes, title: this3.title } } AS edge
+        RETURN edge
+    }
+    WITH collect(edge) AS edges
+    WITH edges, size(edges) AS totalCount
+    RETURN { edges: edges, totalCount: totalCount } AS var4
+}
+RETURN this { .name, actedInConnection: var4 } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "actors": [
+    {
+      "name": "Jason Momoa",
+      "actedInConnection": {
+        "edges": [
+          {
+            "properties": {
+              "screenTime": 90
+            },
+            "node": {
+              "title": "Dune",
+              "runtime": 155
+            }
+          },
+          {
+            "properties": {
+              "screenTime": 120
+            },
+            "node": {
+              "title": "Aquaman",
+              "runtime": 144
+            }
+          },
+          {
+            "properties": {
+              "screenTime": 858
+            },
+            "node": {
+              "title": "Game of Thrones",
+              "episodes": 73
+            }
+          }
+        ]
+      }
+    }
+  ]
+}
+----
+
+== Projecting node and relationship properties with shared where argument
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+query Actors($name: String) {
+  actors(where: {name: $name}) {
+    name
+    actedInConnection(where: {node: {title: "Game of Thrones"}}) {
+      edges {
+        properties {
+          screenTime
+        }
+        node {
+          title
+          ... on Movie {
+            runtime
+          }
+          ... on Series {
+            episodes
+          }
+        }
+      }
+    }
+  }
+}
+----
+
+.GraphQL params input
+[source,json,request=true]
+----
+{
+  "name": "Jason Momoa"
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "Jason Momoa",
+  "param1": "Game of Thrones",
+  "param2": "Game of Thrones"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Actor)
+WHERE this.name = $param0
+CALL {
+    WITH this
+    CALL {
+        WITH this
+        MATCH (this)-[this0:ACTED_IN]->(this1:Movie)
+        WHERE this1.title = $param1
+        WITH { properties: { screenTime: this0.screenTime, __typename: "ActedIn" }, node: { __typename: "Movie", __id: toString(id(this1)), runtime: this1.runtime, title: this1.title } } AS edge
+        RETURN edge
+        UNION
+        WITH this
+        MATCH (this)-[this2:ACTED_IN]->(this3:Series)
+        WHERE this3.title = $param2
+        WITH { properties: { screenTime: this2.screenTime, __typename: "ActedIn" }, node: { __typename: "Series", __id: toString(id(this3)), episodes: this3.episodes, title: this3.title } } AS edge
+        RETURN edge
+    }
+    WITH collect(edge) AS edges
+    WITH edges, size(edges) AS totalCount
+    RETURN { edges: edges, totalCount: totalCount } AS var4
+}
+RETURN this { .name, actedInConnection: var4 } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "actors": [
+    {
+      "name": "Jason Momoa",
+      "actedInConnection": {
+        "edges": [
+          {
+            "properties": {
+              "screenTime": 858
+            },
+            "node": {
+              "title": "Game of Thrones",
+              "episodes": 73
+            }
+          }
+        ]
+      }
+    }
+  ]
+}
+----
+
+== Projecting node and relationship properties with sort argument
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+query Actors($name: String) {
+  actors(where: {name: $name}) {
+    name
+    actedInConnection(sort: [{edge: {screenTime: DESC}}]) {
+      edges {
+        properties {
+          screenTime
+        }
+        node {
+          title
+          ... on Movie {
+            runtime
+          }
+          ... on Series {
+            episodes
+          }
+        }
+      }
+    }
+  }
+}
+----
+
+.GraphQL params input
+[source,json,request=true]
+----
+{
+  "name": "Jason Momoa"
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "Jason Momoa"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Actor)
+WHERE this.name = $param0
+CALL {
+    WITH this
+    CALL {
+        WITH this
+        MATCH (this)-[this0:ACTED_IN]->(this1:Movie)
+        WITH { properties: { screenTime: this0.screenTime, __typename: "ActedIn" }, node: { __typename: "Movie", __id: toString(id(this1)), runtime: this1.runtime, title: this1.title } } AS edge
+        RETURN edge
+        UNION
+        WITH this
+        MATCH (this)-[this2:ACTED_IN]->(this3:Series)
+        WITH { properties: { screenTime: this2.screenTime, __typename: "ActedIn" }, node: { __typename: "Series", __id: toString(id(this3)), episodes: this3.episodes, title: this3.title } } AS edge
+        RETURN edge
+    }
+    WITH collect(edge) AS edges
+    WITH edges, size(edges) AS totalCount
+    CALL {
+        WITH edges
+        UNWIND edges AS edge
+        WITH edge
+        ORDER BY edge.properties.screenTime DESC
+        RETURN collect(edge) AS var4
+    }
+    RETURN { edges: var4, totalCount: totalCount } AS var5
+}
+RETURN this { .name, actedInConnection: var5 } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "actors": [
+    {
+      "name": "Jason Momoa",
+      "actedInConnection": {
+        "edges": [
+          {
+            "properties": {
+              "screenTime": 858
+            },
+            "node": {
+              "title": "Game of Thrones",
+              "episodes": 73
+            }
+          },
+          {
+            "properties": {
+              "screenTime": 120
+            },
+            "node": {
+              "title": "Aquaman",
+              "runtime": 144
+            }
+          },
+          {
+            "properties": {
+              "screenTime": 90
+            },
+            "node": {
+              "title": "Dune",
+              "runtime": 155
+            }
+          }
+        ]
+      }
+    }
+  ]
+}
+----
+
+== Projecting node and relationship properties with pagination
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+query Actors($name: String, $after: String) {
+  actors(where: {name: $name}) {
+    name
+    actedInConnection(first: 2, after: $after, sort: {edge: {screenTime: DESC}}) {
+      pageInfo {
+        hasNextPage
+        hasPreviousPage
+        endCursor
+      }
+      edges {
+        properties {
+          screenTime
+        }
+        node {
+          title
+          ... on Movie {
+            runtime
+          }
+          ... on Series {
+            episodes
+          }
+        }
+      }
+    }
+  }
+}
+----
+
+.GraphQL params input
+[source,json,request=true]
+----
+{
+  "name": "Jason Momoa"
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "Jason Momoa",
+  "param1": 2
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Actor)
+WHERE this.name = $param0
+CALL {
+    WITH this
+    CALL {
+        WITH this
+        MATCH (this)-[this0:ACTED_IN]->(this1:Movie)
+        WITH { properties: { screenTime: this0.screenTime, __typename: "ActedIn" }, node: { __typename: "Movie", __id: toString(id(this1)), runtime: this1.runtime, title: this1.title } } AS edge
+        RETURN edge
+        UNION
+        WITH this
+        MATCH (this)-[this2:ACTED_IN]->(this3:Series)
+        WITH { properties: { screenTime: this2.screenTime, __typename: "ActedIn" }, node: { __typename: "Series", __id: toString(id(this3)), episodes: this3.episodes, title: this3.title } } AS edge
+        RETURN edge
+    }
+    WITH collect(edge) AS edges
+    WITH edges, size(edges) AS totalCount
+    CALL {
+        WITH edges
+        UNWIND edges AS edge
+        WITH edge
+        ORDER BY edge.properties.screenTime DESC
+        LIMIT $param1
+        RETURN collect(edge) AS var4
+    }
+    RETURN { edges: var4, totalCount: totalCount } AS var5
+}
+RETURN this { .name, actedInConnection: var5 } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "actors": [
+    {
+      "name": "Jason Momoa",
+      "actedInConnection": {
+        "pageInfo": {
+          "hasNextPage": true,
+          "hasPreviousPage": false,
+          "endCursor": "YXJyYXljb25uZWN0aW9uOjE="
+        },
+        "edges": [
+          {
+            "properties": {
+              "screenTime": 858
+            },
+            "node": {
+              "title": "Game of Thrones",
+              "episodes": 73
+            }
+          },
+          {
+            "properties": {
+              "screenTime": 120
+            },
+            "node": {
+              "title": "Aquaman",
+              "runtime": 144
+            }
+          }
+        ]
+      }
+    }
+  ]
+}
+----
+
+'''
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+query Actors($name: String, $after: String) {
+  actors(where: {name: $name}) {
+    name
+    actedInConnection(first: 2, after: $after, sort: {edge: {screenTime: DESC}}) {
+      pageInfo {
+        hasNextPage
+        hasPreviousPage
+        endCursor
+      }
+      edges {
+        properties {
+          screenTime
+        }
+        node {
+          title
+          ... on Movie {
+            runtime
+          }
+          ... on Series {
+            episodes
+          }
+        }
+      }
+    }
+  }
+}
+----
+
+.GraphQL params input
+[source,json,request=true]
+----
+{
+  "name": "Jason Momoa",
+  "after": "YXJyYXljb25uZWN0aW9uOjE="
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "Jason Momoa",
+  "param1": 2
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Actor)
+WHERE this.name = $param0
+CALL {
+    WITH this
+    CALL {
+        WITH this
+        MATCH (this)-[this0:ACTED_IN]->(this1:Movie)
+        WITH { properties: { screenTime: this0.screenTime, __typename: "ActedIn" }, node: { __typename: "Movie", __id: toString(id(this1)), runtime: this1.runtime, title: this1.title } } AS edge
+        RETURN edge
+        UNION
+        WITH this
+        MATCH (this)-[this2:ACTED_IN]->(this3:Series)
+        WITH { properties: { screenTime: this2.screenTime, __typename: "ActedIn" }, node: { __typename: "Series", __id: toString(id(this3)), episodes: this3.episodes, title: this3.title } } AS edge
+        RETURN edge
+    }
+    WITH collect(edge) AS edges
+    WITH edges, size(edges) AS totalCount
+    CALL {
+        WITH edges
+        UNWIND edges AS edge
+        WITH edge
+        ORDER BY edge.properties.screenTime DESC
+        LIMIT $param1
+        RETURN collect(edge) AS var4
+    }
+    RETURN { edges: var4, totalCount: totalCount } AS var5
+}
+RETURN this { .name, actedInConnection: var5 } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "actors": [
+    {
+      "name": "Jason Momoa",
+      "actedInConnection": {
+        "pageInfo": {
+          "hasNextPage": false,
+          "hasPreviousPage": true,
+          "endCursor": "YXJyYXljb25uZWN0aW9uOjI="
+        },
+        "edges": [
+          {
+            "properties": {
+              "screenTime": 90
+            },
+            "node": {
+              "title": "Dune",
+              "runtime": 155
+            }
+          }
+        ]
+      }
+    }
+  ]
+}
+----
+
+== With where argument for shared field on node with node in database
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+query Actors($name: String, $title: String) {
+  actors(where: {name: $name}) {
+    name
+    actedInConnection(where: {node: {title: $title}}) {
+      edges {
+        properties {
+          screenTime
+        }
+        node {
+          title
+          ... on Movie {
+            runtime
+          }
+          ... on Series {
+            episodes
+          }
+        }
+      }
+    }
+  }
+}
+----
+
+.GraphQL params input
+[source,json,request=true]
+----
+{
+  "name": "Jason Momoa",
+  "title": "Dune"
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "Jason Momoa",
+  "param1": "Dune",
+  "param2": "Dune"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Actor)
+WHERE this.name = $param0
+CALL {
+    WITH this
+    CALL {
+        WITH this
+        MATCH (this)-[this0:ACTED_IN]->(this1:Movie)
+        WHERE this1.title = $param1
+        WITH { properties: { screenTime: this0.screenTime, __typename: "ActedIn" }, node: { __typename: "Movie", __id: toString(id(this1)), runtime: this1.runtime, title: this1.title } } AS edge
+        RETURN edge
+        UNION
+        WITH this
+        MATCH (this)-[this2:ACTED_IN]->(this3:Series)
+        WHERE this3.title = $param2
+        WITH { properties: { screenTime: this2.screenTime, __typename: "ActedIn" }, node: { __typename: "Series", __id: toString(id(this3)), episodes: this3.episodes, title: this3.title } } AS edge
+        RETURN edge
+    }
+    WITH collect(edge) AS edges
+    WITH edges, size(edges) AS totalCount
+    RETURN { edges: edges, totalCount: totalCount } AS var4
+}
+RETURN this { .name, actedInConnection: var4 } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "actors": [
+    {
+      "name": "Jason Momoa",
+      "actedInConnection": {
+        "edges": [
+          {
+            "properties": {
+              "screenTime": 90
+            },
+            "node": {
+              "title": "Dune",
+              "runtime": 155
+            }
+          }
+        ]
+      }
+    }
+  ]
+}
+----
diff --git a/core/src/test/resources/integration-test-files/connections/nested.adoc b/core/src/test/resources/integration-test-files/connections/nested.adoc
index 83065cfb..8767d49e 100644
--- a/core/src/test/resources/integration-test-files/connections/nested.adoc
+++ b/core/src/test/resources/integration-test-files/connections/nested.adoc
@@ -34,7 +34,7 @@ CREATE (movie:Movie {title: "Forrest Gump"})
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies(where: {title: "Forrest Gump"}) {
@@ -67,8 +67,8 @@ CREATE (movie:Movie {title: "Forrest Gump"})
 [source,json]
 ----
 {
-  "param0": "Forrest Gump",
-  "param1": "Tom Hanks"
+  "param0" : "Forrest Gump",
+  "param1" : "Tom Hanks"
 }
 ----
 
@@ -150,42 +150,32 @@ RETURN this {
 [source,json,response=true]
 ----
 {
-  "movies": [
-    {
-      "title": "Forrest Gump",
-      "actorsConnection": {
-        "edges": [
-          {
-            "properties": {
-              "screenTime": 120
-            },
-            "node": {
-              "name": "Tom Hanks",
-              "moviesConnection": {
-                "edges": [
-                  {
-                    "node": {
-                      "title": "Forrest Gump",
-                      "actors": [
-                        {
-                          "name": "Tom Hanks"
-                        }
-                      ]
-                    }
-                  }
-                ]
+  "movies" : [ {
+    "title" : "Forrest Gump",
+    "actorsConnection" : {
+      "edges" : [ {
+        "properties" : {
+          "screenTime" : 120
+        },
+        "node" : {
+          "name" : "Tom Hanks",
+          "moviesConnection" : {
+            "edges" : [ {
+              "node" : {
+                "title" : "Forrest Gump",
+                "actors" : [ {
+                  "name" : "Tom Hanks"
+                } ]
               }
-            }
+            } ]
           }
-        ]
-      }
+        }
+      } ]
     }
-  ]
+  } ]
 }
 ----
 
-'''
-
 == should allow where clause on nested connections
 
 .Test Data
@@ -197,7 +187,7 @@ CREATE (movie:Movie {title: "Forrest Gump"})
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies(where: {title: "Forrest Gump"}) {
@@ -230,9 +220,9 @@ CREATE (movie:Movie {title: "Forrest Gump"})
 [source,json]
 ----
 {
-  "param0": "Forrest Gump",
-  "param1": "Tom Hanks",
-  "param2": "Forrest Gump"
+  "param0" : "Forrest Gump",
+  "param1" : "Tom Hanks",
+  "param2" : "Forrest Gump"
 }
 ----
 
@@ -315,39 +305,28 @@ RETURN this {
 [source,json,response=true]
 ----
 {
-  "movies": [
-    {
-      "title": "Forrest Gump",
-      "actorsConnection": {
-        "edges": [
-          {
-            "properties": {
-              "screenTime": 120
-            },
-            "node": {
-              "name": "Tom Hanks",
-              "moviesConnection": {
-                "edges": [
-                  {
-                    "node": {
-                      "title": "Forrest Gump",
-                      "actors": [
-                        {
-                          "name": "Tom Hanks"
-                        }
-                      ]
-                    }
-                  }
-                ]
+  "movies" : [ {
+    "title" : "Forrest Gump",
+    "actorsConnection" : {
+      "edges" : [ {
+        "properties" : {
+          "screenTime" : 120
+        },
+        "node" : {
+          "name" : "Tom Hanks",
+          "moviesConnection" : {
+            "edges" : [ {
+              "node" : {
+                "title" : "Forrest Gump",
+                "actors" : [ {
+                  "name" : "Tom Hanks"
+                } ]
               }
-            }
+            } ]
           }
-        ]
-      }
+        }
+      } ]
     }
-  ]
+  } ]
 }
 ----
-
-'''
-
diff --git a/core/src/test/resources/integration-test-files/connections/nested.js.adoc b/core/src/test/resources/integration-test-files/connections/nested.js.adoc
new file mode 100644
index 00000000..78acf72a
--- /dev/null
+++ b/core/src/test/resources/integration-test-files/connections/nested.js.adoc
@@ -0,0 +1,283 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= Connections Alias
+
+== Setup
+
+.Schema
+[source,graphql,schema=true]
+----
+type Movie {
+  title: String!
+  actors: [Actor!]! @relationship(type: "ACTED_IN", properties: "ActedIn", direction: IN)
+}
+
+type Actor {
+  name: String!
+  movies: [Movie!]! @relationship(type: "ACTED_IN", properties: "ActedIn", direction: OUT)
+}
+
+type ActedIn @relationshipProperties {
+  screenTime: Int!
+}
+----
+
+== should allow nested connections
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (movie:Movie {title: "Forrest Gump"})
+ CREATE (actor:Actor {name: "Tom Hanks"})
+ CREATE (actor)-[:ACTED_IN {screenTime: 120}]->(movie)
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies(where: {title: "Forrest Gump"}) {
+    title
+    actorsConnection(where: {node: {name: "Tom Hanks"}}) {
+      edges {
+        properties {
+          screenTime
+        }
+        node {
+          name
+          moviesConnection {
+            edges {
+              node {
+                title
+                actors {
+                  name
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "Forrest Gump",
+  "param1": "Tom Hanks"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE this.title = $param0
+CALL {
+    WITH this
+    MATCH (this)<-[this0:ACTED_IN]-(this1:Actor)
+    WHERE this1.name = $param1
+    WITH collect({ node: this1, relationship: this0 }) AS edges
+    WITH edges, size(edges) AS totalCount
+    CALL {
+        WITH edges
+        UNWIND edges AS edge
+        WITH edge.node AS this1, edge.relationship AS this0
+        CALL {
+            WITH this1
+            MATCH (this1)-[this2:ACTED_IN]->(this3:Movie)
+            WITH collect({ node: this3, relationship: this2 }) AS edges
+            WITH edges, size(edges) AS totalCount
+            CALL {
+                WITH edges
+                UNWIND edges AS edge
+                WITH edge.node AS this3, edge.relationship AS this2
+                CALL {
+                    WITH this3
+                    MATCH (this3)<-[this4:ACTED_IN]-(this5:Actor)
+                    WITH this5 { .name } AS this5
+                    RETURN collect(this5) AS var6
+                }
+                RETURN collect({ node: { title: this3.title, actors: var6, __typename: "Movie" } }) AS var7
+            }
+            RETURN { edges: var7, totalCount: totalCount } AS var8
+        }
+        RETURN collect({ properties: { screenTime: this0.screenTime, __typename: "ActedIn" }, node: { name: this1.name, moviesConnection: var8, __typename: "Actor" } }) AS var9
+    }
+    RETURN { edges: var9, totalCount: totalCount } AS var10
+}
+RETURN this { .title, actorsConnection: var10 } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "movies": [
+    {
+      "title": "Forrest Gump",
+      "actorsConnection": {
+        "edges": [
+          {
+            "properties": {
+              "screenTime": 120
+            },
+            "node": {
+              "name": "Tom Hanks",
+              "moviesConnection": {
+                "edges": [
+                  {
+                    "node": {
+                      "title": "Forrest Gump",
+                      "actors": [
+                        {
+                          "name": "Tom Hanks"
+                        }
+                      ]
+                    }
+                  }
+                ]
+              }
+            }
+          }
+        ]
+      }
+    }
+  ]
+}
+----
+
+== should allow where clause on nested connections
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (movie:Movie {title: "Forrest Gump"})
+ CREATE (actor:Actor {name: "Tom Hanks"})
+ CREATE (actor)-[:ACTED_IN {screenTime: 120}]->(movie)
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies(where: {title: "Forrest Gump"}) {
+    title
+    actorsConnection(where: {node: {name: "Tom Hanks"}}) {
+      edges {
+        properties {
+          screenTime
+        }
+        node {
+          name
+          moviesConnection(where: {node: {title: "Forrest Gump"}}) {
+            edges {
+              node {
+                title
+                actors {
+                  name
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "Forrest Gump",
+  "param1": "Tom Hanks",
+  "param2": "Forrest Gump"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE this.title = $param0
+CALL {
+    WITH this
+    MATCH (this)<-[this0:ACTED_IN]-(this1:Actor)
+    WHERE this1.name = $param1
+    WITH collect({ node: this1, relationship: this0 }) AS edges
+    WITH edges, size(edges) AS totalCount
+    CALL {
+        WITH edges
+        UNWIND edges AS edge
+        WITH edge.node AS this1, edge.relationship AS this0
+        CALL {
+            WITH this1
+            MATCH (this1)-[this2:ACTED_IN]->(this3:Movie)
+            WHERE this3.title = $param2
+            WITH collect({ node: this3, relationship: this2 }) AS edges
+            WITH edges, size(edges) AS totalCount
+            CALL {
+                WITH edges
+                UNWIND edges AS edge
+                WITH edge.node AS this3, edge.relationship AS this2
+                CALL {
+                    WITH this3
+                    MATCH (this3)<-[this4:ACTED_IN]-(this5:Actor)
+                    WITH this5 { .name } AS this5
+                    RETURN collect(this5) AS var6
+                }
+                RETURN collect({ node: { title: this3.title, actors: var6, __typename: "Movie" } }) AS var7
+            }
+            RETURN { edges: var7, totalCount: totalCount } AS var8
+        }
+        RETURN collect({ properties: { screenTime: this0.screenTime, __typename: "ActedIn" }, node: { name: this1.name, moviesConnection: var8, __typename: "Actor" } }) AS var9
+    }
+    RETURN { edges: var9, totalCount: totalCount } AS var10
+}
+RETURN this { .title, actorsConnection: var10 } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "movies": [
+    {
+      "title": "Forrest Gump",
+      "actorsConnection": {
+        "edges": [
+          {
+            "properties": {
+              "screenTime": 120
+            },
+            "node": {
+              "name": "Tom Hanks",
+              "moviesConnection": {
+                "edges": [
+                  {
+                    "node": {
+                      "title": "Forrest Gump",
+                      "actors": [
+                        {
+                          "name": "Tom Hanks"
+                        }
+                      ]
+                    }
+                  }
+                ]
+              }
+            }
+          }
+        ]
+      }
+    }
+  ]
+}
+----
diff --git a/core/src/test/resources/integration-test-files/connections/unions.adoc b/core/src/test/resources/integration-test-files/connections/unions.adoc
index d5ad9583..9484f395 100644
--- a/core/src/test/resources/integration-test-files/connections/unions.adoc
+++ b/core/src/test/resources/integration-test-files/connections/unions.adoc
@@ -42,7 +42,7 @@ CREATE (author:Author {name: "Charles Dickens"})
 == Projecting node and relationship properties with no arguments
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query ($authorName: String) {
   authors(where: {name: $authorName}) {
@@ -70,7 +70,7 @@ query ($authorName: String) {
 [source,json,request=true]
 ----
 {
-  "authorName": "Charles Dickens"
+  "authorName" : "Charles Dickens"
 }
 ----
 
@@ -78,7 +78,7 @@ query ($authorName: String) {
 [source,json]
 ----
 {
-  "param0": "Charles Dickens"
+  "param0" : "Charles Dickens"
 }
 ----
 
@@ -136,48 +136,40 @@ RETURN this {
 [source,json,response=true,ignore-order]
 ----
 {
-  "authors": [
-    {
-      "name": "Charles Dickens",
-      "publicationsConnection": {
-        "edges": [
-          {
-            "properties": {
-              "words": 30953
-            },
-            "node": {
-              "title": "A Christmas Carol"
-            }
-          },
-          {
-            "properties": {
-              "words": 167543
-            },
-            "node": {
-              "title": "Oliver Twist"
-            }
-          },
-          {
-            "properties": {
-              "words": 3413
-            },
-            "node": {
-              "subject": "Master Humphrey's Clock"
-            }
-          }
-        ]
-      }
+  "authors" : [ {
+    "name" : "Charles Dickens",
+    "publicationsConnection" : {
+      "edges" : [ {
+        "properties" : {
+          "words" : 30953
+        },
+        "node" : {
+          "title" : "A Christmas Carol"
+        }
+      }, {
+        "properties" : {
+          "words" : 167543
+        },
+        "node" : {
+          "title" : "Oliver Twist"
+        }
+      }, {
+        "properties" : {
+          "words" : 3413
+        },
+        "node" : {
+          "subject" : "Master Humphrey's Clock"
+        }
+      } ]
     }
-  ]
+  } ]
 }
 ----
 
-'''
-
 == Projecting node and relationship properties with sort argument
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query ($authorName: String) {
   authors(where: {name: $authorName}) {
@@ -205,7 +197,7 @@ query ($authorName: String) {
 [source,json,request=true]
 ----
 {
-  "authorName": "Charles Dickens"
+  "authorName" : "Charles Dickens"
 }
 ----
 
@@ -213,7 +205,7 @@ query ($authorName: String) {
 [source,json]
 ----
 {
-  "param0": "Charles Dickens"
+  "param0" : "Charles Dickens"
 }
 ----
 
@@ -277,48 +269,40 @@ RETURN this {
 [source,json,response=true]
 ----
 {
-  "authors": [
-    {
-      "name": "Charles Dickens",
-      "publicationsConnection": {
-        "edges": [
-          {
-            "properties": {
-              "words": 3413
-            },
-            "node": {
-              "subject": "Master Humphrey's Clock"
-            }
-          },
-          {
-            "properties": {
-              "words": 30953
-            },
-            "node": {
-              "title": "A Christmas Carol"
-            }
-          },
-          {
-            "properties": {
-              "words": 167543
-            },
-            "node": {
-              "title": "Oliver Twist"
-            }
-          }
-        ]
-      }
+  "authors" : [ {
+    "name" : "Charles Dickens",
+    "publicationsConnection" : {
+      "edges" : [ {
+        "properties" : {
+          "words" : 3413
+        },
+        "node" : {
+          "subject" : "Master Humphrey's Clock"
+        }
+      }, {
+        "properties" : {
+          "words" : 30953
+        },
+        "node" : {
+          "title" : "A Christmas Carol"
+        }
+      }, {
+        "properties" : {
+          "words" : 167543
+        },
+        "node" : {
+          "title" : "Oliver Twist"
+        }
+      } ]
     }
-  ]
+  } ]
 }
 ----
 
-'''
-
 == Projecting node and relationship properties with pagination
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query ($authorName: String, $after: String) {
   authors(where: {name: $authorName}) {
@@ -351,7 +335,7 @@ query ($authorName: String, $after: String) {
 [source,json,request=true]
 ----
 {
-  "authorName": "Charles Dickens"
+  "authorName" : "Charles Dickens"
 }
 ----
 
@@ -359,8 +343,8 @@ query ($authorName: String, $after: String) {
 [source,json]
 ----
 {
-  "param0": "Charles Dickens",
-  "param1": 2
+  "param0" : "Charles Dickens",
+  "param1" : 2
 }
 ----
 
@@ -424,43 +408,38 @@ RETURN this {
 [source,json,response=true]
 ----
 {
-  "authors": [
-    {
-      "name": "Charles Dickens",
-      "publicationsConnection": {
-        "pageInfo": {
-          "hasNextPage": true,
-          "hasPreviousPage": false,
-          "endCursor": "YXJyYXljb25uZWN0aW9uOjE="
+  "authors" : [ {
+    "name" : "Charles Dickens",
+    "publicationsConnection" : {
+      "pageInfo" : {
+        "hasNextPage" : true,
+        "hasPreviousPage" : false,
+        "endCursor" : "YXJyYXljb25uZWN0aW9uOjE="
+      },
+      "edges" : [ {
+        "properties" : {
+          "words" : 3413
         },
-        "edges": [
-          {
-            "properties": {
-              "words": 3413
-            },
-            "node": {
-              "subject": "Master Humphrey's Clock"
-            }
-          },
-          {
-            "properties": {
-              "words": 30953
-            },
-            "node": {
-              "title": "A Christmas Carol"
-            }
-          }
-        ]
-      }
+        "node" : {
+          "subject" : "Master Humphrey's Clock"
+        }
+      }, {
+        "properties" : {
+          "words" : 30953
+        },
+        "node" : {
+          "title" : "A Christmas Carol"
+        }
+      } ]
     }
-  ]
+  } ]
 }
 ----
 
 '''
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query ($authorName: String, $after: String) {
   authors(where: {name: $authorName}) {
@@ -493,8 +472,8 @@ query ($authorName: String, $after: String) {
 [source,json,request=true]
 ----
 {
-  "authorName": "Charles Dickens",
-  "after": "YXJyYXljb25uZWN0aW9uOjE="
+  "after" : "YXJyYXljb25uZWN0aW9uOjE=",
+  "authorName" : "Charles Dickens"
 }
 ----
 
@@ -568,37 +547,31 @@ RETURN this {
 [source,json,response=true]
 ----
 {
-  "authors": [
-    {
-      "name": "Charles Dickens",
-      "publicationsConnection": {
-        "pageInfo": {
-          "hasNextPage": false,
-          "hasPreviousPage": true,
-          "endCursor": "YXJyYXljb25uZWN0aW9uOjI="
+  "authors" : [ {
+    "name" : "Charles Dickens",
+    "publicationsConnection" : {
+      "pageInfo" : {
+        "hasNextPage" : false,
+        "hasPreviousPage" : true,
+        "endCursor" : "YXJyYXljb25uZWN0aW9uOjI="
+      },
+      "edges" : [ {
+        "properties" : {
+          "words" : 167543
         },
-        "edges": [
-          {
-            "properties": {
-              "words": 167543
-            },
-            "node": {
-              "title": "Oliver Twist"
-            }
-          }
-        ]
-      }
+        "node" : {
+          "title" : "Oliver Twist"
+        }
+      } ]
     }
-  ]
+  } ]
 }
 ----
 
-'''
-
 == Projecting node and relationship properties for one union member with no arguments
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query ($authorName: String) {
   authors(where: {name: $authorName}) {
@@ -623,7 +596,7 @@ query ($authorName: String) {
 [source,json,request=true]
 ----
 {
-  "authorName": "Charles Dickens"
+  "authorName" : "Charles Dickens"
 }
 ----
 
@@ -631,7 +604,7 @@ query ($authorName: String) {
 [source,json]
 ----
 {
-  "param0": "Charles Dickens"
+  "param0" : "Charles Dickens"
 }
 ----
 
@@ -716,12 +689,10 @@ RETURN this {
 }
 ----
 
-'''
-
 == With where argument on node with node in database
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query ($authorName: String, $bookTitle: String) {
   authors(where: {name: $authorName}) {
@@ -746,8 +717,8 @@ query ($authorName: String, $bookTitle: String) {
 [source,json,request=true]
 ----
 {
-  "authorName": "Charles Dickens",
-  "bookTitle": "Oliver Twist"
+  "authorName" : "Charles Dickens",
+  "bookTitle" : "Oliver Twist"
 }
 ----
 
@@ -755,8 +726,8 @@ query ($authorName: String, $bookTitle: String) {
 [source,json]
 ----
 {
-  "param0": "Charles Dickens",
-  "param1": "Oliver Twist"
+  "param0" : "Charles Dickens",
+  "param1" : "Oliver Twist"
 }
 ----
 
@@ -801,32 +772,26 @@ RETURN this {
 [source,json,response=true]
 ----
 {
-  "authors": [
-    {
-      "name": "Charles Dickens",
-      "publicationsConnection": {
-        "edges": [
-          {
-            "properties": {
-              "words": 167543
-            },
-            "node": {
-              "title": "Oliver Twist"
-            }
-          }
-        ]
-      }
+  "authors" : [ {
+    "name" : "Charles Dickens",
+    "publicationsConnection" : {
+      "edges" : [ {
+        "properties" : {
+          "words" : 167543
+        },
+        "node" : {
+          "title" : "Oliver Twist"
+        }
+      } ]
     }
-  ]
+  } ]
 }
 ----
 
-'''
-
 == With where argument on all nodes with all in database
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query ($authorName: String, $bookTitle: String, $journalSubject: String) {
   authors(where: {name: $authorName}) {
@@ -858,9 +823,9 @@ query ($authorName: String, $bookTitle: String, $journalSubject: String) {
 [source,json,request=true]
 ----
 {
-  "authorName": "Charles Dickens",
-  "bookTitle": "Oliver Twist",
-  "journalSubject": "Master Humphrey's Clock"
+  "authorName" : "Charles Dickens",
+  "bookTitle" : "Oliver Twist",
+  "journalSubject" : "Master Humphrey's Clock"
 }
 ----
 
@@ -868,9 +833,9 @@ query ($authorName: String, $bookTitle: String, $journalSubject: String) {
 [source,json]
 ----
 {
-  "param0": "Charles Dickens",
-  "param1": "Oliver Twist",
-  "param2": "Master Humphrey's Clock"
+  "param0" : "Charles Dickens",
+  "param1" : "Oliver Twist",
+  "param2" : "Master Humphrey's Clock"
 }
 ----
 
@@ -930,43 +895,36 @@ RETURN this {
 [source,json,response=true,ignore-order]
 ----
 {
-  "authors": [
-    {
-      "name": "Charles Dickens",
-      "publicationsConnection": {
-        "totalCount": 2,
-        "edges": [
-          {
-            "properties": {
-              "words": 167543
-            },
-            "node": {
-              "__typename": "Book",
-              "title": "Oliver Twist"
-            }
-          },
-          {
-            "properties": {
-              "words": 3413
-            },
-            "node": {
-              "__typename": "Journal",
-              "subject": "Master Humphrey's Clock"
-            }
-          }
-        ]
-      }
+  "authors" : [ {
+    "name" : "Charles Dickens",
+    "publicationsConnection" : {
+      "totalCount" : 2,
+      "edges" : [ {
+        "properties" : {
+          "words" : 167543
+        },
+        "node" : {
+          "__typename" : "Book",
+          "title" : "Oliver Twist"
+        }
+      }, {
+        "properties" : {
+          "words" : 3413
+        },
+        "node" : {
+          "__typename" : "Journal",
+          "subject" : "Master Humphrey's Clock"
+        }
+      } ]
     }
-  ]
+  } ]
 }
 ----
 
-'''
-
 == With where argument on relationship with relationship in database
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query ($authorName: String, $bookWordCount: Int) {
   authors(where: {name: $authorName}) {
@@ -991,8 +949,8 @@ query ($authorName: String, $bookWordCount: Int) {
 [source,json,request=true]
 ----
 {
-  "authorName": "Charles Dickens",
-  "bookWordCount": 167543
+  "authorName" : "Charles Dickens",
+  "bookWordCount" : 167543
 }
 ----
 
@@ -1000,8 +958,8 @@ query ($authorName: String, $bookWordCount: Int) {
 [source,json]
 ----
 {
-  "param0": "Charles Dickens",
-  "param1": 167543
+  "param0" : "Charles Dickens",
+  "param1" : 167543
 }
 ----
 
@@ -1046,32 +1004,26 @@ RETURN this {
 [source,json,response=true]
 ----
 {
-  "authors": [
-    {
-      "name": "Charles Dickens",
-      "publicationsConnection": {
-        "edges": [
-          {
-            "properties": {
-              "words": 167543
-            },
-            "node": {
-              "title": "Oliver Twist"
-            }
-          }
-        ]
-      }
+  "authors" : [ {
+    "name" : "Charles Dickens",
+    "publicationsConnection" : {
+      "edges" : [ {
+        "properties" : {
+          "words" : 167543
+        },
+        "node" : {
+          "title" : "Oliver Twist"
+        }
+      } ]
     }
-  ]
+  } ]
 }
 ----
 
-'''
-
 == With where argument on all edges with all in database
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query ($authorName: String, $bookWordCount: Int, $journalWordCount: Int) {
   authors(where: {name: $authorName}) {
@@ -1103,9 +1055,9 @@ query ($authorName: String, $bookWordCount: Int, $journalWordCount: Int) {
 [source,json,request=true]
 ----
 {
-  "authorName": "Charles Dickens",
-  "bookWordCount": 167543,
-  "journalWordCount": 3413
+  "authorName" : "Charles Dickens",
+  "bookWordCount" : 167543,
+  "journalWordCount" : 3413
 }
 ----
 
@@ -1113,9 +1065,9 @@ query ($authorName: String, $bookWordCount: Int, $journalWordCount: Int) {
 [source,json]
 ----
 {
-  "param0": "Charles Dickens",
-  "param1": 167543,
-  "param2": 3413
+  "param0" : "Charles Dickens",
+  "param1" : 167543,
+  "param2" : 3413
 }
 ----
 
@@ -1175,43 +1127,36 @@ RETURN this {
 [source,json,response=true,ignore-order]
 ----
 {
-  "authors": [
-    {
-      "name": "Charles Dickens",
-      "publicationsConnection": {
-        "totalCount": 2,
-        "edges": [
-          {
-            "properties": {
-              "words": 167543
-            },
-            "node": {
-              "__typename": "Book",
-              "title": "Oliver Twist"
-            }
-          },
-          {
-            "properties": {
-              "words": 3413
-            },
-            "node": {
-              "__typename": "Journal",
-              "subject": "Master Humphrey's Clock"
-            }
-          }
-        ]
-      }
+  "authors" : [ {
+    "name" : "Charles Dickens",
+    "publicationsConnection" : {
+      "totalCount" : 2,
+      "edges" : [ {
+        "properties" : {
+          "words" : 167543
+        },
+        "node" : {
+          "__typename" : "Book",
+          "title" : "Oliver Twist"
+        }
+      }, {
+        "properties" : {
+          "words" : 3413
+        },
+        "node" : {
+          "__typename" : "Journal",
+          "subject" : "Master Humphrey's Clock"
+        }
+      } ]
     }
-  ]
+  } ]
 }
 ----
 
-'''
-
 == With where argument on relationship and node
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query ($authorName: String, $bookWordCount: Int, $bookTitle: String) {
   authors(where: {name: $authorName}) {
@@ -1238,9 +1183,9 @@ query ($authorName: String, $bookWordCount: Int, $bookTitle: String) {
 [source,json,request=true]
 ----
 {
-  "authorName": "Charles Dickens",
-  "bookWordCount": 167543,
-  "bookTitle": "Oliver Twist"
+  "authorName" : "Charles Dickens",
+  "bookTitle" : "Oliver Twist",
+  "bookWordCount" : 167543
 }
 ----
 
@@ -1248,9 +1193,9 @@ query ($authorName: String, $bookWordCount: Int, $bookTitle: String) {
 [source,json]
 ----
 {
-  "param0": "Charles Dickens",
-  "param1": "Oliver Twist",
-  "param2": 167543
+  "param0" : "Charles Dickens",
+  "param1" : "Oliver Twist",
+  "param2" : 167543
 }
 ----
 
@@ -1296,25 +1241,18 @@ RETURN this {
 [source,json,response=true]
 ----
 {
-  "authors": [
-    {
-      "name": "Charles Dickens",
-      "publicationsConnection": {
-        "edges": [
-          {
-            "properties": {
-              "words": 167543
-            },
-            "node": {
-              "title": "Oliver Twist"
-            }
-          }
-        ]
-      }
+  "authors" : [ {
+    "name" : "Charles Dickens",
+    "publicationsConnection" : {
+      "edges" : [ {
+        "properties" : {
+          "words" : 167543
+        },
+        "node" : {
+          "title" : "Oliver Twist"
+        }
+      } ]
     }
-  ]
+  } ]
 }
 ----
-
-'''
-
diff --git a/core/src/test/resources/integration-test-files/connections/unions.js.adoc b/core/src/test/resources/integration-test-files/connections/unions.js.adoc
new file mode 100644
index 00000000..d016fb4e
--- /dev/null
+++ b/core/src/test/resources/integration-test-files/connections/unions.js.adoc
@@ -0,0 +1,1089 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= Connections -> Unions
+
+== Setup
+
+.Schema
+[source,graphql,schema=true]
+----
+union Publication = Book | Journal
+
+type Author {
+  name: String!
+  publications: [Publication!]! @relationship(type: "WROTE", direction: OUT, properties: "Wrote")
+}
+
+type Book {
+  title: String!
+  author: [Author!]! @relationship(type: "WROTE", direction: IN, properties: "Wrote")
+}
+
+type Journal {
+  subject: String!
+  author: [Author!]! @relationship(type: "WROTE", direction: IN, properties: "Wrote")
+}
+
+type Wrote @relationshipProperties {
+  words: Int!
+}
+----
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (author:Author {name: "Charles Dickens"})
+ CREATE (author)-[:WROTE {words: 167543}]->(:Book {title: "Oliver Twist"})
+ CREATE (author)-[:WROTE {words: 30953}]->(:Book {title: "A Christmas Carol"})
+ CREATE (author)-[:WROTE {words: 3413}]->(:Journal {subject: "Master Humphrey's Clock"})
+----
+
+== Projecting node and relationship properties with no arguments
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+query ($authorName: String) {
+  authors(where: {name: $authorName}) {
+    name
+    publicationsConnection {
+      edges {
+        properties {
+          words
+        }
+        node {
+          ... on Book {
+            title
+          }
+          ... on Journal {
+            subject
+          }
+        }
+      }
+    }
+  }
+}
+----
+
+.GraphQL params input
+[source,json,request=true]
+----
+{
+  "authorName": "Charles Dickens"
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "Charles Dickens"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Author)
+WHERE this.name = $param0
+CALL {
+    WITH this
+    CALL {
+        WITH this
+        MATCH (this)-[this0:WROTE]->(this1:Book)
+        WITH { properties: { words: this0.words, __typename: "Wrote" }, node: { __typename: "Book", __id: toString(id(this1)), title: this1.title } } AS edge
+        RETURN edge
+        UNION
+        WITH this
+        MATCH (this)-[this2:WROTE]->(this3:Journal)
+        WITH { properties: { words: this2.words, __typename: "Wrote" }, node: { __typename: "Journal", __id: toString(id(this3)), subject: this3.subject } } AS edge
+        RETURN edge
+    }
+    WITH collect(edge) AS edges
+    WITH edges, size(edges) AS totalCount
+    RETURN { edges: edges, totalCount: totalCount } AS var4
+}
+RETURN this { .name, publicationsConnection: var4 } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "authors": [
+    {
+      "name": "Charles Dickens",
+      "publicationsConnection": {
+        "edges": [
+          {
+            "properties": {
+              "words": 167543
+            },
+            "node": {
+              "title": "Oliver Twist"
+            }
+          },
+          {
+            "properties": {
+              "words": 30953
+            },
+            "node": {
+              "title": "A Christmas Carol"
+            }
+          },
+          {
+            "properties": {
+              "words": 3413
+            },
+            "node": {
+              "subject": "Master Humphrey's Clock"
+            }
+          }
+        ]
+      }
+    }
+  ]
+}
+----
+
+== Projecting node and relationship properties with sort argument
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+query ($authorName: String) {
+  authors(where: {name: $authorName}) {
+    name
+    publicationsConnection(sort: [{edge: {words: ASC}}]) {
+      edges {
+        properties {
+          words
+        }
+        node {
+          ... on Book {
+            title
+          }
+          ... on Journal {
+            subject
+          }
+        }
+      }
+    }
+  }
+}
+----
+
+.GraphQL params input
+[source,json,request=true]
+----
+{
+  "authorName": "Charles Dickens"
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "Charles Dickens"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Author)
+WHERE this.name = $param0
+CALL {
+    WITH this
+    CALL {
+        WITH this
+        MATCH (this)-[this0:WROTE]->(this1:Book)
+        WITH { properties: { words: this0.words, __typename: "Wrote" }, node: { __typename: "Book", __id: toString(id(this1)), title: this1.title } } AS edge
+        RETURN edge
+        UNION
+        WITH this
+        MATCH (this)-[this2:WROTE]->(this3:Journal)
+        WITH { properties: { words: this2.words, __typename: "Wrote" }, node: { __typename: "Journal", __id: toString(id(this3)), subject: this3.subject } } AS edge
+        RETURN edge
+    }
+    WITH collect(edge) AS edges
+    WITH edges, size(edges) AS totalCount
+    CALL {
+        WITH edges
+        UNWIND edges AS edge
+        WITH edge
+        ORDER BY edge.properties.words ASC
+        RETURN collect(edge) AS var4
+    }
+    RETURN { edges: var4, totalCount: totalCount } AS var5
+}
+RETURN this { .name, publicationsConnection: var5 } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "authors": [
+    {
+      "name": "Charles Dickens",
+      "publicationsConnection": {
+        "edges": [
+          {
+            "properties": {
+              "words": 3413
+            },
+            "node": {
+              "subject": "Master Humphrey's Clock"
+            }
+          },
+          {
+            "properties": {
+              "words": 30953
+            },
+            "node": {
+              "title": "A Christmas Carol"
+            }
+          },
+          {
+            "properties": {
+              "words": 167543
+            },
+            "node": {
+              "title": "Oliver Twist"
+            }
+          }
+        ]
+      }
+    }
+  ]
+}
+----
+
+== Projecting node and relationship properties with pagination
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+query ($authorName: String, $after: String) {
+  authors(where: {name: $authorName}) {
+    name
+    publicationsConnection(first: 2, after: $after, sort: [{edge: {words: ASC}}]) {
+      pageInfo {
+        hasNextPage
+        hasPreviousPage
+        endCursor
+      }
+      edges {
+        properties {
+          words
+        }
+        node {
+          ... on Book {
+            title
+          }
+          ... on Journal {
+            subject
+          }
+        }
+      }
+    }
+  }
+}
+----
+
+.GraphQL params input
+[source,json,request=true]
+----
+{
+  "authorName": "Charles Dickens"
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "Charles Dickens",
+  "param1": 2
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Author)
+WHERE this.name = $param0
+CALL {
+    WITH this
+    CALL {
+        WITH this
+        MATCH (this)-[this0:WROTE]->(this1:Book)
+        WITH { properties: { words: this0.words, __typename: "Wrote" }, node: { __typename: "Book", __id: toString(id(this1)), title: this1.title } } AS edge
+        RETURN edge
+        UNION
+        WITH this
+        MATCH (this)-[this2:WROTE]->(this3:Journal)
+        WITH { properties: { words: this2.words, __typename: "Wrote" }, node: { __typename: "Journal", __id: toString(id(this3)), subject: this3.subject } } AS edge
+        RETURN edge
+    }
+    WITH collect(edge) AS edges
+    WITH edges, size(edges) AS totalCount
+    CALL {
+        WITH edges
+        UNWIND edges AS edge
+        WITH edge
+        ORDER BY edge.properties.words ASC
+        LIMIT $param1
+        RETURN collect(edge) AS var4
+    }
+    RETURN { edges: var4, totalCount: totalCount } AS var5
+}
+RETURN this { .name, publicationsConnection: var5 } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "authors": [
+    {
+      "name": "Charles Dickens",
+      "publicationsConnection": {
+        "pageInfo": {
+          "hasNextPage": true,
+          "hasPreviousPage": false,
+          "endCursor": "YXJyYXljb25uZWN0aW9uOjE="
+        },
+        "edges": [
+          {
+            "properties": {
+              "words": 3413
+            },
+            "node": {
+              "subject": "Master Humphrey's Clock"
+            }
+          },
+          {
+            "properties": {
+              "words": 30953
+            },
+            "node": {
+              "title": "A Christmas Carol"
+            }
+          }
+        ]
+      }
+    }
+  ]
+}
+----
+
+'''
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+query ($authorName: String, $after: String) {
+  authors(where: {name: $authorName}) {
+    name
+    publicationsConnection(first: 2, after: $after, sort: [{edge: {words: ASC}}]) {
+      pageInfo {
+        hasNextPage
+        hasPreviousPage
+        endCursor
+      }
+      edges {
+        properties {
+          words
+        }
+        node {
+          ... on Book {
+            title
+          }
+          ... on Journal {
+            subject
+          }
+        }
+      }
+    }
+  }
+}
+----
+
+.GraphQL params input
+[source,json,request=true]
+----
+{
+  "authorName": "Charles Dickens",
+  "after": "YXJyYXljb25uZWN0aW9uOjE="
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "Charles Dickens",
+  "param1": 2
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Author)
+WHERE this.name = $param0
+CALL {
+    WITH this
+    CALL {
+        WITH this
+        MATCH (this)-[this0:WROTE]->(this1:Book)
+        WITH { properties: { words: this0.words, __typename: "Wrote" }, node: { __typename: "Book", __id: toString(id(this1)), title: this1.title } } AS edge
+        RETURN edge
+        UNION
+        WITH this
+        MATCH (this)-[this2:WROTE]->(this3:Journal)
+        WITH { properties: { words: this2.words, __typename: "Wrote" }, node: { __typename: "Journal", __id: toString(id(this3)), subject: this3.subject } } AS edge
+        RETURN edge
+    }
+    WITH collect(edge) AS edges
+    WITH edges, size(edges) AS totalCount
+    CALL {
+        WITH edges
+        UNWIND edges AS edge
+        WITH edge
+        ORDER BY edge.properties.words ASC
+        LIMIT $param1
+        RETURN collect(edge) AS var4
+    }
+    RETURN { edges: var4, totalCount: totalCount } AS var5
+}
+RETURN this { .name, publicationsConnection: var5 } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "authors": [
+    {
+      "name": "Charles Dickens",
+      "publicationsConnection": {
+        "pageInfo": {
+          "hasNextPage": false,
+          "hasPreviousPage": true,
+          "endCursor": "YXJyYXljb25uZWN0aW9uOjI="
+        },
+        "edges": [
+          {
+            "properties": {
+              "words": 167543
+            },
+            "node": {
+              "title": "Oliver Twist"
+            }
+          }
+        ]
+      }
+    }
+  ]
+}
+----
+
+== Projecting node and relationship properties for one union member with no arguments
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+query ($authorName: String) {
+  authors(where: {name: $authorName}) {
+    name
+    publicationsConnection {
+      edges {
+        properties {
+          words
+        }
+        node {
+          ... on Book {
+            title
+          }
+        }
+      }
+    }
+  }
+}
+----
+
+.GraphQL params input
+[source,json,request=true]
+----
+{
+  "authorName": "Charles Dickens"
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "Charles Dickens"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Author)
+WHERE this.name = $param0
+CALL {
+    WITH this
+    CALL {
+        WITH this
+        MATCH (this)-[this0:WROTE]->(this1:Book)
+        WITH { properties: { words: this0.words, __typename: "Wrote" }, node: { __typename: "Book", __id: toString(id(this1)), title: this1.title } } AS edge
+        RETURN edge
+        UNION
+        WITH this
+        MATCH (this)-[this2:WROTE]->(this3:Journal)
+        WITH { properties: { words: this2.words, __typename: "Wrote" }, node: { __typename: "Journal", __id: toString(id(this3)) } } AS edge
+        RETURN edge
+    }
+    WITH collect(edge) AS edges
+    WITH edges, size(edges) AS totalCount
+    RETURN { edges: edges, totalCount: totalCount } AS var4
+}
+RETURN this { .name, publicationsConnection: var4 } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "authors": [
+    {
+      "name": "Charles Dickens",
+      "publicationsConnection": {
+        "edges": [
+          {
+            "properties": {
+              "words": 167543
+            },
+            "node": {
+              "title": "Oliver Twist"
+            }
+          },
+          {
+            "properties": {
+              "words": 30953
+            },
+            "node": {
+              "title": "A Christmas Carol"
+            }
+          },
+          {
+            "properties": {
+              "words": 3413
+            },
+            "node": {}
+          }
+        ]
+      }
+    }
+  ]
+}
+----
+
+== With where argument on node with node in database
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+query ($authorName: String, $bookTitle: String) {
+  authors(where: {name: $authorName}) {
+    name
+    publicationsConnection(where: {Book: {node: {title: $bookTitle}}}) {
+      edges {
+        properties {
+          words
+        }
+        node {
+          ... on Book {
+            title
+          }
+        }
+      }
+    }
+  }
+}
+----
+
+.GraphQL params input
+[source,json,request=true]
+----
+{
+  "authorName": "Charles Dickens",
+  "bookTitle": "Oliver Twist"
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "Charles Dickens",
+  "param1": "Oliver Twist"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Author)
+WHERE this.name = $param0
+CALL {
+    WITH this
+    CALL {
+        WITH this
+        MATCH (this)-[this0:WROTE]->(this1:Book)
+        WHERE this1.title = $param1
+        WITH { properties: { words: this0.words, __typename: "Wrote" }, node: { __typename: "Book", __id: toString(id(this1)), title: this1.title } } AS edge
+        RETURN edge
+    }
+    WITH collect(edge) AS edges
+    WITH edges, size(edges) AS totalCount
+    RETURN { edges: edges, totalCount: totalCount } AS var2
+}
+RETURN this { .name, publicationsConnection: var2 } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "authors": [
+    {
+      "name": "Charles Dickens",
+      "publicationsConnection": {
+        "edges": [
+          {
+            "properties": {
+              "words": 167543
+            },
+            "node": {
+              "title": "Oliver Twist"
+            }
+          }
+        ]
+      }
+    }
+  ]
+}
+----
+
+== With where argument on all nodes with all in database
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+query ($authorName: String, $bookTitle: String, $journalSubject: String) {
+  authors(where: {name: $authorName}) {
+    name
+    publicationsConnection(
+      where: {Book: {node: {title: $bookTitle}}, Journal: {node: {subject: $journalSubject}}}
+    ) {
+      totalCount
+      edges {
+        properties {
+          words
+        }
+        node {
+          __typename
+          ... on Book {
+            title
+          }
+          ... on Journal {
+            subject
+          }
+        }
+      }
+    }
+  }
+}
+----
+
+.GraphQL params input
+[source,json,request=true]
+----
+{
+  "authorName": "Charles Dickens",
+  "bookTitle": "Oliver Twist",
+  "journalSubject": "Master Humphrey's Clock"
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "Charles Dickens",
+  "param1": "Oliver Twist",
+  "param2": "Master Humphrey's Clock"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Author)
+WHERE this.name = $param0
+CALL {
+    WITH this
+    CALL {
+        WITH this
+        MATCH (this)-[this0:WROTE]->(this1:Book)
+        WHERE this1.title = $param1
+        WITH { properties: { words: this0.words, __typename: "Wrote" }, node: { __typename: "Book", __id: toString(id(this1)), title: this1.title } } AS edge
+        RETURN edge
+        UNION
+        WITH this
+        MATCH (this)-[this2:WROTE]->(this3:Journal)
+        WHERE this3.subject = $param2
+        WITH { properties: { words: this2.words, __typename: "Wrote" }, node: { __typename: "Journal", __id: toString(id(this3)), subject: this3.subject } } AS edge
+        RETURN edge
+    }
+    WITH collect(edge) AS edges
+    WITH edges, size(edges) AS totalCount
+    RETURN { edges: edges, totalCount: totalCount } AS var4
+}
+RETURN this { .name, publicationsConnection: var4 } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "authors": [
+    {
+      "name": "Charles Dickens",
+      "publicationsConnection": {
+        "totalCount": 2,
+        "edges": [
+          {
+            "properties": {
+              "words": 167543
+            },
+            "node": {
+              "__typename": "Book",
+              "title": "Oliver Twist"
+            }
+          },
+          {
+            "properties": {
+              "words": 3413
+            },
+            "node": {
+              "__typename": "Journal",
+              "subject": "Master Humphrey's Clock"
+            }
+          }
+        ]
+      }
+    }
+  ]
+}
+----
+
+== With where argument on relationship with relationship in database
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+query ($authorName: String, $bookWordCount: Int) {
+  authors(where: {name: $authorName}) {
+    name
+    publicationsConnection(where: {Book: {edge: {words: $bookWordCount}}}) {
+      edges {
+        properties {
+          words
+        }
+        node {
+          ... on Book {
+            title
+          }
+        }
+      }
+    }
+  }
+}
+----
+
+.GraphQL params input
+[source,json,request=true]
+----
+{
+  "authorName": "Charles Dickens",
+  "bookWordCount": 167543
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "Charles Dickens",
+  "param1": 167543
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Author)
+WHERE this.name = $param0
+CALL {
+    WITH this
+    CALL {
+        WITH this
+        MATCH (this)-[this0:WROTE]->(this1:Book)
+        WHERE this0.words = $param1
+        WITH { properties: { words: this0.words, __typename: "Wrote" }, node: { __typename: "Book", __id: toString(id(this1)), title: this1.title } } AS edge
+        RETURN edge
+    }
+    WITH collect(edge) AS edges
+    WITH edges, size(edges) AS totalCount
+    RETURN { edges: edges, totalCount: totalCount } AS var2
+}
+RETURN this { .name, publicationsConnection: var2 } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "authors": [
+    {
+      "name": "Charles Dickens",
+      "publicationsConnection": {
+        "edges": [
+          {
+            "properties": {
+              "words": 167543
+            },
+            "node": {
+              "title": "Oliver Twist"
+            }
+          }
+        ]
+      }
+    }
+  ]
+}
+----
+
+== With where argument on all edges with all in database
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+query ($authorName: String, $bookWordCount: Int, $journalWordCount: Int) {
+  authors(where: {name: $authorName}) {
+    name
+    publicationsConnection(
+      where: {Book: {edge: {words: $bookWordCount}}, Journal: {edge: {words: $journalWordCount}}}
+    ) {
+      totalCount
+      edges {
+        properties {
+          words
+        }
+        node {
+          __typename
+          ... on Book {
+            title
+          }
+          ... on Journal {
+            subject
+          }
+        }
+      }
+    }
+  }
+}
+----
+
+.GraphQL params input
+[source,json,request=true]
+----
+{
+  "authorName": "Charles Dickens",
+  "bookWordCount": 167543,
+  "journalWordCount": 3413
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "Charles Dickens",
+  "param1": 167543,
+  "param2": 3413
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Author)
+WHERE this.name = $param0
+CALL {
+    WITH this
+    CALL {
+        WITH this
+        MATCH (this)-[this0:WROTE]->(this1:Book)
+        WHERE this0.words = $param1
+        WITH { properties: { words: this0.words, __typename: "Wrote" }, node: { __typename: "Book", __id: toString(id(this1)), title: this1.title } } AS edge
+        RETURN edge
+        UNION
+        WITH this
+        MATCH (this)-[this2:WROTE]->(this3:Journal)
+        WHERE this2.words = $param2
+        WITH { properties: { words: this2.words, __typename: "Wrote" }, node: { __typename: "Journal", __id: toString(id(this3)), subject: this3.subject } } AS edge
+        RETURN edge
+    }
+    WITH collect(edge) AS edges
+    WITH edges, size(edges) AS totalCount
+    RETURN { edges: edges, totalCount: totalCount } AS var4
+}
+RETURN this { .name, publicationsConnection: var4 } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "authors": [
+    {
+      "name": "Charles Dickens",
+      "publicationsConnection": {
+        "totalCount": 2,
+        "edges": [
+          {
+            "properties": {
+              "words": 167543
+            },
+            "node": {
+              "__typename": "Book",
+              "title": "Oliver Twist"
+            }
+          },
+          {
+            "properties": {
+              "words": 3413
+            },
+            "node": {
+              "__typename": "Journal",
+              "subject": "Master Humphrey's Clock"
+            }
+          }
+        ]
+      }
+    }
+  ]
+}
+----
+
+== With where argument on relationship and node
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+query ($authorName: String, $bookWordCount: Int, $bookTitle: String) {
+  authors(where: {name: $authorName}) {
+    name
+    publicationsConnection(
+      where: {Book: {edge: {words: $bookWordCount}, node: {title: $bookTitle}}}
+    ) {
+      edges {
+        properties {
+          words
+        }
+        node {
+          ... on Book {
+            title
+          }
+        }
+      }
+    }
+  }
+}
+----
+
+.GraphQL params input
+[source,json,request=true]
+----
+{
+  "authorName": "Charles Dickens",
+  "bookWordCount": 167543,
+  "bookTitle": "Oliver Twist"
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "Charles Dickens",
+  "param1": "Oliver Twist",
+  "param2": 167543
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Author)
+WHERE this.name = $param0
+CALL {
+    WITH this
+    CALL {
+        WITH this
+        MATCH (this)-[this0:WROTE]->(this1:Book)
+        WHERE (this1.title = $param1 AND this0.words = $param2)
+        WITH { properties: { words: this0.words, __typename: "Wrote" }, node: { __typename: "Book", __id: toString(id(this1)), title: this1.title } } AS edge
+        RETURN edge
+    }
+    WITH collect(edge) AS edges
+    WITH edges, size(edges) AS totalCount
+    RETURN { edges: edges, totalCount: totalCount } AS var2
+}
+RETURN this { .name, publicationsConnection: var2 } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "authors": [
+    {
+      "name": "Charles Dickens",
+      "publicationsConnection": {
+        "edges": [
+          {
+            "properties": {
+              "words": 167543
+            },
+            "node": {
+              "title": "Oliver Twist"
+            }
+          }
+        ]
+      }
+    }
+  ]
+}
+----
diff --git a/core/src/test/resources/integration-test-files/custom-resolvers.adoc b/core/src/test/resources/integration-test-files/custom-resolvers.adoc
index a5c2ad64..bd0966d1 100644
--- a/core/src/test/resources/integration-test-files/custom-resolvers.adoc
+++ b/core/src/test/resources/integration-test-files/custom-resolvers.adoc
@@ -19,7 +19,7 @@ type Query {
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   id
@@ -30,12 +30,10 @@ type Query {
 [source,json,response=true]
 ----
 {
-  "id": "RandomString1"
+  "id" : "RandomString1"
 }
 ----
 
-'''
-
 == should define a custom Mutation resolver and resolve it
 
 .Schema
@@ -52,7 +50,7 @@ type Mutation {
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 mutation {
   id
@@ -63,109 +61,6 @@ mutation {
 [source,json,response=true]
 ----
 {
-  "id": "RandomString1"
-}
-----
-
-'''
-
-== should define a custom Subscription resolver and resolve it
-
-.Schema
-[source,graphql,schema=true]
-----
-type Movie {
-  id: ID
-  custom: String
-}
-
-type Subscription {
-  id: ID!
-}
-----
-
-.Augmented Schema
-[source,graphql]
-----
-schema {
-  query: Query
-  subscription: Subscription
-}
-
-type Movie {
-  custom: String
-  id: ID
-}
-
-type MovieEdge {
-  cursor: String!
-  node: Movie!
-}
-
-input MovieOptions {
-  limit: Int
-  offset: Int
-  """
-  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
-  """
-  sort: [MovieSort!]
-}
-
-"""
-Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
-"""
-input MovieSort {
-  custom: SortDirection
-  id: SortDirection
-}
-
-input MovieWhere {
-  AND: [MovieWhere!]
-  NOT: MovieWhere
-  OR: [MovieWhere!]
-  custom: String
-  custom_CONTAINS: String
-  custom_ENDS_WITH: String
-  custom_IN: [String]
-  custom_STARTS_WITH: String
-  id: ID
-  id_CONTAINS: ID
-  id_ENDS_WITH: ID
-  id_IN: [ID]
-  id_STARTS_WITH: ID
-}
-
-type MoviesConnection {
-  edges: [MovieEdge!]!
-  pageInfo: PageInfo!
-  totalCount: Int!
-}
-
-"""Pagination information (Relay)"""
-type PageInfo {
-  endCursor: String
-  hasNextPage: Boolean!
-  hasPreviousPage: Boolean!
-  startCursor: String
-}
-
-type Query {
-  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
-  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
-}
-
-"""An enum for sorting in either ascending or descending order."""
-enum SortDirection {
-  """Sort by field values in ascending order."""
-  ASC
-  """Sort by field values in descending order."""
-  DESC
-}
-
-type Subscription {
-  id: ID!
+  "id" : "RandomString1"
 }
 ----
-
-'''
-
diff --git a/core/src/test/resources/integration-test-files/custom-resolvers.js.adoc b/core/src/test/resources/integration-test-files/custom-resolvers.js.adoc
new file mode 100644
index 00000000..acd40d4a
--- /dev/null
+++ b/core/src/test/resources/integration-test-files/custom-resolvers.js.adoc
@@ -0,0 +1,67 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= Custom Resolvers
+
+== should define a custom Query resolver and resolve it
+
+.Schema
+[source,graphql,schema=true]
+----
+type Movie {
+  id: ID
+  custom: String
+}
+
+type Query {
+  id: ID
+}
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  id
+}
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "id": "RandomString1"
+}
+----
+
+== should define a custom Mutation resolver and resolve it
+
+.Schema
+[source,graphql,schema=true]
+----
+type Movie {
+  id: ID
+  custom: String
+}
+
+type Mutation {
+  id: ID
+}
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+mutation {
+  id
+}
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "id": "RandomString1"
+}
+----
diff --git a/core/src/test/resources/integration-test-files/custom-scalar-filtering.adoc b/core/src/test/resources/integration-test-files/custom-scalar-filtering.adoc
index 5da1be06..00b83496 100644
--- a/core/src/test/resources/integration-test-files/custom-scalar-filtering.adoc
+++ b/core/src/test/resources/integration-test-files/custom-scalar-filtering.adoc
@@ -26,7 +26,7 @@ CREATE (:Movie {property: "someValue"})
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies(where: {property_IN: ["someValue", "foo", "bar"]}) {
@@ -39,11 +39,7 @@ CREATE (:Movie {property: "someValue"})
 [source,json]
 ----
 {
-  "param0": [
-    "someValue",
-    "foo",
-    "bar"
-  ]
+  "param0" : [ "someValue", "foo", "bar" ]
 }
 ----
 
@@ -61,16 +57,12 @@ RETURN this {
 [source,json,response=true]
 ----
 {
-  "movies": [
-    {
-      "property": "someValue"
-    }
-  ]
+  "movies" : [ {
+    "property" : "someValue"
+  } ]
 }
 ----
 
-'''
-
 === Filter IN CustomScalar - expect array of return values
 
 .Test Data
@@ -82,7 +74,7 @@ CREATE (:Movie {property: "someValue"})
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies(where: {property_IN: ["someValue", "someOtherValue"]}) {
@@ -95,10 +87,7 @@ CREATE (:Movie {property: "someValue"})
 [source,json]
 ----
 {
-  "param0": [
-    "someValue",
-    "someOtherValue"
-  ]
+  "param0" : [ "someValue", "someOtherValue" ]
 }
 ----
 
@@ -116,19 +105,14 @@ RETURN this {
 [source,json,response=true,ignore-order]
 ----
 {
-  "movies": [
-    {
-      "property": "someValue"
-    },
-    {
-      "property": "someOtherValue"
-    }
-  ]
+  "movies" : [ {
+    "property" : "someValue"
+  }, {
+    "property" : "someOtherValue"
+  } ]
 }
 ----
 
-'''
-
 === Filter IN CustomScalar - expect no return values
 
 .Test Data
@@ -138,7 +122,7 @@ CREATE (:Movie {property: "someValue"})
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies(where: {property_IN: ["someUnknownValue"]}) {
@@ -151,9 +135,7 @@ CREATE (:Movie {property: "someValue"})
 [source,json]
 ----
 {
-  "param0": [
-    "someUnknownValue"
-  ]
+  "param0" : [ "someUnknownValue" ]
 }
 ----
 
@@ -171,12 +153,10 @@ RETURN this {
 [source,json,response=true]
 ----
 {
-  "movies": []
+  "movies" : [ ]
 }
 ----
 
-'''
-
 == List Custom Scalar Filtering
 
 === Setup
@@ -201,7 +181,7 @@ CREATE (:Movie {property: ["val1", "val2", "val3"]})
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies(where: {property_INCLUDES: val1}) {
@@ -214,7 +194,7 @@ CREATE (:Movie {property: ["val1", "val2", "val3"]})
 [source,json]
 ----
 {
-  "param0": "val1"
+  "param0" : "val1"
 }
 ----
 
@@ -232,20 +212,12 @@ RETURN this {
 [source,json,response=true,ignore-order]
 ----
 {
-  "movies": [
-    {
-      "property": [
-        "val1",
-        "val2",
-        "val3"
-      ]
-    }
-  ]
+  "movies" : [ {
+    "property" : [ "val1", "val2", "val3" ]
+  } ]
 }
 ----
 
-'''
-
 === Filter INCLUDES CustomListScalar - expect array of return values
 
 .Test Data
@@ -257,7 +229,7 @@ CREATE (:Movie {property: ["val1", "val2", "val3"]})
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies(where: {property_INCLUDES: val1}) {
@@ -270,7 +242,7 @@ CREATE (:Movie {property: ["val1", "val2", "val3"]})
 [source,json]
 ----
 {
-  "param0": "val1"
+  "param0" : "val1"
 }
 ----
 
@@ -288,25 +260,14 @@ RETURN this {
 [source,json,response=true,ignore-order]
 ----
 {
-  "movies": [
-    {
-      "property": [
-        "val1",
-        "val2",
-        "val3"
-      ]
-    },
-    {
-      "property": [
-        "val1"
-      ]
-    }
-  ]
+  "movies" : [ {
+    "property" : [ "val1", "val2", "val3" ]
+  }, {
+    "property" : [ "val1" ]
+  } ]
 }
 ----
 
-'''
-
 === Filter INCLUDES CustomListScalar - expect no return values
 
 .Test Data
@@ -316,7 +277,7 @@ CREATE (:Movie {property: ["val1", "val2", "val3"]})
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies(where: {property_INCLUDES: f}) {
@@ -329,7 +290,7 @@ CREATE (:Movie {property: ["val1", "val2", "val3"]})
 [source,json]
 ----
 {
-  "param0": "f"
+  "param0" : "f"
 }
 ----
 
@@ -347,9 +308,6 @@ RETURN this {
 [source,json,response=true]
 ----
 {
-  "movies": []
+  "movies" : [ ]
 }
 ----
-
-'''
-
diff --git a/core/src/test/resources/integration-test-files/custom-scalar-filtering.js.adoc b/core/src/test/resources/integration-test-files/custom-scalar-filtering.js.adoc
new file mode 100644
index 00000000..ef3a0430
--- /dev/null
+++ b/core/src/test/resources/integration-test-files/custom-scalar-filtering.js.adoc
@@ -0,0 +1,331 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= Custom Scalar Filtering
+
+== Single Value Custom Scalar
+
+=== Setup
+
+.Schema
+[source,graphql,schema=true]
+----
+scalar CustomScalar
+
+type Movie {
+  property: CustomScalar
+}
+----
+
+=== Filter IN CustomScalar - expect return value
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (:Movie {property: "someValue"})
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies(where: {property_IN: ["someValue", "foo", "bar"]}) {
+    property
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": [
+    "someValue",
+    "foo",
+    "bar"
+  ]
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE this.property IN $param0
+RETURN this { .property } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "movies": [
+    {
+      "property": "someValue"
+    }
+  ]
+}
+----
+
+=== Filter IN CustomScalar - expect array of return values
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (:Movie {property: "someValue"})
+ CREATE (:Movie {property: "someOtherValue"})
+ CREATE (:Movie {property: "foo"})
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies(where: {property_IN: ["someValue", "someOtherValue"]}) {
+    property
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": [
+    "someValue",
+    "someOtherValue"
+  ]
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE this.property IN $param0
+RETURN this { .property } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "movies": [
+    {
+      "property": "someOtherValue"
+    },
+    {
+      "property": "someValue"
+    }
+  ]
+}
+----
+
+=== Filter IN CustomScalar - expect no return values
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (:Movie {property: "someValue"})
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies(where: {property_IN: ["someUnknownValue"]}) {
+    property
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": [
+    "someUnknownValue"
+  ]
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE this.property IN $param0
+RETURN this { .property } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "movies": []
+}
+----
+
+== List Custom Scalar Filtering
+
+=== Setup
+
+.Schema
+[source,graphql,schema=true]
+----
+scalar CustomListScalar
+
+type Movie {
+  property: [CustomListScalar!]
+}
+----
+
+=== Filter INCLUDES CustomListScalar - expect return value
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (:Movie {property: ["val1", "val2", "val3"]})
+ CREATE (:Movie {property: ["foo", "bar"]})
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies(where: {property_INCLUDES: val1}) {
+    property
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "val1"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE $param0 IN this.property
+RETURN this { .property } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "movies": [
+    {
+      "property": [
+        "val1",
+        "val2",
+        "val3"
+      ]
+    }
+  ]
+}
+----
+
+=== Filter INCLUDES CustomListScalar - expect array of return values
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (:Movie {property: ["val1", "val2", "val3"]})
+ CREATE (:Movie {property: ["val1"]})
+ CREATE (:Movie {property: ["foo", "bar"]})
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies(where: {property_INCLUDES: val1}) {
+    property
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "val1"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE $param0 IN this.property
+RETURN this { .property } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "movies": [
+    {
+      "property": [
+        "val1",
+        "val2",
+        "val3"
+      ]
+    },
+    {
+      "property": [
+        "val1"
+      ]
+    }
+  ]
+}
+----
+
+=== Filter INCLUDES CustomListScalar - expect no return values
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (:Movie {property: ["val1", "val2", "val3"]})
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies(where: {property_INCLUDES: f}) {
+    property
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "f"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE $param0 IN this.property
+RETURN this { .property } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "movies": []
+}
+----
diff --git a/core/src/test/resources/integration-test-files/directives/authorization/custom-resolvers.adoc b/core/src/test/resources/integration-test-files/directives/authorization/custom-resolvers.adoc
index cb05343e..e44d8dff 100644
--- a/core/src/test/resources/integration-test-files/directives/authorization/custom-resolvers.adoc
+++ b/core/src/test/resources/integration-test-files/directives/authorization/custom-resolvers.adoc
@@ -20,7 +20,7 @@ type Query {
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   me {
@@ -33,14 +33,12 @@ type Query {
 [source,json,response=true]
 ----
 {
-  "me": {
-    "id": "RandomString1"
+  "me" : {
+    "id" : "RandomString1"
   }
 }
 ----
 
-'''
-
 === should inject auth in context of custom Mutation
 
 .Schema
@@ -56,7 +54,7 @@ type Mutation {
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 mutation {
   me {
@@ -69,14 +67,12 @@ mutation {
 [source,json,response=true]
 ----
 {
-  "me": {
-    "id": "RandomString1"
+  "me" : {
+    "id" : "RandomString1"
   }
 }
 ----
 
-'''
-
 === should inject auth in context of custom Field resolver
 
 .Schema
@@ -92,7 +88,7 @@ type Query {
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   me {
@@ -105,14 +101,12 @@ type Query {
 [source,json,response=true]
 ----
 {
-  "me": {
-    "customId": "RandomString1"
+  "me" : {
+    "customId" : "RandomString1"
   }
 }
 ----
 
-'''
-
 === should inject auth in context of custom Query when decoded JWT passed in
 
 .Schema
@@ -128,7 +122,7 @@ type Query {
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   me {
@@ -141,11 +135,8 @@ type Query {
 [source,json,response=true]
 ----
 {
-  "me": {
-    "id": "RandomString1"
+  "me" : {
+    "id" : "RandomString1"
   }
 }
 ----
-
-'''
-
diff --git a/core/src/test/resources/integration-test-files/directives/authorization/custom-resolvers.js.adoc b/core/src/test/resources/integration-test-files/directives/authorization/custom-resolvers.js.adoc
new file mode 100644
index 00000000..49da1ef0
--- /dev/null
+++ b/core/src/test/resources/integration-test-files/directives/authorization/custom-resolvers.js.adoc
@@ -0,0 +1,143 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= auth/custom-resolvers
+
+== auth-injection
+
+=== should inject auth in context of custom Query
+
+.Schema
+[source,graphql,schema=true]
+----
+type User {
+  id: ID
+}
+
+type Query {
+  me: User
+}
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  me {
+    id
+  }
+}
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "me": {
+    "id": "RandomString1"
+  }
+}
+----
+
+=== should inject auth in context of custom Mutation
+
+.Schema
+[source,graphql,schema=true]
+----
+type User {
+  id: ID
+}
+
+type Mutation {
+  me: User
+}
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+mutation {
+  me {
+    id
+  }
+}
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "me": {
+    "id": "RandomString1"
+  }
+}
+----
+
+=== should inject auth in context of custom Field resolver
+
+.Schema
+[source,graphql,schema=true]
+----
+type User {
+  customId: ID
+}
+
+type Query {
+  me: User
+}
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  me {
+    customId
+  }
+}
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "me": {
+    "customId": "RandomString1"
+  }
+}
+----
+
+=== should inject auth in context of custom Query when decoded JWT passed in
+
+.Schema
+[source,graphql,schema=true]
+----
+type User {
+  id: ID
+}
+
+type Query {
+  me: User
+}
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  me {
+    id
+  }
+}
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "me": {
+    "id": "RandomString1"
+  }
+}
+----
diff --git a/core/src/test/resources/integration-test-files/directives/coalesce.adoc b/core/src/test/resources/integration-test-files/directives/coalesce.adoc
index 9600a1d4..cbdd24bb 100644
--- a/core/src/test/resources/integration-test-files/directives/coalesce.adoc
+++ b/core/src/test/resources/integration-test-files/directives/coalesce.adoc
@@ -21,7 +21,7 @@ CREATE (:Movie {id: "RandomString1"})
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies(where: {classification: "Unrated"}) {
@@ -35,7 +35,7 @@ CREATE (:Movie {id: "RandomString1"})
 [source,json]
 ----
 {
-  "param0": "Unrated"
+  "param0" : "Unrated"
 }
 ----
 
@@ -54,17 +54,13 @@ RETURN this {
 [source,json,response=true]
 ----
 {
-  "movies": [
-    {
-      "id": "RandomString1",
-      "classification": null
-    }
-  ]
+  "movies" : [ {
+    "id" : "RandomString1",
+    "classification" : null
+  } ]
 }
 ----
 
-'''
-
 == with enum values
 
 .Schema
@@ -88,7 +84,7 @@ CREATE (:Movie {id: "RandomString1"})
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies(where: {status: ACTIVE}) {
@@ -102,7 +98,7 @@ CREATE (:Movie {id: "RandomString1"})
 [source,json]
 ----
 {
-  "param0": "ACTIVE"
+  "param0" : "ACTIVE"
 }
 ----
 
@@ -121,17 +117,13 @@ RETURN this {
 [source,json,response=true]
 ----
 {
-  "movies": [
-    {
-      "id": "RandomString1",
-      "status": null
-    }
-  ]
+  "movies" : [ {
+    "id" : "RandomString1",
+    "status" : null
+  } ]
 }
 ----
 
-'''
-
 == with enum list values
 
 .Schema
@@ -155,7 +147,7 @@ CREATE (:Movie {id: "RandomString1"})
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies(where: {statuses: [ACTIVE, INACTIVE]}) {
@@ -169,10 +161,7 @@ CREATE (:Movie {id: "RandomString1"})
 [source,json]
 ----
 {
-  "param0": [
-    "ACTIVE",
-    "INACTIVE"
-  ]
+  "param0" : [ "ACTIVE", "INACTIVE" ]
 }
 ----
 
@@ -191,14 +180,9 @@ RETURN this {
 [source,json,response=true]
 ----
 {
-  "movies": [
-    {
-      "id": "RandomString1",
-      "statuses": null
-    }
-  ]
+  "movies" : [ {
+    "id" : "RandomString1",
+    "statuses" : null
+  } ]
 }
 ----
-
-'''
-
diff --git a/core/src/test/resources/integration-test-files/directives/coalesce.js.adoc b/core/src/test/resources/integration-test-files/directives/coalesce.js.adoc
new file mode 100644
index 00000000..3fda70e4
--- /dev/null
+++ b/core/src/test/resources/integration-test-files/directives/coalesce.js.adoc
@@ -0,0 +1,189 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= @coalesce directive
+
+== allows querying with null properties without affecting the returned result
+
+.Schema
+[source,graphql,schema=true]
+----
+type Movie {
+  id: ID!
+  classification: String @coalesce(value: "Unrated")
+}
+----
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (:Movie {id: "RandomString1"})
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies(where: {classification: "Unrated"}) {
+    id
+    classification
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "Unrated"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE coalesce(this.classification, "Unrated") = $param0
+RETURN this { .id, .classification } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "movies": [
+    {
+      "id": "RandomString1",
+      "classification": null
+    }
+  ]
+}
+----
+
+== with enum values
+
+.Schema
+[source,graphql,schema=true]
+----
+enum Status {
+  ACTIVE
+  INACTIVE
+}
+
+type Movie {
+  id: ID
+  status: Status @coalesce(value: ACTIVE)
+}
+----
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (:Movie {id: "RandomString1"})
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies(where: {status: ACTIVE}) {
+    id
+    status
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "ACTIVE"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE coalesce(this.status, "ACTIVE") = $param0
+RETURN this { .id, .status } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "movies": [
+    {
+      "id": "RandomString1",
+      "status": null
+    }
+  ]
+}
+----
+
+== with enum list values
+
+.Schema
+[source,graphql,schema=true]
+----
+enum Status {
+  ACTIVE
+  INACTIVE
+}
+
+type Movie {
+  id: ID
+  statuses: [Status!] @coalesce(value: [ACTIVE, INACTIVE])
+}
+----
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (:Movie {id: "RandomString1"})
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies(where: {statuses: [ACTIVE, INACTIVE]}) {
+    id
+    statuses
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": [
+    "ACTIVE",
+    "INACTIVE"
+  ]
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE coalesce(this.statuses, ["ACTIVE", "INACTIVE"]) = $param0
+RETURN this { .id, .statuses } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "movies": [
+    {
+      "id": "RandomString1",
+      "statuses": null
+    }
+  ]
+}
+----
diff --git a/core/src/test/resources/integration-test-files/directives/customResolver.adoc b/core/src/test/resources/integration-test-files/directives/customResolver.adoc
index da1e8c48..5ace268b 100644
--- a/core/src/test/resources/integration-test-files/directives/customResolver.adoc
+++ b/core/src/test/resources/integration-test-files/directives/customResolver.adoc
@@ -33,7 +33,7 @@ include::../../../kotlin/org/neo4j/graphql/custom_resolver/ScalarFieldCustomReso
 ==== removes a field from all but its object type, and resolves with a custom resolver
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query User($userId: ID!) {
   users(where: {id: $userId}) {
@@ -49,7 +49,7 @@ query User($userId: ID!) {
 [source,json,request=true]
 ----
 {
-  "userId": "An-ID"
+  "userId" : "An-ID"
 }
 ----
 
@@ -57,7 +57,7 @@ query User($userId: ID!) {
 [source,json]
 ----
 {
-  "param0": "An-ID"
+  "param0" : "An-ID"
 }
 ----
 
@@ -77,23 +77,19 @@ RETURN this {
 [source,json,response=true]
 ----
 {
-  "users": [
-    {
-      "id": "An-ID",
-      "firstName": "someFirstName",
-      "lastName": "a second name!",
-      "fullName": "someFirstName a second name!"
-    }
-  ]
+  "users" : [ {
+    "id" : "An-ID",
+    "firstName" : "someFirstName",
+    "lastName" : "a second name!",
+    "fullName" : "someFirstName a second name!"
+  } ]
 }
 ----
 
-'''
-
 ==== resolves field with custom resolver without required fields in selection set
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query User($userId: ID!) {
   users(where: {id: $userId}) {
@@ -107,7 +103,7 @@ query User($userId: ID!) {
 [source,json,request=true]
 ----
 {
-  "userId": "An-ID"
+  "userId" : "An-ID"
 }
 ----
 
@@ -115,7 +111,7 @@ query User($userId: ID!) {
 [source,json]
 ----
 {
-  "param0": "An-ID"
+  "param0" : "An-ID"
 }
 ----
 
@@ -135,21 +131,17 @@ RETURN this {
 [source,json,response=true]
 ----
 {
-  "users": [
-    {
-      "id": "An-ID",
-      "fullName": "someFirstName a second name!"
-    }
-  ]
+  "users" : [ {
+    "id" : "An-ID",
+    "fullName" : "someFirstName a second name!"
+  } ]
 }
 ----
 
-'''
-
 ==== resolves field with custom resolver with required field(s) aliased in selection set
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query User($userId: ID!) {
   users(where: {id: $userId}) {
@@ -164,7 +156,7 @@ query User($userId: ID!) {
 [source,json,request=true]
 ----
 {
-  "userId": "An-ID"
+  "userId" : "An-ID"
 }
 ----
 
@@ -172,7 +164,7 @@ query User($userId: ID!) {
 [source,json]
 ----
 {
-  "param0": "An-ID"
+  "param0" : "An-ID"
 }
 ----
 
@@ -193,121 +185,14 @@ RETURN this {
 [source,json,response=true]
 ----
 {
-  "users": [
-    {
-      "id": "An-ID",
-      "f": "someFirstName",
-      "fullName": "someFirstName a second name!"
-    }
-  ]
-}
-----
-
-'''
-
-=== Custom resolver checks
-
-==== Check throws error if customResolver is not provided
-
-.Schema
-[source,graphql,schema=true]
-----
-type User {
-  id: ID!
-  firstName: String!
-  lastName: String!
-  fullName: String @customResolver(requires: "firstName lastName")
-}
-----
-
-.Augmented Schema
-[source,graphql]
-----
-schema {
-  query: Query
-}
-
-"""Pagination information (Relay)"""
-type PageInfo {
-  endCursor: String
-  hasNextPage: Boolean!
-  hasPreviousPage: Boolean!
-  startCursor: String
-}
-
-type Query {
-  users(options: UserOptions, where: UserWhere): [User!]!
-  usersConnection(after: String, first: Int, sort: [UserSort], where: UserWhere): UsersConnection!
-}
-
-"""An enum for sorting in either ascending or descending order."""
-enum SortDirection {
-  """Sort by field values in ascending order."""
-  ASC
-  """Sort by field values in descending order."""
-  DESC
-}
-
-type User {
-  firstName: String!
-  fullName: String
-  id: ID!
-  lastName: String!
-}
-
-type UserEdge {
-  cursor: String!
-  node: User!
-}
-
-input UserOptions {
-  limit: Int
-  offset: Int
-  """
-  Specify one or more UserSort objects to sort Users by. The sorts will be applied in the order in which they are arranged in the array.
-  """
-  sort: [UserSort!]
-}
-
-"""
-Fields to sort Users by. The order in which sorts are applied is not guaranteed when specifying many fields in one UserSort object.
-"""
-input UserSort {
-  firstName: SortDirection
-  id: SortDirection
-  lastName: SortDirection
-}
-
-input UserWhere {
-  AND: [UserWhere!]
-  NOT: UserWhere
-  OR: [UserWhere!]
-  firstName: String
-  firstName_CONTAINS: String
-  firstName_ENDS_WITH: String
-  firstName_IN: [String!]
-  firstName_STARTS_WITH: String
-  id: ID
-  id_CONTAINS: ID
-  id_ENDS_WITH: ID
-  id_IN: [ID!]
-  id_STARTS_WITH: ID
-  lastName: String
-  lastName_CONTAINS: String
-  lastName_ENDS_WITH: String
-  lastName_IN: [String!]
-  lastName_STARTS_WITH: String
-}
-
-type UsersConnection {
-  edges: [UserEdge!]!
-  pageInfo: PageInfo!
-  totalCount: Int!
+  "users" : [ {
+    "id" : "An-ID",
+    "f" : "someFirstName",
+    "fullName" : "someFirstName a second name!"
+  } ]
 }
 ----
 
-'''
-
 == Related Fields
 
 === should be able to require a field from a related type
@@ -342,7 +227,7 @@ include::../../../kotlin/org/neo4j/graphql/custom_resolver/ComplexFieldCustomRes
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query User {
   users {
@@ -354,7 +239,7 @@ query User {
 .Expected Cypher params
 [source,json]
 ----
-{}
+{ }
 ----
 
 .Expected Cypher output
@@ -380,16 +265,12 @@ RETURN this {
 [source,json,response=true]
 ----
 {
-  "users": [
-    {
-      "fullName": "First Last from some city"
-    }
-  ]
+  "users" : [ {
+    "fullName" : "First Last from some city"
+  } ]
 }
 ----
 
-'''
-
 === should fetch required fields when other fields are also selected
 
 .Schema
@@ -422,7 +303,7 @@ include::../../../kotlin/org/neo4j/graphql/custom_resolver/ComplexFieldCustomRes
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query User {
   users {
@@ -439,7 +320,7 @@ query User {
 .Expected Cypher params
 [source,json]
 ----
-{}
+{ }
 ----
 
 .Expected Cypher output
@@ -467,21 +348,17 @@ RETURN this {
 [source,json,response=true]
 ----
 {
-  "users": [
-    {
-      "id": "1",
-      "fullName": "First Last from some city",
-      "address": {
-        "street": "some street",
-        "city": "some city"
-      }
+  "users" : [ {
+    "id" : "1",
+    "fullName" : "First Last from some city",
+    "address" : {
+      "street" : "some street",
+      "city" : "some city"
     }
-  ]
+  } ]
 }
 ----
 
-'''
-
 === should fetch customResolver fields over multiple users
 
 .Schema
@@ -515,7 +392,7 @@ include::../../../kotlin/org/neo4j/graphql/custom_resolver/ComplexFieldCustomRes
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query User {
   users {
@@ -532,7 +409,7 @@ query User {
 .Expected Cypher params
 [source,json]
 ----
-{}
+{ }
 ----
 
 .Expected Cypher output
@@ -560,29 +437,24 @@ RETURN this {
 [source,json,response=true,ignore-order]
 ----
 {
-  "users": [
-    {
-      "id": "1",
-      "fullName": "First Last from some city",
-      "address": {
-        "street": "some street",
-        "city": "some city"
-      }
-    },
-    {
-      "id": "2",
-      "fullName": "New First new-last from another-city",
-      "address": {
-        "street": "another-street",
-        "city": "another-city"
-      }
+  "users" : [ {
+    "id" : "1",
+    "fullName" : "First Last from some city",
+    "address" : {
+      "street" : "some street",
+      "city" : "some city"
+    }
+  }, {
+    "id" : "2",
+    "fullName" : "New First new-last from another-city",
+    "address" : {
+      "street" : "another-street",
+      "city" : "another-city"
     }
-  ]
+  } ]
 }
 ----
 
-'''
-
 === should select related fields when not selected last
 
 .Schema
@@ -616,7 +488,7 @@ CREATE (user1:User)-[:LIVES_AT]->(addr1:Address) SET user1 = {id: "1", firstName
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query User {
   users {
@@ -633,7 +505,7 @@ query User {
 .Expected Cypher params
 [source,json]
 ----
-{}
+{ }
 ----
 
 .Expected Cypher output
@@ -661,29 +533,24 @@ RETURN this {
 [source,json,response=true,ignore-order]
 ----
 {
-  "users": [
-    {
-      "id": "1",
-      "fullName": "First Last from some city",
-      "address": {
-        "street": "some street",
-        "city": "some city"
-      }
-    },
-    {
-      "id": "2",
-      "fullName": "New First new-last from another-city",
-      "address": {
-        "street": "another-street",
-        "city": "another-city"
-      }
+  "users" : [ {
+    "id" : "1",
+    "fullName" : "First Last from some city",
+    "address" : {
+      "street" : "some street",
+      "city" : "some city"
+    }
+  }, {
+    "id" : "2",
+    "fullName" : "New First new-last from another-city",
+    "address" : {
+      "street" : "another-street",
+      "city" : "another-city"
     }
-  ]
+  } ]
 }
 ----
 
-'''
-
 === should select fields from double nested related nodes
 
 .Schema
@@ -724,7 +591,7 @@ CREATE (user1:User)-[:LIVES_AT]->(addr1:Address)-[:IN_CITY]->(city1:City)
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query User {
   users {
@@ -739,7 +606,7 @@ query User {
 .Expected Cypher params
 [source,json]
 ----
-{}
+{ }
 ----
 
 .Expected Cypher output
@@ -775,25 +642,20 @@ RETURN this {
 [source,json,response=true,ignore-order]
 ----
 {
-  "users": [
-    {
-      "fullName": "First Last from city1 name! with population of 8947975",
-      "address": {
-        "street": "some street"
-      }
-    },
-    {
-      "fullName": "New First new-last from city2 name? with population of 74",
-      "address": {
-        "street": "another-street"
-      }
+  "users" : [ {
+    "fullName" : "First Last from city1 name! with population of 8947975",
+    "address" : {
+      "street" : "some street"
+    }
+  }, {
+    "fullName" : "New First new-last from city2 name? with population of 74",
+    "address" : {
+      "street" : "another-street"
     }
-  ]
+  } ]
 }
 ----
 
-'''
-
 === should select fields from triple nested related nodes
 
 .Schema
@@ -841,7 +703,7 @@ CREATE (user1:User)-[:LIVES_AT]->(addr1:Address)-[:IN_CITY]->(city1:City)
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query User {
   users {
@@ -856,7 +718,7 @@ query User {
 .Expected Cypher params
 [source,json]
 ----
-{}
+{ }
 ----
 
 .Expected Cypher output
@@ -901,25 +763,20 @@ RETURN this {
 [source,json,response=true,ignore-order]
 ----
 {
-  "users": [
-    {
-      "fullName": "First Last from city1 name! with population of 8947975 with 4797",
-      "address": {
-        "street": "some street"
-      }
-    },
-    {
-      "fullName": "New First new-last from city2 name? with population of 74 with 4797",
-      "address": {
-        "street": "another-street"
-      }
+  "users" : [ {
+    "fullName" : "First Last from city1 name! with population of 8947975 with 4797",
+    "address" : {
+      "street" : "some street"
+    }
+  }, {
+    "fullName" : "New First new-last from city2 name? with population of 74 with 4797",
+    "address" : {
+      "street" : "another-street"
     }
-  ]
+  } ]
 }
 ----
 
-'''
-
 === should be able to require fields from a related union
 
 .Schema
@@ -961,7 +818,7 @@ CREATE (author1:Author)-[:WROTE]->(book1:Book) SET author1 = {name: "some-author
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query Author {
   authors {
@@ -973,7 +830,7 @@ query Author {
 .Expected Cypher params
 [source,json]
 ----
-{}
+{ }
 ----
 
 .Expected Cypher output
@@ -1021,8 +878,6 @@ RETURN this {
 }
 ----
 
-'''
-
 === should select @alias fields
 
 .Schema
@@ -1063,7 +918,7 @@ CREATE (user1:User)-[:LIVES_AT]->(addr1:Address)-[:IN_CITY]->(city1:City)
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query User {
   users {
@@ -1079,7 +934,7 @@ query User {
 .Expected Cypher params
 [source,json]
 ----
-{}
+{ }
 ----
 
 .Expected Cypher output
@@ -1131,8 +986,6 @@ RETURN this {
 }
 ----
 
-'''
-
 === should be able to require fields from a related interface
 
 .Schema
@@ -1176,7 +1029,7 @@ CREATE (author1:Author)-[:WROTE]->(book1:Book) SET author1 = {name: "some-author
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query Author {
   authors {
@@ -1188,7 +1041,7 @@ query Author {
 .Expected Cypher params
 [source,json]
 ----
-{}
+{ }
 ----
 
 .Expected Cypher output
@@ -1238,8 +1091,6 @@ RETURN this {
 }
 ----
 
-'''
-
 === should be able to require fields from a nested related interface
 
 .Schema
@@ -1291,7 +1142,7 @@ CREATE (user1:User)-[:FOLLOWS]->(author1:Author)-[:WROTE]->(book1:Book)
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query User {
   users {
@@ -1303,7 +1154,7 @@ query User {
 .Expected Cypher params
 [source,json]
 ----
-{}
+{ }
 ----
 
 .Expected Cypher output
@@ -1354,16 +1205,12 @@ RETURN this {
 [source,json,response=true]
 ----
 {
-  "users": [
-    {
-      "customResolverField": 1216
-    }
-  ]
+  "users" : [ {
+    "customResolverField" : 1216
+  } ]
 }
 ----
 
-'''
-
 === should be able to require fields from a nested related union
 
 .Schema
@@ -1411,7 +1258,7 @@ CREATE (user1:User)-[:FOLLOWS]->(author1:Author)-[:WROTE]->(book1:Book)
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query User {
   users {
@@ -1423,7 +1270,7 @@ query User {
 .Expected Cypher params
 [source,json]
 ----
-{}
+{ }
 ----
 
 .Expected Cypher output
@@ -1472,1036 +1319,8 @@ RETURN this {
 [source,json,response=true]
 ----
 {
-  "users": [
-    {
-      "customResolverField": 58
-    }
-  ]
-}
-----
-
-'''
-
-=== should not throw an error if there is another @customResolver field on the same type that is not required
-
-.Schema
-[source,graphql,schema=true]
-----
-interface Publication {
-  publicationYear: Int!
-}
-
-type User {
-  id: ID!
-  firstName: String!
-  lastName: String! @customResolver
-  followedAuthors: [Author!]! @relationship(type: "FOLLOWS", direction: OUT)
-  customResolverField: Int @customResolver(requires: "followedAuthors { name publications { publicationYear ...on Book { title } ... on Journal { subject } } } firstName")
-}
-
-type Author {
-  name: String!
-  publications: [Publication!]! @relationship(type: "WROTE", direction: OUT)
-}
-
-type Book implements Publication {
-  title: String!
-  publicationYear: Int!
-  author: [Author!]! @relationship(type: "WROTE", direction: IN)
-}
-
-type Journal implements Publication {
-  subject: String!
-  publicationYear: Int!
-  author: [Author!]! @relationship(type: "WROTE", direction: IN)
-}
-----
-
-.Augmented Schema
-[source,graphql]
-----
-schema {
-  query: Query
-}
-
-type Author {
-  name: String!
-  publications(directed: Boolean = true, options: PublicationOptions, where: PublicationWhere): [Publication!]!
-  publicationsConnection(after: String, directed: Boolean = true, first: Int, sort: [AuthorPublicationsConnectionSort!], where: AuthorPublicationsConnectionWhere): AuthorPublicationsConnection!
-}
-
-type AuthorEdge {
-  cursor: String!
-  node: Author!
-}
-
-input AuthorOptions {
-  limit: Int
-  offset: Int
-  """
-  Specify one or more AuthorSort objects to sort Authors by. The sorts will be applied in the order in which they are arranged in the array.
-  """
-  sort: [AuthorSort!]
-}
-
-type AuthorPublicationsConnection {
-  edges: [AuthorPublicationsRelationship!]!
-  pageInfo: PageInfo!
-  totalCount: Int!
-}
-
-input AuthorPublicationsConnectionSort {
-  node: PublicationSort
-}
-
-input AuthorPublicationsConnectionWhere {
-  AND: [AuthorPublicationsConnectionWhere!]
-  NOT: AuthorPublicationsConnectionWhere
-  OR: [AuthorPublicationsConnectionWhere!]
-  node: PublicationWhere
-}
-
-type AuthorPublicationsRelationship {
-  cursor: String!
-  node: Publication!
-}
-
-"""
-Fields to sort Authors by. The order in which sorts are applied is not guaranteed when specifying many fields in one AuthorSort object.
-"""
-input AuthorSort {
-  name: SortDirection
-}
-
-input AuthorWhere {
-  AND: [AuthorWhere!]
-  NOT: AuthorWhere
-  OR: [AuthorWhere!]
-  name: String
-  name_CONTAINS: String
-  name_ENDS_WITH: String
-  name_IN: [String!]
-  name_STARTS_WITH: String
-  """
-  Return Authors where all of the related AuthorPublicationsConnections match this filter
-  """
-  publicationsConnection_ALL: AuthorPublicationsConnectionWhere
-  """
-  Return Authors where none of the related AuthorPublicationsConnections match this filter
-  """
-  publicationsConnection_NONE: AuthorPublicationsConnectionWhere
-  """
-  Return Authors where one of the related AuthorPublicationsConnections match this filter
-  """
-  publicationsConnection_SINGLE: AuthorPublicationsConnectionWhere
-  """
-  Return Authors where some of the related AuthorPublicationsConnections match this filter
-  """
-  publicationsConnection_SOME: AuthorPublicationsConnectionWhere
-  """Return Authors where all of the related Publications match this filter"""
-  publications_ALL: PublicationWhere
-  """
-  Return Authors where none of the related Publications match this filter
-  """
-  publications_NONE: PublicationWhere
-  """Return Authors where one of the related Publications match this filter"""
-  publications_SINGLE: PublicationWhere
-  """
-  Return Authors where some of the related Publications match this filter
-  """
-  publications_SOME: PublicationWhere
-}
-
-type AuthorsConnection {
-  edges: [AuthorEdge!]!
-  pageInfo: PageInfo!
-  totalCount: Int!
-}
-
-type Book implements Publication {
-  author(directed: Boolean = true, options: AuthorOptions, where: AuthorWhere): [Author!]!
-  authorConnection(after: String, directed: Boolean = true, first: Int, sort: [BookAuthorConnectionSort!], where: BookAuthorConnectionWhere): BookAuthorConnection!
-  publicationYear: Int!
-  title: String!
-}
-
-type BookAuthorConnection {
-  edges: [BookAuthorRelationship!]!
-  pageInfo: PageInfo!
-  totalCount: Int!
-}
-
-input BookAuthorConnectionSort {
-  node: AuthorSort
-}
-
-input BookAuthorConnectionWhere {
-  AND: [BookAuthorConnectionWhere!]
-  NOT: BookAuthorConnectionWhere
-  OR: [BookAuthorConnectionWhere!]
-  node: AuthorWhere
-}
-
-type BookAuthorRelationship {
-  cursor: String!
-  node: Author!
-}
-
-type BookEdge {
-  cursor: String!
-  node: Book!
-}
-
-input BookOptions {
-  limit: Int
-  offset: Int
-  """
-  Specify one or more BookSort objects to sort Books by. The sorts will be applied in the order in which they are arranged in the array.
-  """
-  sort: [BookSort!]
-}
-
-"""
-Fields to sort Books by. The order in which sorts are applied is not guaranteed when specifying many fields in one BookSort object.
-"""
-input BookSort {
-  publicationYear: SortDirection
-  title: SortDirection
-}
-
-input BookWhere {
-  AND: [BookWhere!]
-  NOT: BookWhere
-  OR: [BookWhere!]
-  """
-  Return Books where all of the related BookAuthorConnections match this filter
-  """
-  authorConnection_ALL: BookAuthorConnectionWhere
-  """
-  Return Books where none of the related BookAuthorConnections match this filter
-  """
-  authorConnection_NONE: BookAuthorConnectionWhere
-  """
-  Return Books where one of the related BookAuthorConnections match this filter
-  """
-  authorConnection_SINGLE: BookAuthorConnectionWhere
-  """
-  Return Books where some of the related BookAuthorConnections match this filter
-  """
-  authorConnection_SOME: BookAuthorConnectionWhere
-  """Return Books where all of the related Authors match this filter"""
-  author_ALL: AuthorWhere
-  """Return Books where none of the related Authors match this filter"""
-  author_NONE: AuthorWhere
-  """Return Books where one of the related Authors match this filter"""
-  author_SINGLE: AuthorWhere
-  """Return Books where some of the related Authors match this filter"""
-  author_SOME: AuthorWhere
-  publicationYear: Int
-  publicationYear_GT: Int
-  publicationYear_GTE: Int
-  publicationYear_IN: [Int!]
-  publicationYear_LT: Int
-  publicationYear_LTE: Int
-  title: String
-  title_CONTAINS: String
-  title_ENDS_WITH: String
-  title_IN: [String!]
-  title_STARTS_WITH: String
-}
-
-type BooksConnection {
-  edges: [BookEdge!]!
-  pageInfo: PageInfo!
-  totalCount: Int!
-}
-
-type Journal implements Publication {
-  author(directed: Boolean = true, options: AuthorOptions, where: AuthorWhere): [Author!]!
-  authorConnection(after: String, directed: Boolean = true, first: Int, sort: [JournalAuthorConnectionSort!], where: JournalAuthorConnectionWhere): JournalAuthorConnection!
-  publicationYear: Int!
-  subject: String!
-}
-
-type JournalAuthorConnection {
-  edges: [JournalAuthorRelationship!]!
-  pageInfo: PageInfo!
-  totalCount: Int!
-}
-
-input JournalAuthorConnectionSort {
-  node: AuthorSort
-}
-
-input JournalAuthorConnectionWhere {
-  AND: [JournalAuthorConnectionWhere!]
-  NOT: JournalAuthorConnectionWhere
-  OR: [JournalAuthorConnectionWhere!]
-  node: AuthorWhere
-}
-
-type JournalAuthorRelationship {
-  cursor: String!
-  node: Author!
-}
-
-type JournalEdge {
-  cursor: String!
-  node: Journal!
-}
-
-input JournalOptions {
-  limit: Int
-  offset: Int
-  """
-  Specify one or more JournalSort objects to sort Journals by. The sorts will be applied in the order in which they are arranged in the array.
-  """
-  sort: [JournalSort!]
-}
-
-"""
-Fields to sort Journals by. The order in which sorts are applied is not guaranteed when specifying many fields in one JournalSort object.
-"""
-input JournalSort {
-  publicationYear: SortDirection
-  subject: SortDirection
-}
-
-input JournalWhere {
-  AND: [JournalWhere!]
-  NOT: JournalWhere
-  OR: [JournalWhere!]
-  """
-  Return Journals where all of the related JournalAuthorConnections match this filter
-  """
-  authorConnection_ALL: JournalAuthorConnectionWhere
-  """
-  Return Journals where none of the related JournalAuthorConnections match this filter
-  """
-  authorConnection_NONE: JournalAuthorConnectionWhere
-  """
-  Return Journals where one of the related JournalAuthorConnections match this filter
-  """
-  authorConnection_SINGLE: JournalAuthorConnectionWhere
-  """
-  Return Journals where some of the related JournalAuthorConnections match this filter
-  """
-  authorConnection_SOME: JournalAuthorConnectionWhere
-  """Return Journals where all of the related Authors match this filter"""
-  author_ALL: AuthorWhere
-  """Return Journals where none of the related Authors match this filter"""
-  author_NONE: AuthorWhere
-  """Return Journals where one of the related Authors match this filter"""
-  author_SINGLE: AuthorWhere
-  """Return Journals where some of the related Authors match this filter"""
-  author_SOME: AuthorWhere
-  publicationYear: Int
-  publicationYear_GT: Int
-  publicationYear_GTE: Int
-  publicationYear_IN: [Int!]
-  publicationYear_LT: Int
-  publicationYear_LTE: Int
-  subject: String
-  subject_CONTAINS: String
-  subject_ENDS_WITH: String
-  subject_IN: [String!]
-  subject_STARTS_WITH: String
-}
-
-type JournalsConnection {
-  edges: [JournalEdge!]!
-  pageInfo: PageInfo!
-  totalCount: Int!
-}
-
-"""Pagination information (Relay)"""
-type PageInfo {
-  endCursor: String
-  hasNextPage: Boolean!
-  hasPreviousPage: Boolean!
-  startCursor: String
-}
-
-interface Publication {
-  publicationYear: Int!
-}
-
-type PublicationEdge {
-  cursor: String!
-  node: Publication!
-}
-
-enum PublicationImplementation {
-  Book
-  Journal
-}
-
-input PublicationOptions {
-  limit: Int
-  offset: Int
-  """
-  Specify one or more PublicationSort objects to sort Publications by. The sorts will be applied in the order in which they are arranged in the array.
-  """
-  sort: [PublicationSort]
-}
-
-"""
-Fields to sort Publications by. The order in which sorts are applied is not guaranteed when specifying many fields in one PublicationSort object.
-"""
-input PublicationSort {
-  publicationYear: SortDirection
-}
-
-input PublicationWhere {
-  AND: [PublicationWhere!]
-  NOT: PublicationWhere
-  OR: [PublicationWhere!]
-  publicationYear: Int
-  publicationYear_GT: Int
-  publicationYear_GTE: Int
-  publicationYear_IN: [Int!]
-  publicationYear_LT: Int
-  publicationYear_LTE: Int
-  typename_IN: [PublicationImplementation!]
-}
-
-type PublicationsConnection {
-  edges: [PublicationEdge!]!
-  pageInfo: PageInfo!
-  totalCount: Int!
-}
-
-type Query {
-  authors(options: AuthorOptions, where: AuthorWhere): [Author!]!
-  authorsConnection(after: String, first: Int, sort: [AuthorSort], where: AuthorWhere): AuthorsConnection!
-  books(options: BookOptions, where: BookWhere): [Book!]!
-  booksConnection(after: String, first: Int, sort: [BookSort], where: BookWhere): BooksConnection!
-  journals(options: JournalOptions, where: JournalWhere): [Journal!]!
-  journalsConnection(after: String, first: Int, sort: [JournalSort], where: JournalWhere): JournalsConnection!
-  publications(options: PublicationOptions, where: PublicationWhere): [Publication!]!
-  publicationsConnection(after: String, first: Int, sort: [PublicationSort], where: PublicationWhere): PublicationsConnection!
-  users(options: UserOptions, where: UserWhere): [User!]!
-  usersConnection(after: String, first: Int, sort: [UserSort], where: UserWhere): UsersConnection!
-}
-
-"""An enum for sorting in either ascending or descending order."""
-enum SortDirection {
-  """Sort by field values in ascending order."""
-  ASC
-  """Sort by field values in descending order."""
-  DESC
-}
-
-type User {
-  customResolverField: Int
-  firstName: String!
-  followedAuthors(directed: Boolean = true, options: AuthorOptions, where: AuthorWhere): [Author!]!
-  followedAuthorsConnection(after: String, directed: Boolean = true, first: Int, sort: [UserFollowedAuthorsConnectionSort!], where: UserFollowedAuthorsConnectionWhere): UserFollowedAuthorsConnection!
-  id: ID!
-  lastName: String!
-}
-
-type UserEdge {
-  cursor: String!
-  node: User!
-}
-
-type UserFollowedAuthorsConnection {
-  edges: [UserFollowedAuthorsRelationship!]!
-  pageInfo: PageInfo!
-  totalCount: Int!
-}
-
-input UserFollowedAuthorsConnectionSort {
-  node: AuthorSort
-}
-
-input UserFollowedAuthorsConnectionWhere {
-  AND: [UserFollowedAuthorsConnectionWhere!]
-  NOT: UserFollowedAuthorsConnectionWhere
-  OR: [UserFollowedAuthorsConnectionWhere!]
-  node: AuthorWhere
-}
-
-type UserFollowedAuthorsRelationship {
-  cursor: String!
-  node: Author!
-}
-
-input UserOptions {
-  limit: Int
-  offset: Int
-  """
-  Specify one or more UserSort objects to sort Users by. The sorts will be applied in the order in which they are arranged in the array.
-  """
-  sort: [UserSort!]
-}
-
-"""
-Fields to sort Users by. The order in which sorts are applied is not guaranteed when specifying many fields in one UserSort object.
-"""
-input UserSort {
-  firstName: SortDirection
-  id: SortDirection
-}
-
-input UserWhere {
-  AND: [UserWhere!]
-  NOT: UserWhere
-  OR: [UserWhere!]
-  firstName: String
-  firstName_CONTAINS: String
-  firstName_ENDS_WITH: String
-  firstName_IN: [String!]
-  firstName_STARTS_WITH: String
-  """
-  Return Users where all of the related UserFollowedAuthorsConnections match this filter
-  """
-  followedAuthorsConnection_ALL: UserFollowedAuthorsConnectionWhere
-  """
-  Return Users where none of the related UserFollowedAuthorsConnections match this filter
-  """
-  followedAuthorsConnection_NONE: UserFollowedAuthorsConnectionWhere
-  """
-  Return Users where one of the related UserFollowedAuthorsConnections match this filter
-  """
-  followedAuthorsConnection_SINGLE: UserFollowedAuthorsConnectionWhere
-  """
-  Return Users where some of the related UserFollowedAuthorsConnections match this filter
-  """
-  followedAuthorsConnection_SOME: UserFollowedAuthorsConnectionWhere
-  """Return Users where all of the related Authors match this filter"""
-  followedAuthors_ALL: AuthorWhere
-  """Return Users where none of the related Authors match this filter"""
-  followedAuthors_NONE: AuthorWhere
-  """Return Users where one of the related Authors match this filter"""
-  followedAuthors_SINGLE: AuthorWhere
-  """Return Users where some of the related Authors match this filter"""
-  followedAuthors_SOME: AuthorWhere
-  id: ID
-  id_CONTAINS: ID
-  id_ENDS_WITH: ID
-  id_IN: [ID!]
-  id_STARTS_WITH: ID
-}
-
-type UsersConnection {
-  edges: [UserEdge!]!
-  pageInfo: PageInfo!
-  totalCount: Int!
-}
-----
-
-'''
-
-=== should not throw an error if there is another @customResolver field on a different implementation of the same interface when using ...on
-
-.Schema
-[source,graphql,schema=true]
-----
-interface Publication {
-  publicationYear: Int!
-}
-
-type User {
-  id: ID!
-  firstName: String!
-  lastName: String!
-  followedAuthors: [Author!]! @relationship(type: "FOLLOWS", direction: OUT)
-  customResolverField: Int @customResolver(requires: "followedAuthors { name publications { ...on Book { title publicationYear } ... on Journal { subject } } } firstName")
-}
-
-type Author {
-  name: String!
-  publications: [Publication!]! @relationship(type: "WROTE", direction: OUT)
-}
-
-type Book implements Publication {
-  title: String!
-  publicationYear: Int!
-  author: [Author!]! @relationship(type: "WROTE", direction: IN)
-}
-
-type Journal implements Publication {
-  subject: String!
-  publicationYear: Int! @customResolver
-  author: [Author!]! @relationship(type: "WROTE", direction: IN)
+  "users" : [ {
+    "customResolverField" : 58
+  } ]
 }
 ----
-
-.Augmented Schema
-[source,graphql]
-----
-schema {
-  query: Query
-}
-
-type Author {
-  name: String!
-  publications(directed: Boolean = true, options: PublicationOptions, where: PublicationWhere): [Publication!]!
-  publicationsConnection(after: String, directed: Boolean = true, first: Int, sort: [AuthorPublicationsConnectionSort!], where: AuthorPublicationsConnectionWhere): AuthorPublicationsConnection!
-}
-
-type AuthorEdge {
-  cursor: String!
-  node: Author!
-}
-
-input AuthorOptions {
-  limit: Int
-  offset: Int
-  """
-  Specify one or more AuthorSort objects to sort Authors by. The sorts will be applied in the order in which they are arranged in the array.
-  """
-  sort: [AuthorSort!]
-}
-
-type AuthorPublicationsConnection {
-  edges: [AuthorPublicationsRelationship!]!
-  pageInfo: PageInfo!
-  totalCount: Int!
-}
-
-input AuthorPublicationsConnectionSort {
-  node: PublicationSort
-}
-
-input AuthorPublicationsConnectionWhere {
-  AND: [AuthorPublicationsConnectionWhere!]
-  NOT: AuthorPublicationsConnectionWhere
-  OR: [AuthorPublicationsConnectionWhere!]
-  node: PublicationWhere
-}
-
-type AuthorPublicationsRelationship {
-  cursor: String!
-  node: Publication!
-}
-
-"""
-Fields to sort Authors by. The order in which sorts are applied is not guaranteed when specifying many fields in one AuthorSort object.
-"""
-input AuthorSort {
-  name: SortDirection
-}
-
-input AuthorWhere {
-  AND: [AuthorWhere!]
-  NOT: AuthorWhere
-  OR: [AuthorWhere!]
-  name: String
-  name_CONTAINS: String
-  name_ENDS_WITH: String
-  name_IN: [String!]
-  name_STARTS_WITH: String
-  """
-  Return Authors where all of the related AuthorPublicationsConnections match this filter
-  """
-  publicationsConnection_ALL: AuthorPublicationsConnectionWhere
-  """
-  Return Authors where none of the related AuthorPublicationsConnections match this filter
-  """
-  publicationsConnection_NONE: AuthorPublicationsConnectionWhere
-  """
-  Return Authors where one of the related AuthorPublicationsConnections match this filter
-  """
-  publicationsConnection_SINGLE: AuthorPublicationsConnectionWhere
-  """
-  Return Authors where some of the related AuthorPublicationsConnections match this filter
-  """
-  publicationsConnection_SOME: AuthorPublicationsConnectionWhere
-  """Return Authors where all of the related Publications match this filter"""
-  publications_ALL: PublicationWhere
-  """
-  Return Authors where none of the related Publications match this filter
-  """
-  publications_NONE: PublicationWhere
-  """Return Authors where one of the related Publications match this filter"""
-  publications_SINGLE: PublicationWhere
-  """
-  Return Authors where some of the related Publications match this filter
-  """
-  publications_SOME: PublicationWhere
-}
-
-type AuthorsConnection {
-  edges: [AuthorEdge!]!
-  pageInfo: PageInfo!
-  totalCount: Int!
-}
-
-type Book implements Publication {
-  author(directed: Boolean = true, options: AuthorOptions, where: AuthorWhere): [Author!]!
-  authorConnection(after: String, directed: Boolean = true, first: Int, sort: [BookAuthorConnectionSort!], where: BookAuthorConnectionWhere): BookAuthorConnection!
-  publicationYear: Int!
-  title: String!
-}
-
-type BookAuthorConnection {
-  edges: [BookAuthorRelationship!]!
-  pageInfo: PageInfo!
-  totalCount: Int!
-}
-
-input BookAuthorConnectionSort {
-  node: AuthorSort
-}
-
-input BookAuthorConnectionWhere {
-  AND: [BookAuthorConnectionWhere!]
-  NOT: BookAuthorConnectionWhere
-  OR: [BookAuthorConnectionWhere!]
-  node: AuthorWhere
-}
-
-type BookAuthorRelationship {
-  cursor: String!
-  node: Author!
-}
-
-type BookEdge {
-  cursor: String!
-  node: Book!
-}
-
-input BookOptions {
-  limit: Int
-  offset: Int
-  """
-  Specify one or more BookSort objects to sort Books by. The sorts will be applied in the order in which they are arranged in the array.
-  """
-  sort: [BookSort!]
-}
-
-"""
-Fields to sort Books by. The order in which sorts are applied is not guaranteed when specifying many fields in one BookSort object.
-"""
-input BookSort {
-  publicationYear: SortDirection
-  title: SortDirection
-}
-
-input BookWhere {
-  AND: [BookWhere!]
-  NOT: BookWhere
-  OR: [BookWhere!]
-  """
-  Return Books where all of the related BookAuthorConnections match this filter
-  """
-  authorConnection_ALL: BookAuthorConnectionWhere
-  """
-  Return Books where none of the related BookAuthorConnections match this filter
-  """
-  authorConnection_NONE: BookAuthorConnectionWhere
-  """
-  Return Books where one of the related BookAuthorConnections match this filter
-  """
-  authorConnection_SINGLE: BookAuthorConnectionWhere
-  """
-  Return Books where some of the related BookAuthorConnections match this filter
-  """
-  authorConnection_SOME: BookAuthorConnectionWhere
-  """Return Books where all of the related Authors match this filter"""
-  author_ALL: AuthorWhere
-  """Return Books where none of the related Authors match this filter"""
-  author_NONE: AuthorWhere
-  """Return Books where one of the related Authors match this filter"""
-  author_SINGLE: AuthorWhere
-  """Return Books where some of the related Authors match this filter"""
-  author_SOME: AuthorWhere
-  publicationYear: Int
-  publicationYear_GT: Int
-  publicationYear_GTE: Int
-  publicationYear_IN: [Int!]
-  publicationYear_LT: Int
-  publicationYear_LTE: Int
-  title: String
-  title_CONTAINS: String
-  title_ENDS_WITH: String
-  title_IN: [String!]
-  title_STARTS_WITH: String
-}
-
-type BooksConnection {
-  edges: [BookEdge!]!
-  pageInfo: PageInfo!
-  totalCount: Int!
-}
-
-type Journal implements Publication {
-  author(directed: Boolean = true, options: AuthorOptions, where: AuthorWhere): [Author!]!
-  authorConnection(after: String, directed: Boolean = true, first: Int, sort: [JournalAuthorConnectionSort!], where: JournalAuthorConnectionWhere): JournalAuthorConnection!
-  publicationYear: Int!
-  subject: String!
-}
-
-type JournalAuthorConnection {
-  edges: [JournalAuthorRelationship!]!
-  pageInfo: PageInfo!
-  totalCount: Int!
-}
-
-input JournalAuthorConnectionSort {
-  node: AuthorSort
-}
-
-input JournalAuthorConnectionWhere {
-  AND: [JournalAuthorConnectionWhere!]
-  NOT: JournalAuthorConnectionWhere
-  OR: [JournalAuthorConnectionWhere!]
-  node: AuthorWhere
-}
-
-type JournalAuthorRelationship {
-  cursor: String!
-  node: Author!
-}
-
-type JournalEdge {
-  cursor: String!
-  node: Journal!
-}
-
-input JournalOptions {
-  limit: Int
-  offset: Int
-  """
-  Specify one or more JournalSort objects to sort Journals by. The sorts will be applied in the order in which they are arranged in the array.
-  """
-  sort: [JournalSort!]
-}
-
-"""
-Fields to sort Journals by. The order in which sorts are applied is not guaranteed when specifying many fields in one JournalSort object.
-"""
-input JournalSort {
-  subject: SortDirection
-}
-
-input JournalWhere {
-  AND: [JournalWhere!]
-  NOT: JournalWhere
-  OR: [JournalWhere!]
-  """
-  Return Journals where all of the related JournalAuthorConnections match this filter
-  """
-  authorConnection_ALL: JournalAuthorConnectionWhere
-  """
-  Return Journals where none of the related JournalAuthorConnections match this filter
-  """
-  authorConnection_NONE: JournalAuthorConnectionWhere
-  """
-  Return Journals where one of the related JournalAuthorConnections match this filter
-  """
-  authorConnection_SINGLE: JournalAuthorConnectionWhere
-  """
-  Return Journals where some of the related JournalAuthorConnections match this filter
-  """
-  authorConnection_SOME: JournalAuthorConnectionWhere
-  """Return Journals where all of the related Authors match this filter"""
-  author_ALL: AuthorWhere
-  """Return Journals where none of the related Authors match this filter"""
-  author_NONE: AuthorWhere
-  """Return Journals where one of the related Authors match this filter"""
-  author_SINGLE: AuthorWhere
-  """Return Journals where some of the related Authors match this filter"""
-  author_SOME: AuthorWhere
-  subject: String
-  subject_CONTAINS: String
-  subject_ENDS_WITH: String
-  subject_IN: [String!]
-  subject_STARTS_WITH: String
-}
-
-type JournalsConnection {
-  edges: [JournalEdge!]!
-  pageInfo: PageInfo!
-  totalCount: Int!
-}
-
-"""Pagination information (Relay)"""
-type PageInfo {
-  endCursor: String
-  hasNextPage: Boolean!
-  hasPreviousPage: Boolean!
-  startCursor: String
-}
-
-interface Publication {
-  publicationYear: Int!
-}
-
-type PublicationEdge {
-  cursor: String!
-  node: Publication!
-}
-
-enum PublicationImplementation {
-  Book
-  Journal
-}
-
-input PublicationOptions {
-  limit: Int
-  offset: Int
-  """
-  Specify one or more PublicationSort objects to sort Publications by. The sorts will be applied in the order in which they are arranged in the array.
-  """
-  sort: [PublicationSort]
-}
-
-"""
-Fields to sort Publications by. The order in which sorts are applied is not guaranteed when specifying many fields in one PublicationSort object.
-"""
-input PublicationSort {
-  publicationYear: SortDirection
-}
-
-input PublicationWhere {
-  AND: [PublicationWhere!]
-  NOT: PublicationWhere
-  OR: [PublicationWhere!]
-  publicationYear: Int
-  publicationYear_GT: Int
-  publicationYear_GTE: Int
-  publicationYear_IN: [Int!]
-  publicationYear_LT: Int
-  publicationYear_LTE: Int
-  typename_IN: [PublicationImplementation!]
-}
-
-type PublicationsConnection {
-  edges: [PublicationEdge!]!
-  pageInfo: PageInfo!
-  totalCount: Int!
-}
-
-type Query {
-  authors(options: AuthorOptions, where: AuthorWhere): [Author!]!
-  authorsConnection(after: String, first: Int, sort: [AuthorSort], where: AuthorWhere): AuthorsConnection!
-  books(options: BookOptions, where: BookWhere): [Book!]!
-  booksConnection(after: String, first: Int, sort: [BookSort], where: BookWhere): BooksConnection!
-  journals(options: JournalOptions, where: JournalWhere): [Journal!]!
-  journalsConnection(after: String, first: Int, sort: [JournalSort], where: JournalWhere): JournalsConnection!
-  publications(options: PublicationOptions, where: PublicationWhere): [Publication!]!
-  publicationsConnection(after: String, first: Int, sort: [PublicationSort], where: PublicationWhere): PublicationsConnection!
-  users(options: UserOptions, where: UserWhere): [User!]!
-  usersConnection(after: String, first: Int, sort: [UserSort], where: UserWhere): UsersConnection!
-}
-
-"""An enum for sorting in either ascending or descending order."""
-enum SortDirection {
-  """Sort by field values in ascending order."""
-  ASC
-  """Sort by field values in descending order."""
-  DESC
-}
-
-type User {
-  customResolverField: Int
-  firstName: String!
-  followedAuthors(directed: Boolean = true, options: AuthorOptions, where: AuthorWhere): [Author!]!
-  followedAuthorsConnection(after: String, directed: Boolean = true, first: Int, sort: [UserFollowedAuthorsConnectionSort!], where: UserFollowedAuthorsConnectionWhere): UserFollowedAuthorsConnection!
-  id: ID!
-  lastName: String!
-}
-
-type UserEdge {
-  cursor: String!
-  node: User!
-}
-
-type UserFollowedAuthorsConnection {
-  edges: [UserFollowedAuthorsRelationship!]!
-  pageInfo: PageInfo!
-  totalCount: Int!
-}
-
-input UserFollowedAuthorsConnectionSort {
-  node: AuthorSort
-}
-
-input UserFollowedAuthorsConnectionWhere {
-  AND: [UserFollowedAuthorsConnectionWhere!]
-  NOT: UserFollowedAuthorsConnectionWhere
-  OR: [UserFollowedAuthorsConnectionWhere!]
-  node: AuthorWhere
-}
-
-type UserFollowedAuthorsRelationship {
-  cursor: String!
-  node: Author!
-}
-
-input UserOptions {
-  limit: Int
-  offset: Int
-  """
-  Specify one or more UserSort objects to sort Users by. The sorts will be applied in the order in which they are arranged in the array.
-  """
-  sort: [UserSort!]
-}
-
-"""
-Fields to sort Users by. The order in which sorts are applied is not guaranteed when specifying many fields in one UserSort object.
-"""
-input UserSort {
-  firstName: SortDirection
-  id: SortDirection
-  lastName: SortDirection
-}
-
-input UserWhere {
-  AND: [UserWhere!]
-  NOT: UserWhere
-  OR: [UserWhere!]
-  firstName: String
-  firstName_CONTAINS: String
-  firstName_ENDS_WITH: String
-  firstName_IN: [String!]
-  firstName_STARTS_WITH: String
-  """
-  Return Users where all of the related UserFollowedAuthorsConnections match this filter
-  """
-  followedAuthorsConnection_ALL: UserFollowedAuthorsConnectionWhere
-  """
-  Return Users where none of the related UserFollowedAuthorsConnections match this filter
-  """
-  followedAuthorsConnection_NONE: UserFollowedAuthorsConnectionWhere
-  """
-  Return Users where one of the related UserFollowedAuthorsConnections match this filter
-  """
-  followedAuthorsConnection_SINGLE: UserFollowedAuthorsConnectionWhere
-  """
-  Return Users where some of the related UserFollowedAuthorsConnections match this filter
-  """
-  followedAuthorsConnection_SOME: UserFollowedAuthorsConnectionWhere
-  """Return Users where all of the related Authors match this filter"""
-  followedAuthors_ALL: AuthorWhere
-  """Return Users where none of the related Authors match this filter"""
-  followedAuthors_NONE: AuthorWhere
-  """Return Users where one of the related Authors match this filter"""
-  followedAuthors_SINGLE: AuthorWhere
-  """Return Users where some of the related Authors match this filter"""
-  followedAuthors_SOME: AuthorWhere
-  id: ID
-  id_CONTAINS: ID
-  id_ENDS_WITH: ID
-  id_IN: [ID!]
-  id_STARTS_WITH: ID
-  lastName: String
-  lastName_CONTAINS: String
-  lastName_ENDS_WITH: String
-  lastName_IN: [String!]
-  lastName_STARTS_WITH: String
-}
-
-type UsersConnection {
-  edges: [UserEdge!]!
-  pageInfo: PageInfo!
-  totalCount: Int!
-}
-----
-
-'''
-
diff --git a/core/src/test/resources/integration-test-files/directives/customResolver.js.adoc b/core/src/test/resources/integration-test-files/directives/customResolver.js.adoc
new file mode 100644
index 00000000..3ab3b794
--- /dev/null
+++ b/core/src/test/resources/integration-test-files/directives/customResolver.js.adoc
@@ -0,0 +1,1176 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+== @customResolver directive
+
+=== Scalar fields
+
+==== Setup
+
+.Schema
+[source,graphql,schema=true]
+----
+type User {
+  id: ID!
+  firstName: String!
+  lastName: String!
+  fullName: String @customResolver(requires: "firstName lastName")
+}
+----
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (user:User) SET user = {id: "An-ID", firstName: "someFirstName", lastName: "a second name!"}
+----
+
+==== removes a field from all but its object type, and resolves with a custom resolver
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+query User($userId: ID!) {
+  users(where: {id: $userId}) {
+    id
+    firstName
+    lastName
+    fullName
+  }
+}
+----
+
+.GraphQL params input
+[source,json,request=true]
+----
+{
+  "userId": "An-ID"
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "An-ID"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:User)
+WHERE this.id = $param0
+RETURN this { .id, .firstName, .lastName, .fullName } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "users": [
+    {
+      "id": "An-ID",
+      "firstName": "someFirstName",
+      "lastName": "a second name!",
+      "fullName": "someFirstName a second name!"
+    }
+  ]
+}
+----
+
+==== resolves field with custom resolver without required fields in selection set
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+query User($userId: ID!) {
+  users(where: {id: $userId}) {
+    id
+    fullName
+  }
+}
+----
+
+.GraphQL params input
+[source,json,request=true]
+----
+{
+  "userId": "An-ID"
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "An-ID"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:User)
+WHERE this.id = $param0
+RETURN this { .id, .fullName, .firstName, .lastName } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "users": [
+    {
+      "id": "An-ID",
+      "fullName": "someFirstName a second name!"
+    }
+  ]
+}
+----
+
+==== resolves field with custom resolver with required field(s) aliased in selection set
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+query User($userId: ID!) {
+  users(where: {id: $userId}) {
+    id
+    f: firstName
+    fullName
+  }
+}
+----
+
+.GraphQL params input
+[source,json,request=true]
+----
+{
+  "userId": "An-ID"
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "An-ID"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:User)
+WHERE this.id = $param0
+RETURN this { .id, .fullName, .firstName, .lastName, f: this.firstName } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "users": [
+    {
+      "id": "An-ID",
+      "f": "someFirstName",
+      "fullName": "someFirstName a second name!"
+    }
+  ]
+}
+----
+
+== Related Fields
+
+=== should be able to require a field from a related type
+
+.Schema
+[source,graphql,schema=true]
+----
+type Address {
+  street: String!
+  city: String!
+}
+
+type User {
+  id: ID!
+  firstName: String!
+  lastName: String!
+  address: Address @relationship(type: "LIVES_AT", direction: OUT)
+  fullName: String @customResolver(requires: "firstName lastName address { city }")
+}
+----
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (user:User)-[:LIVES_AT]->(addr:Address) SET user = {id: "1", firstName: "First", lastName: "Last"}, addr = {city: "some city", street: "some street"}
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+query User {
+  users {
+    fullName
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:User)
+CALL {
+    WITH this
+    MATCH (this)-[this0:LIVES_AT]->(this1:Address)
+    WITH this1 { .city } AS this1
+    RETURN head(collect(this1)) AS var2
+}
+RETURN this { .fullName, .firstName, .lastName, address: var2 } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "users": [
+    {
+      "fullName": "First Last from some city"
+    }
+  ]
+}
+----
+
+=== should fetch required fields when other fields are also selected
+
+.Schema
+[source,graphql,schema=true]
+----
+type Address {
+  street: String!
+  city: String!
+}
+
+type User {
+  id: ID!
+  firstName: String!
+  lastName: String!
+  address: Address @relationship(type: "LIVES_AT", direction: OUT)
+  fullName: String @customResolver(requires: "firstName lastName address { city }")
+}
+----
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (user:User)-[:LIVES_AT]->(addr:Address) SET user = {id: "1", firstName: "First", lastName: "Last"}, addr = {city: "some city", street: "some street"}
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+query User {
+  users {
+    id
+    fullName
+    address {
+      street
+      city
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:User)
+CALL {
+    WITH this
+    MATCH (this)-[this0:LIVES_AT]->(this1:Address)
+    WITH this1 { .street, .city } AS this1
+    RETURN head(collect(this1)) AS var2
+}
+RETURN this { .id, .fullName, .firstName, .lastName, address: var2 } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "users": [
+    {
+      "id": "1",
+      "fullName": "First Last from some city",
+      "address": {
+        "street": "some street",
+        "city": "some city"
+      }
+    }
+  ]
+}
+----
+
+=== should fetch customResolver fields over multiple users
+
+.Schema
+[source,graphql,schema=true]
+----
+type Address {
+  street: String!
+  city: String!
+}
+
+type User {
+  id: ID!
+  firstName: String!
+  lastName: String!
+  address: Address @relationship(type: "LIVES_AT", direction: OUT)
+  fullName: String @customResolver(requires: "firstName lastName address { city }")
+}
+----
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (user1:User)-[:LIVES_AT]->(addr1:Address) SET user1 = {id: "1", firstName: "First", lastName: "Last"}, addr1 = {city: "some city", street: "some street"}
+ CREATE (user2:User)-[:LIVES_AT]->(addr2:Address) SET user2 = {id: "2", firstName: "New First", lastName: "new-last"}, addr2 = {city: "another-city", street: "another-street"}
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+query User {
+  users {
+    id
+    fullName
+    address {
+      street
+      city
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:User)
+CALL {
+    WITH this
+    MATCH (this)-[this0:LIVES_AT]->(this1:Address)
+    WITH this1 { .street, .city } AS this1
+    RETURN head(collect(this1)) AS var2
+}
+RETURN this { .id, .fullName, .firstName, .lastName, address: var2 } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "users": [
+    {
+      "id": "1",
+      "fullName": "First Last from some city",
+      "address": {
+        "street": "some street",
+        "city": "some city"
+      }
+    },
+    {
+      "id": "2",
+      "fullName": "New First new-last from another-city",
+      "address": {
+        "street": "another-street",
+        "city": "another-city"
+      }
+    }
+  ]
+}
+----
+
+=== should select related fields when not selected last
+
+.Schema
+[source,graphql,schema=true]
+----
+type Address {
+  street: String!
+  city: String!
+}
+
+type User {
+  id: ID!
+  firstName: String!
+  lastName: String!
+  address: Address @relationship(type: "LIVES_AT", direction: OUT)
+  fullName: String @customResolver(requires: "firstName address { city } lastName")
+}
+----
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (user1:User)-[:LIVES_AT]->(addr1:Address) SET user1 = {id: "1", firstName: "First", lastName: "Last"}, addr1 = {city: "some city", street: "some street"}
+ CREATE (user2:User)-[:LIVES_AT]->(addr2:Address) SET user2 = {id: "2", firstName: "New First", lastName: "new-last"}, addr2 = {city: "another-city", street: "another-street"}
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+query User {
+  users {
+    id
+    fullName
+    address {
+      street
+      city
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:User)
+CALL {
+    WITH this
+    MATCH (this)-[this0:LIVES_AT]->(this1:Address)
+    WITH this1 { .street, .city } AS this1
+    RETURN head(collect(this1)) AS var2
+}
+RETURN this { .id, .fullName, .firstName, .lastName, address: var2 } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "users": [
+    {
+      "id": "1",
+      "fullName": "First Last from some city",
+      "address": {
+        "street": "some street",
+        "city": "some city"
+      }
+    },
+    {
+      "id": "2",
+      "fullName": "New First new-last from another-city",
+      "address": {
+        "street": "another-street",
+        "city": "another-city"
+      }
+    }
+  ]
+}
+----
+
+=== should select fields from double nested related nodes
+
+.Schema
+[source,graphql,schema=true]
+----
+type City {
+  name: String!
+  population: Int
+}
+
+type Address {
+  street: String!
+  city: City! @relationship(type: "IN_CITY", direction: OUT)
+}
+
+type User {
+  id: ID!
+  firstName: String!
+  lastName: String!
+  address: Address @relationship(type: "LIVES_AT", direction: OUT)
+  fullName: String @customResolver(requires: "firstName lastName address { city { name population } }")
+}
+----
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (user1:User)-[:LIVES_AT]->(addr1:Address)-[:IN_CITY]->(city1:City)
+ SET user1 = {id: "1", firstName: "First", lastName: "Last"}, addr1 = {city: "some city", street: "some street"}, city1 = {name: "city1 name!", population: 8947975}
+ CREATE (user2:User)-[:LIVES_AT]->(addr2:Address)-[:IN_CITY]->(city2:City)
+ SET user2 = {id: "2", firstName: "New First", lastName: "new-last"}, addr2 = {city: "another-city", street: "another-street"}, city2 = {name: "city2 name?", population: 74}
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+query User {
+  users {
+    fullName
+    address {
+      street
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:User)
+CALL {
+    WITH this
+    MATCH (this)-[this0:LIVES_AT]->(this1:Address)
+    CALL {
+        WITH this1
+        MATCH (this1)-[this2:IN_CITY]->(this3:City)
+        WITH this3 { .name, .population } AS this3
+        RETURN head(collect(this3)) AS var4
+    }
+    WITH this1 { .street, city: var4 } AS this1
+    RETURN head(collect(this1)) AS var5
+}
+RETURN this { .fullName, .firstName, .lastName, address: var5 } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "users": [
+    {
+      "fullName": "First Last from city1 name! with population of 8947975",
+      "address": {
+        "street": "some street"
+      }
+    },
+    {
+      "fullName": "New First new-last from city2 name? with population of 74",
+      "address": {
+        "street": "another-street"
+      }
+    }
+  ]
+}
+----
+
+=== should select fields from triple nested related nodes
+
+.Schema
+[source,graphql,schema=true]
+----
+type State {
+  someValue: Int!
+}
+
+type City {
+  name: String!
+  population: Int
+  state: State! @relationship(type: "IN_STATE", direction: OUT)
+}
+
+type Address {
+  street: String!
+  city: City! @relationship(type: "IN_CITY", direction: OUT)
+}
+
+type User {
+  id: ID!
+  firstName: String!
+  lastName: String!
+  address: Address @relationship(type: "LIVES_AT", direction: OUT)
+  fullName: String @customResolver(requires: "firstName lastName address { city { name state { someValue } population } }")
+}
+----
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (user1:User)-[:LIVES_AT]->(addr1:Address)-[:IN_CITY]->(city1:City)
+ -[:IN_STATE]->(state:State)
+ SET user1 = {id: "1", firstName: "First", lastName: "Last"}, addr1 = {city: "some city", street: "some street"}, city1 = {name: "city1 name!", population: 8947975}, state = {someValue: 4797}
+ CREATE (user2:User)-[:LIVES_AT]->(addr2:Address)-[:IN_CITY]->(city2:City)
+ -[:IN_STATE]->(state)
+ SET user2 = {id: "2", firstName: "New First", lastName: "new-last"}, addr2 = {city: "another-city", street: "another-street"}, city2 = {name: "city2 name?", population: 74}
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+query User {
+  users {
+    fullName
+    address {
+      street
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:User)
+CALL {
+    WITH this
+    MATCH (this)-[this0:LIVES_AT]->(this1:Address)
+    CALL {
+        WITH this1
+        MATCH (this1)-[this2:IN_CITY]->(this3:City)
+        CALL {
+            WITH this3
+            MATCH (this3)-[this4:IN_STATE]->(this5:State)
+            WITH this5 { .someValue } AS this5
+            RETURN head(collect(this5)) AS var6
+        }
+        WITH this3 { .name, .population, state: var6 } AS this3
+        RETURN head(collect(this3)) AS var7
+    }
+    WITH this1 { .street, city: var7 } AS this1
+    RETURN head(collect(this1)) AS var8
+}
+RETURN this { .fullName, .firstName, .lastName, address: var8 } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "users": [
+    {
+      "fullName": "First Last from city1 name! with population of 8947975 with 4797",
+      "address": {
+        "street": "some street"
+      }
+    },
+    {
+      "fullName": "New First new-last from city2 name? with population of 74 with 4797",
+      "address": {
+        "street": "another-street"
+      }
+    }
+  ]
+}
+----
+
+=== should be able to require fields from a related union
+
+.Schema
+[source,graphql,schema=true]
+----
+union Publication = Book | Journal
+
+type Author {
+  name: String!
+  publications: [Publication!]! @relationship(type: "WROTE", direction: OUT)
+  publicationsWithAuthor: [String!]! @customResolver(requires: "name publications { ...on Book { title } ... on Journal { subject } }")
+}
+
+type Book {
+  title: String!
+  author: Author! @relationship(type: "WROTE", direction: IN)
+}
+
+type Journal {
+  subject: String!
+  author: Author! @relationship(type: "WROTE", direction: IN)
+}
+----
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (author1:Author)-[:WROTE]->(book1:Book) SET author1 = {name: "some-author-name"}, book1 = {title: "a book name", publicationYear: 12}
+ CREATE (author2:Author)-[:WROTE]->(journal1:Journal) SET author2 = {name: "another author name"}, journal1 = {subject: "a subject", publicationYear: 573}
+ CREATE (author2)-[:WROTE]->(journal2:Journal) SET journal2 = {subject: "a second subject", publicationYear: 9087}
+ CREATE (author2)-[:WROTE]->(book2:Book) SET book2 = {title: "another-book-name", publicationYear: 1074}
+ CREATE (author1)-[:WROTE]->(journal1)
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+query Author {
+  authors {
+    publicationsWithAuthor
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Author)
+CALL {
+    WITH this
+    CALL {
+        WITH *
+        MATCH (this)-[this0:WROTE]->(this1:Book)
+        WITH this1 { .title, __typename: "Book", __id: toString(id(this1)) } AS this1
+        RETURN this1 AS var2
+        UNION
+        WITH *
+        MATCH (this)-[this3:WROTE]->(this4:Journal)
+        WITH this4 { .subject, __typename: "Journal", __id: toString(id(this4)) } AS this4
+        RETURN this4 AS var2
+    }
+    WITH var2
+    RETURN collect(var2) AS var2
+}
+RETURN this { .publicationsWithAuthor, .name, publications: var2 } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "authors": [
+    {
+      "publicationsWithAuthor": [
+        "a book name by some-author-name",
+        "a subject by some-author-name"
+      ]
+    },
+    {
+      "publicationsWithAuthor": [
+        "another-book-name by another author name",
+        "a subject by another author name",
+        "a second subject by another author name"
+      ]
+    }
+  ]
+}
+----
+
+=== should select @alias fields
+
+.Schema
+[source,graphql,schema=true]
+----
+type City {
+  name: String!
+  population: Int @alias(property: "cityPopulation")
+}
+
+type Address {
+  street: String!
+  city: City! @relationship(type: "IN_CITY", direction: OUT)
+}
+
+type User {
+  id: ID!
+  firstName: String! @alias(property: "first")
+  lastName: String!
+  address: Address @relationship(type: "LIVES_AT", direction: OUT)
+  fullName: String @customResolver(requires: "firstName lastName address { city { name population } }")
+}
+----
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (user1:User)-[:LIVES_AT]->(addr1:Address)-[:IN_CITY]->(city1:City)
+ SET user1 = {id: "1", first: "First", lastName: "Last"}, addr1 = {city: "some city", street: "some street"}, city1 = {name: "city1 name!", cityPopulation: 8947975}
+ CREATE (user2:User)-[:LIVES_AT]->(addr2:Address)-[:IN_CITY]->(city2:City)
+ SET user2 = {id: "2", first: "New First", lastName: "new-last"}, addr2 = {city: "another-city", street: "another-street"}, city2 = {name: "city2 name?", cityPopulation: 74}
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+query User {
+  users {
+    firstName
+    fullName
+    address {
+      street
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:User)
+CALL {
+    WITH this
+    MATCH (this)-[this0:LIVES_AT]->(this1:Address)
+    CALL {
+        WITH this1
+        MATCH (this1)-[this2:IN_CITY]->(this3:City)
+        WITH this3 { .name, population: this3.cityPopulation } AS this3
+        RETURN head(collect(this3)) AS var4
+    }
+    WITH this1 { .street, city: var4 } AS this1
+    RETURN head(collect(this1)) AS var5
+}
+RETURN this { .fullName, .lastName, firstName: this.first, address: var5 } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "users": [
+    {
+      "firstName": "First",
+      "fullName": "First Last from city1 name! with population of 8947975",
+      "address": {
+        "street": "some street"
+      }
+    },
+    {
+      "firstName": "New First",
+      "fullName": "New First new-last from city2 name? with population of 74",
+      "address": {
+        "street": "another-street"
+      }
+    }
+  ]
+}
+----
+
+=== should be able to require fields from a related interface
+
+.Schema
+[source,graphql,schema=true]
+----
+interface Publication {
+  publicationYear: Int!
+}
+
+type Author {
+  name: String!
+  publications: [Publication!]! @relationship(type: "WROTE", direction: OUT)
+  publicationsWithAuthor: [String!]! @customResolver(requires: "name publications { publicationYear ...on Book { title } ... on Journal { subject } }")
+}
+
+type Book implements Publication {
+  title: String!
+  publicationYear: Int!
+  author: [Author!]! @relationship(type: "WROTE", direction: IN)
+}
+
+type Journal implements Publication {
+  subject: String!
+  publicationYear: Int!
+  author: [Author!]! @relationship(type: "WROTE", direction: IN)
+}
+----
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (author1:Author)-[:WROTE]->(book1:Book) SET author1 = {name: "some-author-name"}, book1 = {title: "a book name", publicationYear: 12}
+ CREATE (author2:Author)-[:WROTE]->(journal1:Journal) SET author2 = {name: "another author name"}, journal1 = {subject: "a subject", publicationYear: 573}
+ CREATE (author1)-[:WROTE]->(journal1)
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+query Author {
+  authors {
+    publicationsWithAuthor
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Author)
+CALL {
+    WITH this
+    CALL {
+        WITH *
+        MATCH (this)-[this0:WROTE]->(this1:Book)
+        WITH this1 { .publicationYear, .title, __typename: "Book", __id: toString(id(this1)) } AS this1
+        RETURN this1 AS var2
+        UNION
+        WITH *
+        MATCH (this)-[this3:WROTE]->(this4:Journal)
+        WITH this4 { .publicationYear, .subject, __typename: "Journal", __id: toString(id(this4)) } AS this4
+        RETURN this4 AS var2
+    }
+    WITH var2
+    RETURN collect(var2) AS var2
+}
+RETURN this { .publicationsWithAuthor, .name, publications: var2 } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "authors": [
+    {
+      "publicationsWithAuthor": [
+        "a book name by some-author-name in 12",
+        "a subject by some-author-name in 573"
+      ]
+    },
+    {
+      "publicationsWithAuthor": [
+        "a subject by another author name in 573"
+      ]
+    }
+  ]
+}
+----
+
+=== should be able to require fields from a nested related interface
+
+.Schema
+[source,graphql,schema=true]
+----
+interface Publication {
+  publicationYear: Int!
+}
+
+type User {
+  id: ID!
+  firstName: String!
+  lastName: String!
+  followedAuthors: [Author!]! @relationship(type: "FOLLOWS", direction: OUT)
+  customResolverField: Int @customResolver(requires: "followedAuthors { name publications { publicationYear ...on Book { title } ... on Journal { subject } } } firstName")
+}
+
+type Author {
+  name: String!
+  publications: [Publication!]! @relationship(type: "WROTE", direction: OUT)
+}
+
+type Book implements Publication {
+  title: String!
+  publicationYear: Int!
+  author: [Author!]! @relationship(type: "WROTE", direction: IN)
+}
+
+type Journal implements Publication {
+  subject: String!
+  publicationYear: Int!
+  author: [Author!]! @relationship(type: "WROTE", direction: IN)
+}
+----
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (user1:User)-[:FOLLOWS]->(author1:Author)-[:WROTE]->(book1:Book)
+ SET user1 = {id: "1", firstName: "First", lastName: "Last"}, author1 = {name: "some-author-name"}, book1 = {title: "a book name", publicationYear: 12}
+ CREATE (user1)-[:FOLLOWS]->(author2:Author)-[:WROTE]->(journal1:Journal) SET author2 = {name: "another author name"}, journal1 = {subject: "a subject", publicationYear: 573}
+ CREATE (author1)-[:WROTE]->(journal1)
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+query User {
+  users {
+    customResolverField
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:User)
+CALL {
+    WITH this
+    MATCH (this)-[this0:FOLLOWS]->(this1:Author)
+    CALL {
+        WITH this1
+        CALL {
+            WITH *
+            MATCH (this1)-[this2:WROTE]->(this3:Book)
+            WITH this3 { .publicationYear, .title, __typename: "Book", __id: toString(id(this3)) } AS this3
+            RETURN this3 AS var4
+            UNION
+            WITH *
+            MATCH (this1)-[this5:WROTE]->(this6:Journal)
+            WITH this6 { .publicationYear, .subject, __typename: "Journal", __id: toString(id(this6)) } AS this6
+            RETURN this6 AS var4
+        }
+        WITH var4
+        RETURN collect(var4) AS var4
+    }
+    WITH this1 { .name, publications: var4 } AS this1
+    RETURN collect(this1) AS var7
+}
+RETURN this { .customResolverField, .firstName, followedAuthors: var7 } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "users": [
+    {
+      "customResolverField": 1216
+    }
+  ]
+}
+----
+
+=== should be able to require fields from a nested related union
+
+.Schema
+[source,graphql,schema=true]
+----
+type User {
+  id: ID!
+  firstName: String!
+  lastName: String!
+  followedAuthors: [Author!]! @relationship(type: "FOLLOWS", direction: OUT)
+  customResolverField: Int @customResolver(requires: "followedAuthors { name publications { ...on Book { title } ... on Journal { subject } } } firstName")
+}
+
+union Publication = Book | Journal
+
+type Author {
+  name: String!
+  publications: [Publication!]! @relationship(type: "WROTE", direction: OUT)
+}
+
+type Book {
+  title: String!
+  author: Author! @relationship(type: "WROTE", direction: IN)
+}
+
+type Journal {
+  subject: String!
+  author: Author! @relationship(type: "WROTE", direction: IN)
+}
+----
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (user1:User)-[:FOLLOWS]->(author1:Author)-[:WROTE]->(book1:Book)
+ SET user1 = {id: "1", firstName: "First", lastName: "Last"}, author1 = {name: "some-author-name"}, book1 = {title: "a book name", publicationYear: 12}
+ CREATE (user1)-[:FOLLOWS]->(author2:Author)-[:WROTE]->(journal1:Journal) SET author2 = {name: "another author name"}, journal1 = {subject: "a subject", publicationYear: 573}
+ CREATE (author1)-[:WROTE]->(journal1)
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+query User {
+  users {
+    customResolverField
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:User)
+CALL {
+    WITH this
+    MATCH (this)-[this0:FOLLOWS]->(this1:Author)
+    CALL {
+        WITH this1
+        CALL {
+            WITH *
+            MATCH (this1)-[this2:WROTE]->(this3:Book)
+            WITH this3 { .title, __typename: "Book", __id: toString(id(this3)) } AS this3
+            RETURN this3 AS var4
+            UNION
+            WITH *
+            MATCH (this1)-[this5:WROTE]->(this6:Journal)
+            WITH this6 { .subject, __typename: "Journal", __id: toString(id(this6)) } AS this6
+            RETURN this6 AS var4
+        }
+        WITH var4
+        RETURN collect(var4) AS var4
+    }
+    WITH this1 { .name, publications: var4 } AS this1
+    RETURN collect(this1) AS var7
+}
+RETURN this { .customResolverField, .firstName, followedAuthors: var7 } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "users": [
+    {
+      "customResolverField": 58
+    }
+  ]
+}
+----
diff --git a/core/src/test/resources/integration-test-files/directives/default.adoc b/core/src/test/resources/integration-test-files/directives/default.adoc
deleted file mode 100644
index 587720be..00000000
--- a/core/src/test/resources/integration-test-files/directives/default.adoc
+++ /dev/null
@@ -1,200 +0,0 @@
-:toc:
-:toclevels: 42
-
-= @default directive
-
-== with primitive fields
-
-=== on primitive field should not throw an error
-
-.Schema
-[source,graphql,schema=true]
-----
-type User {
-  name: String!
-  location: String! @default(value: "somewhere")
-}
-----
-
-.Augmented Schema
-[source,graphql]
-----
-schema {
-  query: Query
-}
-
-"""Pagination information (Relay)"""
-type PageInfo {
-  endCursor: String
-  hasNextPage: Boolean!
-  hasPreviousPage: Boolean!
-  startCursor: String
-}
-
-type Query {
-  users(options: UserOptions, where: UserWhere): [User!]!
-  usersConnection(after: String, first: Int, sort: [UserSort], where: UserWhere): UsersConnection!
-}
-
-"""An enum for sorting in either ascending or descending order."""
-enum SortDirection {
-  """Sort by field values in ascending order."""
-  ASC
-  """Sort by field values in descending order."""
-  DESC
-}
-
-type User {
-  location: String!
-  name: String!
-}
-
-type UserEdge {
-  cursor: String!
-  node: User!
-}
-
-input UserOptions {
-  limit: Int
-  offset: Int
-  """
-  Specify one or more UserSort objects to sort Users by. The sorts will be applied in the order in which they are arranged in the array.
-  """
-  sort: [UserSort!]
-}
-
-"""
-Fields to sort Users by. The order in which sorts are applied is not guaranteed when specifying many fields in one UserSort object.
-"""
-input UserSort {
-  location: SortDirection
-  name: SortDirection
-}
-
-input UserWhere {
-  AND: [UserWhere!]
-  NOT: UserWhere
-  OR: [UserWhere!]
-  location: String
-  location_CONTAINS: String
-  location_ENDS_WITH: String
-  location_IN: [String!]
-  location_STARTS_WITH: String
-  name: String
-  name_CONTAINS: String
-  name_ENDS_WITH: String
-  name_IN: [String!]
-  name_STARTS_WITH: String
-}
-
-type UsersConnection {
-  edges: [UserEdge!]!
-  pageInfo: PageInfo!
-  totalCount: Int!
-}
-----
-
-'''
-
-== with enum fields
-
-=== on enum field should not throw an error
-
-.Schema
-[source,graphql,schema=true]
-----
-type User {
-  name: String!
-  location: Location! @default(value: HERE)
-}
-
-enum Location {
-  HERE
-  THERE
-  EVERYWHERE
-}
-----
-
-.Augmented Schema
-[source,graphql]
-----
-schema {
-  query: Query
-}
-
-enum Location {
-  EVERYWHERE
-  HERE
-  THERE
-}
-
-"""Pagination information (Relay)"""
-type PageInfo {
-  endCursor: String
-  hasNextPage: Boolean!
-  hasPreviousPage: Boolean!
-  startCursor: String
-}
-
-type Query {
-  users(options: UserOptions, where: UserWhere): [User!]!
-  usersConnection(after: String, first: Int, sort: [UserSort], where: UserWhere): UsersConnection!
-}
-
-"""An enum for sorting in either ascending or descending order."""
-enum SortDirection {
-  """Sort by field values in ascending order."""
-  ASC
-  """Sort by field values in descending order."""
-  DESC
-}
-
-type User {
-  location: Location!
-  name: String!
-}
-
-type UserEdge {
-  cursor: String!
-  node: User!
-}
-
-input UserOptions {
-  limit: Int
-  offset: Int
-  """
-  Specify one or more UserSort objects to sort Users by. The sorts will be applied in the order in which they are arranged in the array.
-  """
-  sort: [UserSort!]
-}
-
-"""
-Fields to sort Users by. The order in which sorts are applied is not guaranteed when specifying many fields in one UserSort object.
-"""
-input UserSort {
-  location: SortDirection
-  name: SortDirection
-}
-
-input UserWhere {
-  AND: [UserWhere!]
-  NOT: UserWhere
-  OR: [UserWhere!]
-  location: Location
-  location_IN: [Location!]
-  name: String
-  name_CONTAINS: String
-  name_ENDS_WITH: String
-  name_IN: [String!]
-  name_STARTS_WITH: String
-}
-
-type UsersConnection {
-  edges: [UserEdge!]!
-  pageInfo: PageInfo!
-  totalCount: Int!
-}
-----
-
-'''
-
diff --git a/core/src/test/resources/integration-test-files/directives/node/label.adoc b/core/src/test/resources/integration-test-files/directives/node/label.adoc
index 819f9700..3f4943b3 100644
--- a/core/src/test/resources/integration-test-files/directives/node/label.adoc
+++ b/core/src/test/resources/integration-test-files/directives/node/label.adoc
@@ -23,7 +23,7 @@ type Movie @node(labels: ["Film"]) {
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies {
@@ -35,7 +35,7 @@ type Movie @node(labels: ["Film"]) {
 .Expected Cypher params
 [source,json]
 ----
-{}
+{ }
 ----
 
 .Expected Cypher output
@@ -51,12 +51,8 @@ RETURN this {
 [source,json,response=true]
 ----
 {
-  "movies": [
-    {
-      "title": "The Matrix"
-    }
-  ]
+  "movies" : [ {
+    "title" : "The Matrix"
+  } ]
 }
 ----
-
-'''
diff --git a/core/src/test/resources/integration-test-files/directives/node/label.js.adoc b/core/src/test/resources/integration-test-files/directives/node/label.js.adoc
new file mode 100644
index 00000000..6491adc3
--- /dev/null
+++ b/core/src/test/resources/integration-test-files/directives/node/label.js.adoc
@@ -0,0 +1,59 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= Node directive labels
+
+== Setup
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (m:Film {title: "The Matrix",year:1999})
+----
+
+== custom labels
+
+.Schema
+[source,graphql,schema=true]
+----
+type Movie @node(labels: ["Film"]) {
+  id: ID
+  title: String
+}
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies {
+    title
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Film)
+RETURN this { .title } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "movies": [
+    {
+      "title": "The Matrix"
+    }
+  ]
+}
+----
diff --git a/core/src/test/resources/integration-test-files/filtering/advanced-filtering.adoc b/core/src/test/resources/integration-test-files/filtering/advanced-filtering.adoc
index 79783bed..399108fc 100644
--- a/core/src/test/resources/integration-test-files/filtering/advanced-filtering.adoc
+++ b/core/src/test/resources/integration-test-files/filtering/advanced-filtering.adoc
@@ -24,7 +24,7 @@ CREATE (:Movie {property: "RandomString1"})
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies(
@@ -39,11 +39,7 @@ CREATE (:Movie {property: "RandomString1"})
 [source,json]
 ----
 {
-  "param0": [
-    "RandomString1",
-    "RandomString2",
-    "RandomString3"
-  ]
+  "param0" : [ "RandomString1", "RandomString2", "RandomString3" ]
 }
 ----
 
@@ -61,26 +57,22 @@ RETURN this {
 [source,json,response=true]
 ----
 {
-  "movies": [
-    {
-      "property": "RandomString1"
-    }
-  ]
+  "movies" : [ {
+    "property" : "RandomString1"
+  } ]
 }
 ----
 
-'''
-
 === should find Movies REGEX
 
 .Configuration
 [source,json,schema-config=true]
 ----
 {
-  "features": {
-    "filters": {
-      "ID": {
-        "MATCHES": true
+  "features" : {
+    "filters" : {
+      "ID" : {
+        "MATCHES" : true
       }
     }
   }
@@ -94,7 +86,7 @@ CREATE (:Movie {property: "RandomString1RandomString1"})
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies(where: {property_MATCHES: "(?i)RandomString1.*"}) {
@@ -107,7 +99,7 @@ CREATE (:Movie {property: "RandomString1RandomString1"})
 [source,json]
 ----
 {
-  "param0": "(?i)RandomString1.*"
+  "param0" : "(?i)RandomString1.*"
 }
 ----
 
@@ -125,16 +117,12 @@ RETURN this {
 [source,json,response=true]
 ----
 {
-  "movies": [
-    {
-      "property": "RandomString1RandomString1"
-    }
-  ]
+  "movies" : [ {
+    "property" : "RandomString1RandomString1"
+  } ]
 }
 ----
 
-'''
-
 === should find Movies CONTAINS string
 
 .Test Data
@@ -146,7 +134,7 @@ CREATE (:Movie {property: "RandomString1RandomString1"})
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies(where: {property_CONTAINS: "RandomString1"}) {
@@ -159,7 +147,7 @@ CREATE (:Movie {property: "RandomString1RandomString1"})
 [source,json]
 ----
 {
-  "param0": "RandomString1"
+  "param0" : "RandomString1"
 }
 ----
 
@@ -177,22 +165,16 @@ RETURN this {
 [source,json,response=true,ignore-order]
 ----
 {
-  "movies": [
-    {
-      "property": "RandomString1RandomString1"
-    },
-    {
-      "property": "RandomString1RandomString1"
-    },
-    {
-      "property": "RandomString1RandomString1"
-    }
-  ]
+  "movies" : [ {
+    "property" : "RandomString1RandomString1"
+  }, {
+    "property" : "RandomString1RandomString1"
+  }, {
+    "property" : "RandomString1RandomString1"
+  } ]
 }
 ----
 
-'''
-
 === should find Movies STARTS_WITH string
 
 .Test Data
@@ -204,7 +186,7 @@ CREATE (:Movie {property: "RandomString1RandomString1"})
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies(where: {property_STARTS_WITH: "RandomString1"}) {
@@ -217,7 +199,7 @@ CREATE (:Movie {property: "RandomString1RandomString1"})
 [source,json]
 ----
 {
-  "param0": "RandomString1"
+  "param0" : "RandomString1"
 }
 ----
 
@@ -235,22 +217,16 @@ RETURN this {
 [source,json,response=true,ignore-order]
 ----
 {
-  "movies": [
-    {
-      "property": "RandomString1RandomString1"
-    },
-    {
-      "property": "RandomString1RandomString1"
-    },
-    {
-      "property": "RandomString1RandomString1"
-    }
-  ]
+  "movies" : [ {
+    "property" : "RandomString1RandomString1"
+  }, {
+    "property" : "RandomString1RandomString1"
+  }, {
+    "property" : "RandomString1RandomString1"
+  } ]
 }
 ----
 
-'''
-
 === should find Movies ENDS_WITH string
 
 .Test Data
@@ -262,7 +238,7 @@ CREATE (:Movie {property: "RandomString1"})
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies(where: {property_ENDS_WITH: "RandomString1"}) {
@@ -275,7 +251,7 @@ CREATE (:Movie {property: "RandomString1"})
 [source,json]
 ----
 {
-  "param0": "RandomString1"
+  "param0" : "RandomString1"
 }
 ----
 
@@ -293,19 +269,14 @@ RETURN this {
 [source,json,response=true,ignore-order]
 ----
 {
-  "movies": [
-    {
-      "property": "RandomString1"
-    },
-    {
-      "property": "RandomString1RandomString1"
-    }
-  ]
+  "movies" : [ {
+    "property" : "RandomString1"
+  }, {
+    "property" : "RandomString1RandomString1"
+  } ]
 }
 ----
 
-'''
-
 == String Filtering
 
 === Setup
@@ -327,7 +298,7 @@ CREATE (:Movie {property: "RandomString1"})
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies(
@@ -342,11 +313,7 @@ CREATE (:Movie {property: "RandomString1"})
 [source,json]
 ----
 {
-  "param0": [
-    "RandomString1",
-    "RandomString2",
-    "RandomString3"
-  ]
+  "param0" : [ "RandomString1", "RandomString2", "RandomString3" ]
 }
 ----
 
@@ -364,26 +331,22 @@ RETURN this {
 [source,json,response=true]
 ----
 {
-  "movies": [
-    {
-      "property": "RandomString1"
-    }
-  ]
+  "movies" : [ {
+    "property" : "RandomString1"
+  } ]
 }
 ----
 
-'''
-
 === should find Movies REGEX
 
 .Configuration
 [source,json,schema-config=true]
 ----
 {
-  "features": {
-    "filters": {
-      "String": {
-        "MATCHES": true
+  "features" : {
+    "filters" : {
+      "String" : {
+        "MATCHES" : true
       }
     }
   }
@@ -397,7 +360,7 @@ CREATE (:Movie {property: "RandomString1RandomString1"})
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies(where: {property_MATCHES: "(?i)RandomString1.*"}) {
@@ -410,7 +373,7 @@ CREATE (:Movie {property: "RandomString1RandomString1"})
 [source,json]
 ----
 {
-  "param0": "(?i)RandomString1.*"
+  "param0" : "(?i)RandomString1.*"
 }
 ----
 
@@ -428,16 +391,12 @@ RETURN this {
 [source,json,response=true]
 ----
 {
-  "movies": [
-    {
-      "property": "RandomString1RandomString1"
-    }
-  ]
+  "movies" : [ {
+    "property" : "RandomString1RandomString1"
+  } ]
 }
 ----
 
-'''
-
 === should find Movies CONTAINS string
 
 .Test Data
@@ -449,7 +408,7 @@ CREATE (:Movie {property: "RandomString1RandomString1"})
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies(where: {property_CONTAINS: "RandomString1"}) {
@@ -462,7 +421,7 @@ CREATE (:Movie {property: "RandomString1RandomString1"})
 [source,json]
 ----
 {
-  "param0": "RandomString1"
+  "param0" : "RandomString1"
 }
 ----
 
@@ -480,22 +439,16 @@ RETURN this {
 [source,json,response=true,ignore-order]
 ----
 {
-  "movies": [
-    {
-      "property": "RandomString1RandomString1"
-    },
-    {
-      "property": "RandomString1RandomString1"
-    },
-    {
-      "property": "RandomString1RandomString1"
-    }
-  ]
+  "movies" : [ {
+    "property" : "RandomString1RandomString1"
+  }, {
+    "property" : "RandomString1RandomString1"
+  }, {
+    "property" : "RandomString1RandomString1"
+  } ]
 }
 ----
 
-'''
-
 === should find Movies STARTS_WITH string
 
 .Test Data
@@ -507,7 +460,7 @@ CREATE (:Movie {property: "RandomString1RandomString1"})
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies(where: {property_STARTS_WITH: "RandomString1"}) {
@@ -520,7 +473,7 @@ CREATE (:Movie {property: "RandomString1RandomString1"})
 [source,json]
 ----
 {
-  "param0": "RandomString1"
+  "param0" : "RandomString1"
 }
 ----
 
@@ -538,22 +491,16 @@ RETURN this {
 [source,json,response=true,ignore-order]
 ----
 {
-  "movies": [
-    {
-      "property": "RandomString1RandomString1"
-    },
-    {
-      "property": "RandomString1RandomString1"
-    },
-    {
-      "property": "RandomString1RandomString1"
-    }
-  ]
+  "movies" : [ {
+    "property" : "RandomString1RandomString1"
+  }, {
+    "property" : "RandomString1RandomString1"
+  }, {
+    "property" : "RandomString1RandomString1"
+  } ]
 }
 ----
 
-'''
-
 === should find Movies ENDS_WITH string
 
 .Test Data
@@ -565,7 +512,7 @@ CREATE (:Movie {property: "RandomString1"})
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies(where: {property_ENDS_WITH: "RandomString1"}) {
@@ -578,7 +525,7 @@ CREATE (:Movie {property: "RandomString1"})
 [source,json]
 ----
 {
-  "param0": "RandomString1"
+  "param0" : "RandomString1"
 }
 ----
 
@@ -596,19 +543,14 @@ RETURN this {
 [source,json,response=true,ignore-order]
 ----
 {
-  "movies": [
-    {
-      "property": "RandomString1"
-    },
-    {
-      "property": "RandomString1RandomString1"
-    }
-  ]
+  "movies" : [ {
+    "property" : "RandomString1"
+  }, {
+    "property" : "RandomString1RandomString1"
+  } ]
 }
 ----
 
-'''
-
 == String Filtering
 
 === Setup
@@ -625,13 +567,13 @@ type Movie {
 [source,json,schema-config=true]
 ----
 {
-  "features": {
-    "filters": {
-      "String": {
-        "LT": true,
-        "GT": true,
-        "LTE": true,
-        "GTE": true
+  "features" : {
+    "filters" : {
+      "String" : {
+        "LT" : true,
+        "GT" : true,
+        "LTE" : true,
+        "GTE" : true
       }
     }
   }
@@ -650,7 +592,7 @@ CREATE (:Movie {title: "The Animatrix"})
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies(where: {title_GT: "The Matrix"}) {
@@ -663,7 +605,7 @@ CREATE (:Movie {title: "The Animatrix"})
 [source,json]
 ----
 {
-  "param0": "The Matrix"
+  "param0" : "The Matrix"
 }
 ----
 
@@ -681,19 +623,14 @@ RETURN this {
 [source,json,response=true,ignore-order]
 ----
 {
-  "movies": [
-    {
-      "title": "The Matrix Reloaded"
-    },
-    {
-      "title": "The Matrix Revolutions"
-    }
-  ]
+  "movies" : [ {
+    "title" : "The Matrix Reloaded"
+  }, {
+    "title" : "The Matrix Revolutions"
+  } ]
 }
 ----
 
-'''
-
 === should find Movies LT string
 
 .Test Data
@@ -706,7 +643,7 @@ CREATE (:Movie {title: "The Matrix"})
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies(where: {title_LT: "The Matrix Revolutions"}) {
@@ -719,7 +656,7 @@ CREATE (:Movie {title: "The Matrix"})
 [source,json]
 ----
 {
-  "param0": "The Matrix Revolutions"
+  "param0" : "The Matrix Revolutions"
 }
 ----
 
@@ -737,22 +674,16 @@ RETURN this {
 [source,json,response=true,ignore-order]
 ----
 {
-  "movies": [
-    {
-      "title": "The Matrix"
-    },
-    {
-      "title": "The Matrix Reloaded"
-    },
-    {
-      "title": "The Matrix Resurrections"
-    }
-  ]
+  "movies" : [ {
+    "title" : "The Matrix"
+  }, {
+    "title" : "The Matrix Reloaded"
+  }, {
+    "title" : "The Matrix Resurrections"
+  } ]
 }
 ----
 
-'''
-
 === should find Movies GTE string
 
 .Test Data
@@ -765,7 +696,7 @@ CREATE (:Movie {title: "The Animatrix"})
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies(where: {title_GTE: "The Matrix"}) {
@@ -778,7 +709,7 @@ CREATE (:Movie {title: "The Animatrix"})
 [source,json]
 ----
 {
-  "param0": "The Matrix"
+  "param0" : "The Matrix"
 }
 ----
 
@@ -796,22 +727,16 @@ RETURN this {
 [source,json,response=true,ignore-order]
 ----
 {
-  "movies": [
-    {
-      "title": "The Matrix"
-    },
-    {
-      "title": "The Matrix Reloaded"
-    },
-    {
-      "title": "The Matrix Revolutions"
-    }
-  ]
+  "movies" : [ {
+    "title" : "The Matrix"
+  }, {
+    "title" : "The Matrix Reloaded"
+  }, {
+    "title" : "The Matrix Revolutions"
+  } ]
 }
 ----
 
-'''
-
 === should find Movies LTE string
 
 .Test Data
@@ -824,7 +749,7 @@ CREATE (:Movie {title: "The Matrix"})
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies(where: {title_LTE: "The Matrix Revolutions"}) {
@@ -837,7 +762,7 @@ CREATE (:Movie {title: "The Matrix"})
 [source,json]
 ----
 {
-  "param0": "The Matrix Revolutions"
+  "param0" : "The Matrix Revolutions"
 }
 ----
 
@@ -855,25 +780,18 @@ RETURN this {
 [source,json,response=true,ignore-order]
 ----
 {
-  "movies": [
-    {
-      "title": "The Matrix"
-    },
-    {
-      "title": "The Matrix Reloaded"
-    },
-    {
-      "title": "The Matrix Revolutions"
-    },
-    {
-      "title": "The Matrix Resurrections"
-    }
-  ]
+  "movies" : [ {
+    "title" : "The Matrix"
+  }, {
+    "title" : "The Matrix Reloaded"
+  }, {
+    "title" : "The Matrix Revolutions"
+  }, {
+    "title" : "The Matrix Resurrections"
+  } ]
 }
 ----
 
-'''
-
 == Int Filtering
 
 === Setup
@@ -891,14 +809,14 @@ type Movie {
 .Test Data
 [source,cypher,test-data=true]
 ----
-CREATE (:Movie {property: 3931})
+CREATE (:Movie {property: 42})
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
-  movies(where: {property_IN: [3931, 3813, 1484]}) {
+  movies(where: {property_IN: [42, 84, 69]}) {
     property
   }
 }
@@ -908,11 +826,7 @@ CREATE (:Movie {property: 3931})
 [source,json]
 ----
 {
-  "param0": [
-    3931,
-    3813,
-    1484
-  ]
+  "param0" : [ 42, 84, 69 ]
 }
 ----
 
@@ -930,27 +844,23 @@ RETURN this {
 [source,json,response=true]
 ----
 {
-  "movies": [
-    {
-      "property": 3931
-    }
-  ]
+  "movies" : [ {
+    "property" : 42
+  } ]
 }
 ----
 
-'''
-
 === should find Movies LT number
 
 .Test Data
 [source,cypher,test-data=true]
 ----
-CREATE (:Movie {property: 1962})
+CREATE (:Movie {property: 42})
  CREATE (:Movie {property: -1})
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies(where: {property_LT: 0}) {
@@ -963,7 +873,7 @@ CREATE (:Movie {property: 1962})
 [source,json]
 ----
 {
-  "param0": 0
+  "param0" : 0
 }
 ----
 
@@ -981,30 +891,26 @@ RETURN this {
 [source,json,response=true]
 ----
 {
-  "movies": [
-    {
-      "property": -1
-    }
-  ]
+  "movies" : [ {
+    "property" : -1
+  } ]
 }
 ----
 
-'''
-
 === should find Movies LTE number
 
 .Test Data
 [source,cypher,test-data=true]
 ----
-CREATE (:Movie {property: 73})
+CREATE (:Movie {property: 42})
  CREATE (:Movie {property: -1})
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
-  movies(where: {property_LTE: 73}) {
+  movies(where: {property_LTE: 42}) {
     property
   }
 }
@@ -1014,7 +920,7 @@ CREATE (:Movie {property: 73})
 [source,json]
 ----
 {
-  "param0": 73
+  "param0" : 42
 }
 ----
 
@@ -1032,33 +938,28 @@ RETURN this {
 [source,json,response=true,ignore-order]
 ----
 {
-  "movies": [
-    {
-      "property": -1
-    },
-    {
-      "property": 73
-    }
-  ]
+  "movies" : [ {
+    "property" : 42
+  }, {
+    "property" : -1
+  } ]
 }
 ----
 
-'''
-
 === should find Movies GT number
 
 .Test Data
 [source,cypher,test-data=true]
 ----
-CREATE (:Movie {property: 3996})
- CREATE (:Movie {property: 3997})
+CREATE (:Movie {property: 42})
+ CREATE (:Movie {property: 43})
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
-  movies(where: {property_GT: 3996}) {
+  movies(where: {property_GT: 42}) {
     property
   }
 }
@@ -1068,7 +969,7 @@ CREATE (:Movie {property: 3996})
 [source,json]
 ----
 {
-  "param0": 3996
+  "param0" : 42
 }
 ----
 
@@ -1086,30 +987,26 @@ RETURN this {
 [source,json,response=true]
 ----
 {
-  "movies": [
-    {
-      "property": 3997
-    }
-  ]
+  "movies" : [ {
+    "property" : 43
+  } ]
 }
 ----
 
-'''
-
 === should find Movies GTE number
 
 .Test Data
 [source,cypher,test-data=true]
 ----
-CREATE (:Movie {property: 926})
- CREATE (:Movie {property: 927})
+CREATE (:Movie {property: 42})
+ CREATE (:Movie {property: 43})
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
-  movies(where: {property_GTE: 926}) {
+  movies(where: {property_GTE: 42}) {
     property
   }
 }
@@ -1119,7 +1016,7 @@ CREATE (:Movie {property: 926})
 [source,json]
 ----
 {
-  "param0": 926
+  "param0" : 42
 }
 ----
 
@@ -1137,19 +1034,14 @@ RETURN this {
 [source,json,response=true,ignore-order]
 ----
 {
-  "movies": [
-    {
-      "property": 926
-    },
-    {
-      "property": 927
-    }
-  ]
+  "movies" : [ {
+    "property" : 42
+  }, {
+    "property" : 43
+  } ]
 }
 ----
 
-'''
-
 == Float Filtering
 
 === Setup
@@ -1167,14 +1059,14 @@ type Movie {
 .Test Data
 [source,cypher,test-data=true]
 ----
-CREATE (:Movie {property: 3370.5})
+CREATE (:Movie {property: 4.2})
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
-  movies(where: {property_IN: [3370.5, 6229.5, 4440.5]}) {
+  movies(where: {property_IN: [4.2, 8.4, 6.9]}) {
     property
   }
 }
@@ -1184,11 +1076,7 @@ CREATE (:Movie {property: 3370.5})
 [source,json]
 ----
 {
-  "param0": [
-    3370.5,
-    6229.5,
-    4440.5
-  ]
+  "param0" : [ 4.2, 8.4, 6.9 ]
 }
 ----
 
@@ -1206,27 +1094,23 @@ RETURN this {
 [source,json,response=true]
 ----
 {
-  "movies": [
-    {
-      "property": 3370.5
-    }
-  ]
+  "movies" : [ {
+    "property" : 4.2
+  } ]
 }
 ----
 
-'''
-
 === should find Movies LT number
 
 .Test Data
 [source,cypher,test-data=true]
 ----
-CREATE (:Movie {property: 3609.5})
+CREATE (:Movie {property: 4.2})
  CREATE (:Movie {property: -1})
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies(where: {property_LT: 0}) {
@@ -1239,7 +1123,7 @@ CREATE (:Movie {property: 3609.5})
 [source,json]
 ----
 {
-  "param0": 0
+  "param0" : 0
 }
 ----
 
@@ -1257,30 +1141,26 @@ RETURN this {
 [source,json,response=true]
 ----
 {
-  "movies": [
-    {
-      "property": -1
-    }
-  ]
+  "movies" : [ {
+    "property" : -1.0
+  } ]
 }
 ----
 
-'''
-
 === should find Movies LTE number
 
 .Test Data
 [source,cypher,test-data=true]
 ----
-CREATE (:Movie {property: 5016.5})
+CREATE (:Movie {property: 4.2})
  CREATE (:Movie {property: -1})
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
-  movies(where: {property_LTE: 5016.5}) {
+  movies(where: {property_LTE: 4.2}) {
     property
   }
 }
@@ -1290,7 +1170,7 @@ CREATE (:Movie {property: 5016.5})
 [source,json]
 ----
 {
-  "param0": 5016.5
+  "param0" : 4.2
 }
 ----
 
@@ -1308,33 +1188,28 @@ RETURN this {
 [source,json,response=true,ignore-order]
 ----
 {
-  "movies": [
-    {
-      "property": 5016.5
-    },
-    {
-      "property": -1
-    }
-  ]
+  "movies" : [ {
+    "property" : 4.2
+  }, {
+    "property" : -1.0
+  } ]
 }
 ----
 
-'''
-
 === should find Movies GT number
 
 .Test Data
 [source,cypher,test-data=true]
 ----
-CREATE (:Movie {property: 6420.5})
- CREATE (:Movie {property: 6421.5})
+CREATE (:Movie {property: 4.2})
+ CREATE (:Movie {property: 5.2})
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
-  movies(where: {property_GT: 6420.5}) {
+  movies(where: {property_GT: 4.2}) {
     property
   }
 }
@@ -1344,7 +1219,7 @@ CREATE (:Movie {property: 6420.5})
 [source,json]
 ----
 {
-  "param0": 6420.5
+  "param0" : 4.2
 }
 ----
 
@@ -1362,30 +1237,26 @@ RETURN this {
 [source,json,response=true]
 ----
 {
-  "movies": [
-    {
-      "property": 6421.5
-    }
-  ]
+  "movies" : [ {
+    "property" : 5.2
+  } ]
 }
 ----
 
-'''
-
 === should find Movies GTE number
 
 .Test Data
 [source,cypher,test-data=true]
 ----
-CREATE (:Movie {property: 4565.5})
- CREATE (:Movie {property: 4566.5})
+CREATE (:Movie {property: 4.2})
+ CREATE (:Movie {property: 5.2})
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
-  movies(where: {property_GTE: 4565.5}) {
+  movies(where: {property_GTE: 4.2}) {
     property
   }
 }
@@ -1395,7 +1266,7 @@ CREATE (:Movie {property: 4565.5})
 [source,json]
 ----
 {
-  "param0": 4565.5
+  "param0" : 4.2
 }
 ----
 
@@ -1413,19 +1284,14 @@ RETURN this {
 [source,json,response=true,ignore-order]
 ----
 {
-  "movies": [
-    {
-      "property": 4565.5
-    },
-    {
-      "property": 4566.5
-    }
-  ]
+  "movies" : [ {
+    "property" : 4.2
+  }, {
+    "property" : 5.2
+  } ]
 }
 ----
 
-'''
-
 == Boolean Filtering
 
 === Setup
@@ -1447,7 +1313,7 @@ CREATE (:Movie {property: false})
 === should find Movies equality equality
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies(where: {property: false}) {
@@ -1460,7 +1326,7 @@ CREATE (:Movie {property: false})
 [source,json]
 ----
 {
-  "param0": false
+  "param0" : false
 }
 ----
 
@@ -1478,13 +1344,8 @@ RETURN this {
 [source,json,response=true]
 ----
 {
-  "movies": [
-    {
-      "property": false
-    }
-  ]
+  "movies" : [ {
+    "property" : false
+  } ]
 }
 ----
-
-'''
-
diff --git a/core/src/test/resources/integration-test-files/filtering/advanced-filtering.js.adoc b/core/src/test/resources/integration-test-files/filtering/advanced-filtering.js.adoc
new file mode 100644
index 00000000..26f5d8cb
--- /dev/null
+++ b/core/src/test/resources/integration-test-files/filtering/advanced-filtering.js.adoc
@@ -0,0 +1,1390 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= Advanced Filtering
+
+== ID Filtering
+
+=== Setup
+
+.Schema
+[source,graphql,schema=true]
+----
+type Movie {
+  property: ID
+}
+----
+
+=== should find Movies IN strings
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (:Movie {property: "RandomString1"})
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies(
+    where: {property_IN: ["RandomString1", "RandomString2", "RandomString3"]}
+  ) {
+    property
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": [
+    "RandomString1",
+    "RandomString2",
+    "RandomString3"
+  ]
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE this.property IN $param0
+RETURN this { .property } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "movies": [
+    {
+      "property": "RandomString1"
+    }
+  ]
+}
+----
+
+=== should find Movies REGEX
+
+.Configuration
+[source,json,schema-config=true]
+----
+{
+  "features": {
+    "filters": {
+      "ID": {
+        "MATCHES": true
+      }
+    }
+  }
+}
+----
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (:Movie {property: "RandomString1RandomString1"})
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies(where: {property_MATCHES: "(?i)RandomString1.*"}) {
+    property
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "(?i)RandomString1.*"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE this.property =~ $param0
+RETURN this { .property } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "movies": [
+    {
+      "property": "RandomString1RandomString1"
+    }
+  ]
+}
+----
+
+=== should find Movies CONTAINS string
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (:Movie {property: "RandomString1RandomString1"})
+ CREATE (:Movie {property: "RandomString1RandomString1"})
+ CREATE (:Movie {property: "RandomString1RandomString1"})
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies(where: {property_CONTAINS: "RandomString1"}) {
+    property
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "RandomString1"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE this.property CONTAINS $param0
+RETURN this { .property } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "movies": [
+    {
+      "property": "RandomString1RandomString1"
+    },
+    {
+      "property": "RandomString1RandomString1"
+    },
+    {
+      "property": "RandomString1RandomString1"
+    }
+  ]
+}
+----
+
+=== should find Movies STARTS_WITH string
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (:Movie {property: "RandomString1RandomString1"})
+ CREATE (:Movie {property: "RandomString1RandomString1"})
+ CREATE (:Movie {property: "RandomString1RandomString1"})
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies(where: {property_STARTS_WITH: "RandomString1"}) {
+    property
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "RandomString1"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE this.property STARTS WITH $param0
+RETURN this { .property } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "movies": [
+    {
+      "property": "RandomString1RandomString1"
+    },
+    {
+      "property": "RandomString1RandomString1"
+    },
+    {
+      "property": "RandomString1RandomString1"
+    }
+  ]
+}
+----
+
+=== should find Movies ENDS_WITH string
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (:Movie {property: "RandomString1"})
+ CREATE (:Movie {property: "RandomString2"})
+ CREATE (:Movie {property: "RandomString1RandomString1"})
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies(where: {property_ENDS_WITH: "RandomString1"}) {
+    property
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "RandomString1"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE this.property ENDS WITH $param0
+RETURN this { .property } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "movies": [
+    {
+      "property": "RandomString1"
+    },
+    {
+      "property": "RandomString1RandomString1"
+    }
+  ]
+}
+----
+
+== String Filtering
+
+=== Setup
+
+.Schema
+[source,graphql,schema=true]
+----
+type Movie {
+  property: String
+}
+----
+
+=== should find Movies IN strings
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (:Movie {property: "RandomString1"})
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies(
+    where: {property_IN: ["RandomString1", "RandomString2", "RandomString3"]}
+  ) {
+    property
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": [
+    "RandomString1",
+    "RandomString2",
+    "RandomString3"
+  ]
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE this.property IN $param0
+RETURN this { .property } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "movies": [
+    {
+      "property": "RandomString1"
+    }
+  ]
+}
+----
+
+=== should find Movies REGEX
+
+.Configuration
+[source,json,schema-config=true]
+----
+{
+  "features": {
+    "filters": {
+      "String": {
+        "MATCHES": true
+      }
+    }
+  }
+}
+----
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (:Movie {property: "RandomString1RandomString1"})
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies(where: {property_MATCHES: "(?i)RandomString1.*"}) {
+    property
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "(?i)RandomString1.*"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE this.property =~ $param0
+RETURN this { .property } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "movies": [
+    {
+      "property": "RandomString1RandomString1"
+    }
+  ]
+}
+----
+
+=== should find Movies CONTAINS string
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (:Movie {property: "RandomString1RandomString1"})
+ CREATE (:Movie {property: "RandomString1RandomString1"})
+ CREATE (:Movie {property: "RandomString1RandomString1"})
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies(where: {property_CONTAINS: "RandomString1"}) {
+    property
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "RandomString1"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE this.property CONTAINS $param0
+RETURN this { .property } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "movies": [
+    {
+      "property": "RandomString1RandomString1"
+    },
+    {
+      "property": "RandomString1RandomString1"
+    },
+    {
+      "property": "RandomString1RandomString1"
+    }
+  ]
+}
+----
+
+=== should find Movies STARTS_WITH string
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (:Movie {property: "RandomString1RandomString1"})
+ CREATE (:Movie {property: "RandomString1RandomString1"})
+ CREATE (:Movie {property: "RandomString1RandomString1"})
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies(where: {property_STARTS_WITH: "RandomString1"}) {
+    property
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "RandomString1"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE this.property STARTS WITH $param0
+RETURN this { .property } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "movies": [
+    {
+      "property": "RandomString1RandomString1"
+    },
+    {
+      "property": "RandomString1RandomString1"
+    },
+    {
+      "property": "RandomString1RandomString1"
+    }
+  ]
+}
+----
+
+=== should find Movies ENDS_WITH string
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (:Movie {property: "RandomString1"})
+ CREATE (:Movie {property: "RandomString2"})
+ CREATE (:Movie {property: "RandomString1RandomString1"})
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies(where: {property_ENDS_WITH: "RandomString1"}) {
+    property
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "RandomString1"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE this.property ENDS WITH $param0
+RETURN this { .property } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "movies": [
+    {
+      "property": "RandomString1"
+    },
+    {
+      "property": "RandomString1RandomString1"
+    }
+  ]
+}
+----
+
+== String Filtering
+
+=== Setup
+
+.Schema
+[source,graphql,schema=true]
+----
+type Movie {
+  title: String
+}
+----
+
+.Configuration
+[source,json,schema-config=true]
+----
+{
+  "features": {
+    "filters": {
+      "String": {
+        "LT": true,
+        "GT": true,
+        "LTE": true,
+        "GTE": true
+      }
+    }
+  }
+}
+----
+
+=== should find Movies GT string
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (:Movie {title: "The Animatrix"})
+ CREATE (:Movie {title: "The Matrix"})
+ CREATE (:Movie {title: "The Matrix Reloaded"})
+ CREATE (:Movie {title: "The Matrix Revolutions"})
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies(where: {title_GT: "The Matrix"}) {
+    title
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "The Matrix"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE this.title > $param0
+RETURN this { .title } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "movies": [
+    {
+      "title": "The Matrix Reloaded"
+    },
+    {
+      "title": "The Matrix Revolutions"
+    }
+  ]
+}
+----
+
+=== should find Movies LT string
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (:Movie {title: "The Matrix"})
+ CREATE (:Movie {title: "The Matrix Reloaded"})
+ CREATE (:Movie {title: "The Matrix Revolutions"})
+ CREATE (:Movie {title: "The Matrix Resurrections"})
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies(where: {title_LT: "The Matrix Revolutions"}) {
+    title
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "The Matrix Revolutions"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE this.title < $param0
+RETURN this { .title } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "movies": [
+    {
+      "title": "The Matrix"
+    },
+    {
+      "title": "The Matrix Reloaded"
+    },
+    {
+      "title": "The Matrix Resurrections"
+    }
+  ]
+}
+----
+
+=== should find Movies GTE string
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (:Movie {title: "The Animatrix"})
+ CREATE (:Movie {title: "The Matrix"})
+ CREATE (:Movie {title: "The Matrix Reloaded"})
+ CREATE (:Movie {title: "The Matrix Revolutions"})
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies(where: {title_GTE: "The Matrix"}) {
+    title
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "The Matrix"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE this.title >= $param0
+RETURN this { .title } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "movies": [
+    {
+      "title": "The Matrix"
+    },
+    {
+      "title": "The Matrix Reloaded"
+    },
+    {
+      "title": "The Matrix Revolutions"
+    }
+  ]
+}
+----
+
+=== should find Movies LTE string
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (:Movie {title: "The Matrix"})
+ CREATE (:Movie {title: "The Matrix Reloaded"})
+ CREATE (:Movie {title: "The Matrix Revolutions"})
+ CREATE (:Movie {title: "The Matrix Resurrections"})
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies(where: {title_LTE: "The Matrix Revolutions"}) {
+    title
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "The Matrix Revolutions"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE this.title <= $param0
+RETURN this { .title } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "movies": [
+    {
+      "title": "The Matrix"
+    },
+    {
+      "title": "The Matrix Reloaded"
+    },
+    {
+      "title": "The Matrix Revolutions"
+    },
+    {
+      "title": "The Matrix Resurrections"
+    }
+  ]
+}
+----
+
+== Int Filtering
+
+=== Setup
+
+.Schema
+[source,graphql,schema=true]
+----
+type Movie {
+  property: Int
+}
+----
+
+=== should find Movies IN numbers
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (:Movie {property: 42})
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies(where: {property_IN: [42, 84, 69]}) {
+    property
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": [
+    42,
+    84,
+    69
+  ]
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE this.property IN $param0
+RETURN this { .property } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "movies": [
+    {
+      "property": 42
+    }
+  ]
+}
+----
+
+=== should find Movies LT number
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (:Movie {property: 42})
+ CREATE (:Movie {property: -1})
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies(where: {property_LT: 0}) {
+    property
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": 0
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE this.property < $param0
+RETURN this { .property } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "movies": [
+    {
+      "property": -1
+    }
+  ]
+}
+----
+
+=== should find Movies LTE number
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (:Movie {property: 42})
+ CREATE (:Movie {property: -1})
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies(where: {property_LTE: 42}) {
+    property
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": 42
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE this.property <= $param0
+RETURN this { .property } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "movies": [
+    {
+      "property": 42
+    },
+    {
+      "property": -1
+    }
+  ]
+}
+----
+
+=== should find Movies GT number
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (:Movie {property: 42})
+ CREATE (:Movie {property: 43})
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies(where: {property_GT: 42}) {
+    property
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": 42
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE this.property > $param0
+RETURN this { .property } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "movies": [
+    {
+      "property": 43
+    }
+  ]
+}
+----
+
+=== should find Movies GTE number
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (:Movie {property: 42})
+ CREATE (:Movie {property: 43})
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies(where: {property_GTE: 42}) {
+    property
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": 42
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE this.property >= $param0
+RETURN this { .property } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "movies": [
+    {
+      "property": 42
+    },
+    {
+      "property": 43
+    }
+  ]
+}
+----
+
+== Float Filtering
+
+=== Setup
+
+.Schema
+[source,graphql,schema=true]
+----
+type Movie {
+  property: Float
+}
+----
+
+=== should find Movies IN numbers
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (:Movie {property: 4.2})
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies(where: {property_IN: [4.2, 8.4, 6.9]}) {
+    property
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": [
+    4.2,
+    8.4,
+    6.9
+  ]
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE this.property IN $param0
+RETURN this { .property } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "movies": [
+    {
+      "property": 4.2
+    }
+  ]
+}
+----
+
+=== should find Movies LT number
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (:Movie {property: 4.2})
+ CREATE (:Movie {property: -1})
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies(where: {property_LT: 0}) {
+    property
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": 0
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE this.property < $param0
+RETURN this { .property } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "movies": [
+    {
+      "property": -1.0
+    }
+  ]
+}
+----
+
+=== should find Movies LTE number
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (:Movie {property: 4.2})
+ CREATE (:Movie {property: -1})
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies(where: {property_LTE: 4.2}) {
+    property
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": 4.2
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE this.property <= $param0
+RETURN this { .property } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "movies": [
+    {
+      "property": 4.2
+    },
+    {
+      "property": -1
+    }
+  ]
+}
+----
+
+=== should find Movies GT number
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (:Movie {property: 4.2})
+ CREATE (:Movie {property: 5.2})
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies(where: {property_GT: 4.2}) {
+    property
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": 4.2
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE this.property > $param0
+RETURN this { .property } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "movies": [
+    {
+      "property": 5.2
+    }
+  ]
+}
+----
+
+=== should find Movies GTE number
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (:Movie {property: 4.2})
+ CREATE (:Movie {property: 5.2})
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies(where: {property_GTE: 4.2}) {
+    property
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": 4.2
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE this.property >= $param0
+RETURN this { .property } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "movies": [
+    {
+      "property": 4.2
+    },
+    {
+      "property": 5.2
+    }
+  ]
+}
+----
+
+== Boolean Filtering
+
+=== Setup
+
+.Schema
+[source,graphql,schema=true]
+----
+type Movie {
+  property: Boolean
+}
+----
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (:Movie {property: false})
+----
+
+=== should find Movies equality equality
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies(where: {property: false}) {
+    property
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": false
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE this.property = $param0
+RETURN this { .property } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "movies": [
+    {
+      "property": false
+    }
+  ]
+}
+----
diff --git a/core/src/test/resources/integration-test-files/filtering/filter-interface-relationship.adoc b/core/src/test/resources/integration-test-files/filtering/filter-interface-relationship.adoc
index 7dfcae9d..9a383de1 100644
--- a/core/src/test/resources/integration-test-files/filtering/filter-interface-relationship.adoc
+++ b/core/src/test/resources/integration-test-files/filtering/filter-interface-relationship.adoc
@@ -46,7 +46,7 @@ CREATE (a:Actor { name: "RandomString1" })
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query Actors($title: String) {
   actors(where: {actedIn_SOME: {title: $title}}) {
@@ -68,7 +68,7 @@ query Actors($title: String) {
 [source,json,request=true]
 ----
 {
-  "title": "RandomString4"
+  "title" : "RandomString4"
 }
 ----
 
@@ -76,8 +76,8 @@ query Actors($title: String) {
 [source,json]
 ----
 {
-  "param0": "RandomString4",
-  "param1": "RandomString4"
+  "param0" : "RandomString4",
+  "param1" : "RandomString4"
 }
 ----
 
@@ -128,22 +128,16 @@ RETURN this {
 [source,json,response=true]
 ----
 {
-  "actors": [
-    {
-      "name": "RandomString2",
-      "actedIn": [
-        {
-          "title": "RandomString4",
-          "runtime": 96406
-        }
-      ]
-    }
-  ]
+  "actors" : [ {
+    "name" : "RandomString2",
+    "actedIn" : [ {
+      "title" : "RandomString4",
+      "runtime" : 96406
+    } ]
+  } ]
 }
 ----
 
-'''
-
 == should read and return interface relationship fields with interface relationship filter ALL (both implementations in the input and DB)
 
 .Test Data
@@ -159,7 +153,7 @@ CREATE (a:Actor { name: "RandomString1" })
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query Actors($title: String) {
   actors(where: {actedIn_ALL: {title: $title}}) {
@@ -181,7 +175,7 @@ query Actors($title: String) {
 [source,json,request=true]
 ----
 {
-  "title": "RandomString3"
+  "title" : "RandomString3"
 }
 ----
 
@@ -189,8 +183,8 @@ query Actors($title: String) {
 [source,json]
 ----
 {
-  "param0": "RandomString3",
-  "param1": "RandomString3"
+  "param0" : "RandomString3",
+  "param1" : "RandomString3"
 }
 ----
 
@@ -249,26 +243,19 @@ RETURN this {
 [source,json,response=true,ignore-order]
 ----
 {
-  "actors": [
-    {
-      "name": "RandomString2",
-      "actedIn": [
-        {
-          "title": "RandomString3",
-          "runtime": 47026
-        },
-        {
-          "title": "RandomString3",
-          "episodes": 3093
-        }
-      ]
-    }
-  ]
+  "actors" : [ {
+    "name" : "RandomString2",
+    "actedIn" : [ {
+      "title" : "RandomString3",
+      "runtime" : 47026
+    }, {
+      "title" : "RandomString3",
+      "episodes" : 3093
+    } ]
+  } ]
 }
 ----
 
-'''
-
 == should read and return interface relationship fields with interface relationship filter ALL (both implementations in the input and one out of two in DB)
 
 .Test Data
@@ -283,7 +270,7 @@ CREATE (a:Actor { name: "RandomString1" })
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query Actors($title: String) {
   actors(where: {actedIn_ALL: {title: $title}}) {
@@ -305,7 +292,7 @@ query Actors($title: String) {
 [source,json,request=true]
 ----
 {
-  "title": "RandomString3"
+  "title" : "RandomString3"
 }
 ----
 
@@ -313,8 +300,8 @@ query Actors($title: String) {
 [source,json]
 ----
 {
-  "param0": "RandomString3",
-  "param1": "RandomString3"
+  "param0" : "RandomString3",
+  "param1" : "RandomString3"
 }
 ----
 
@@ -373,12 +360,10 @@ RETURN this {
 [source,json,response=true]
 ----
 {
-  "actors": []
+  "actors" : [ ]
 }
 ----
 
-'''
-
 == should read and return interface relationship fields with interface relationship filter SINGLE
 
 .Test Data
@@ -394,7 +379,7 @@ CREATE (a:Actor { name: "RandomString1" })
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query Actors($title: String) {
   actors(where: {actedIn_SINGLE: {title: $title}}) {
@@ -416,7 +401,7 @@ query Actors($title: String) {
 [source,json,request=true]
 ----
 {
-  "title": "RandomString4"
+  "title" : "RandomString4"
 }
 ----
 
@@ -424,8 +409,8 @@ query Actors($title: String) {
 [source,json]
 ----
 {
-  "param0": "RandomString4",
-  "param1": "RandomString4"
+  "param0" : "RandomString4",
+  "param1" : "RandomString4"
 }
 ----
 
@@ -474,26 +459,19 @@ RETURN this {
 [source,json,response=true,ignore-order]
 ----
 {
-  "actors": [
-    {
-      "name": "RandomString2",
-      "actedIn": [
-        {
-          "title": "RandomString3",
-          "runtime": 51686
-        },
-        {
-          "title": "RandomString4",
-          "runtime": 51686
-        }
-      ]
-    }
-  ]
+  "actors" : [ {
+    "name" : "RandomString2",
+    "actedIn" : [ {
+      "title" : "RandomString3",
+      "runtime" : 51686
+    }, {
+      "title" : "RandomString4",
+      "runtime" : 51686
+    } ]
+  } ]
 }
 ----
 
-'''
-
 == should read and return interface relationship fields with interface relationship filter NONE
 
 .Test Data
@@ -509,7 +487,7 @@ CREATE (a:Actor { name: "RandomString1" })
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query Actors($title: String) {
   actors(where: {actedIn_NONE: {title: $title}}) {
@@ -531,7 +509,7 @@ query Actors($title: String) {
 [source,json,request=true]
 ----
 {
-  "title": "RandomString4"
+  "title" : "RandomString4"
 }
 ----
 
@@ -539,8 +517,8 @@ query Actors($title: String) {
 [source,json]
 ----
 {
-  "param0": "RandomString4",
-  "param1": "RandomString4"
+  "param0" : "RandomString4",
+  "param1" : "RandomString4"
 }
 ----
 
@@ -591,23 +569,15 @@ RETURN this {
 [source,json,response=true,ignore-order]
 ----
 {
-  "actors": [
-    {
-      "name": "RandomString1",
-      "actedIn": [
-        {
-          "title": "RandomString3",
-          "runtime": 13985
-        },
-        {
-          "title": "RandomString5",
-          "episodes": 4471
-        }
-      ]
-    }
-  ]
+  "actors" : [ {
+    "name" : "RandomString1",
+    "actedIn" : [ {
+      "title" : "RandomString3",
+      "runtime" : 13985
+    }, {
+      "title" : "RandomString5",
+      "episodes" : 4471
+    } ]
+  } ]
 }
 ----
-
-'''
-
diff --git a/core/src/test/resources/integration-test-files/filtering/filter-interface-relationship.js.adoc b/core/src/test/resources/integration-test-files/filtering/filter-interface-relationship.js.adoc
new file mode 100644
index 00000000..ca051c95
--- /dev/null
+++ b/core/src/test/resources/integration-test-files/filtering/filter-interface-relationship.js.adoc
@@ -0,0 +1,530 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= interface relationships
+
+== Setup
+
+.Schema
+[source,graphql,schema=true]
+----
+interface Production {
+  title: String!
+}
+
+type Movie implements Production {
+  title: String!
+  runtime: Int!
+}
+
+type Series implements Production {
+  title: String!
+  episodes: Int!
+}
+
+type ActedIn @relationshipProperties {
+  screenTime: Int!
+}
+
+type Actor {
+  name: String!
+  currentlyActingIn: Production @relationship(type: "CURRENTLY_ACTING_IN", direction: OUT)
+  actedIn: [Production!]! @relationship(type: "ACTED_IN", direction: OUT, properties: "ActedIn")
+}
+----
+
+== should read and return interface relationship fields with interface relationship filter SOME
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (a:Actor { name: "RandomString1" })
+ CREATE (a)-[:ACTED_IN { screenTime: 9448 }]->(:Movie { title: "RandomString3", runtime:96406 })
+ CREATE (a)-[:ACTED_IN { screenTime: 3167 }]->(:Series { title: "RandomString5", episodes: 56834 })
+ CREATE (a2:Actor { name: "RandomString2" })
+ CREATE (a2)-[:ACTED_IN { screenTime: 9448 }]->(:Movie { title: "RandomString4", runtime:96406 })
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+query Actors($title: String) {
+  actors(where: {actedIn_SOME: {title: $title}}) {
+    name
+    actedIn {
+      title
+      ... on Movie {
+        runtime
+      }
+      ... on Series {
+        episodes
+      }
+    }
+  }
+}
+----
+
+.GraphQL params input
+[source,json,request=true]
+----
+{
+  "title": "RandomString4"
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "RandomString4",
+  "param1": "RandomString4"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Actor)
+WHERE (EXISTS {
+    MATCH (this)-[:ACTED_IN]->(this0:Movie)
+    WHERE this0.title = $param0
+} OR EXISTS {
+    MATCH (this)-[:ACTED_IN]->(this1:Series)
+    WHERE this1.title = $param1
+})
+CALL {
+    WITH this
+    CALL {
+        WITH *
+        MATCH (this)-[this2:ACTED_IN]->(this3:Movie)
+        WITH this3 { .title, .runtime, __typename: "Movie", __id: toString(id(this3)) } AS this3
+        RETURN this3 AS var4
+        UNION
+        WITH *
+        MATCH (this)-[this5:ACTED_IN]->(this6:Series)
+        WITH this6 { .title, .episodes, __typename: "Series", __id: toString(id(this6)) } AS this6
+        RETURN this6 AS var4
+    }
+    WITH var4
+    RETURN collect(var4) AS var4
+}
+RETURN this { .name, actedIn: var4 } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "actors": [
+    {
+      "name": "RandomString2",
+      "actedIn": [
+        {
+          "title": "RandomString4",
+          "runtime": 96406
+        }
+      ]
+    }
+  ]
+}
+----
+
+== should read and return interface relationship fields with interface relationship filter ALL (both implementations in the input and DB)
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (a:Actor { name: "RandomString1" })
+ CREATE (m:Movie { title: "RandomString3", runtime:47026 })
+ CREATE (a)-[:ACTED_IN { screenTime: 85740 }]->(m)
+ CREATE (a)-[:ACTED_IN { screenTime: 96705 }]->(:Series { title: "RandomString4", episodes: 3093 })
+ CREATE (a2:Actor { name: "RandomString2" })
+ CREATE (a2)-[:ACTED_IN { screenTime: 85740 }]->(m)
+ CREATE (a2)-[:ACTED_IN { screenTime: 96705 }]->(:Series { title: "RandomString3", episodes: 3093 })
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+query Actors($title: String) {
+  actors(where: {actedIn_ALL: {title: $title}}) {
+    name
+    actedIn {
+      title
+      ... on Movie {
+        runtime
+      }
+      ... on Series {
+        episodes
+      }
+    }
+  }
+}
+----
+
+.GraphQL params input
+[source,json,request=true]
+----
+{
+  "title": "RandomString3"
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "RandomString3",
+  "param1": "RandomString3"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Actor)
+WHERE ((EXISTS {
+    MATCH (this)-[:ACTED_IN]->(this0:Movie)
+    WHERE this0.title = $param0
+} AND NOT (EXISTS {
+    MATCH (this)-[:ACTED_IN]->(this0:Movie)
+    WHERE NOT (this0.title = $param0)
+})) AND (EXISTS {
+    MATCH (this)-[:ACTED_IN]->(this1:Series)
+    WHERE this1.title = $param1
+} AND NOT (EXISTS {
+    MATCH (this)-[:ACTED_IN]->(this1:Series)
+    WHERE NOT (this1.title = $param1)
+})))
+CALL {
+    WITH this
+    CALL {
+        WITH *
+        MATCH (this)-[this2:ACTED_IN]->(this3:Movie)
+        WITH this3 { .title, .runtime, __typename: "Movie", __id: toString(id(this3)) } AS this3
+        RETURN this3 AS var4
+        UNION
+        WITH *
+        MATCH (this)-[this5:ACTED_IN]->(this6:Series)
+        WITH this6 { .title, .episodes, __typename: "Series", __id: toString(id(this6)) } AS this6
+        RETURN this6 AS var4
+    }
+    WITH var4
+    RETURN collect(var4) AS var4
+}
+RETURN this { .name, actedIn: var4 } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "actors": [
+    {
+      "name": "RandomString2",
+      "actedIn": [
+        {
+          "title": "RandomString3",
+          "runtime": 47026
+        },
+        {
+          "title": "RandomString3",
+          "episodes": 3093
+        }
+      ]
+    }
+  ]
+}
+----
+
+== should read and return interface relationship fields with interface relationship filter ALL (both implementations in the input and one out of two in DB)
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (a:Actor { name: "RandomString1" })
+ CREATE (m:Movie { title: "RandomString3", runtime:46474 })
+ CREATE (a)-[:ACTED_IN { screenTime: 95753 }]->(m)
+ CREATE (a)-[:ACTED_IN { screenTime: 76273 }]->(:Series { title: "RandomString4", episodes: 8658 })
+ CREATE (a2:Actor { name: "RandomString2" })
+ CREATE (a2)-[:ACTED_IN { screenTime: 95753 }]->(m)
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+query Actors($title: String) {
+  actors(where: {actedIn_ALL: {title: $title}}) {
+    name
+    actedIn {
+      title
+      ... on Movie {
+        runtime
+      }
+      ... on Series {
+        episodes
+      }
+    }
+  }
+}
+----
+
+.GraphQL params input
+[source,json,request=true]
+----
+{
+  "title": "RandomString3"
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "RandomString3",
+  "param1": "RandomString3"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Actor)
+WHERE ((EXISTS {
+    MATCH (this)-[:ACTED_IN]->(this0:Movie)
+    WHERE this0.title = $param0
+} AND NOT (EXISTS {
+    MATCH (this)-[:ACTED_IN]->(this0:Movie)
+    WHERE NOT (this0.title = $param0)
+})) AND (EXISTS {
+    MATCH (this)-[:ACTED_IN]->(this1:Series)
+    WHERE this1.title = $param1
+} AND NOT (EXISTS {
+    MATCH (this)-[:ACTED_IN]->(this1:Series)
+    WHERE NOT (this1.title = $param1)
+})))
+CALL {
+    WITH this
+    CALL {
+        WITH *
+        MATCH (this)-[this2:ACTED_IN]->(this3:Movie)
+        WITH this3 { .title, .runtime, __typename: "Movie", __id: toString(id(this3)) } AS this3
+        RETURN this3 AS var4
+        UNION
+        WITH *
+        MATCH (this)-[this5:ACTED_IN]->(this6:Series)
+        WITH this6 { .title, .episodes, __typename: "Series", __id: toString(id(this6)) } AS this6
+        RETURN this6 AS var4
+    }
+    WITH var4
+    RETURN collect(var4) AS var4
+}
+RETURN this { .name, actedIn: var4 } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "actors": []
+}
+----
+
+== should read and return interface relationship fields with interface relationship filter SINGLE
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (a:Actor { name: "RandomString1" })
+ CREATE (m:Movie { title: "RandomString3", runtime:51686 })
+ CREATE (a)-[:ACTED_IN { screenTime: 60481 }]->(m)
+ CREATE (a)-[:ACTED_IN { screenTime: 75798 }]->(:Series { title: "RandomString5", episodes: 18888 })
+ CREATE (a2:Actor { name: "RandomString2" })
+ CREATE (a2)-[:ACTED_IN { screenTime: 60481 }]->(:Movie { title: "RandomString4", runtime:51686 })
+ CREATE (a2)-[:ACTED_IN { screenTime: 60481 }]->(m)
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+query Actors($title: String) {
+  actors(where: {actedIn_SINGLE: {title: $title}}) {
+    name
+    actedIn {
+      title
+      ... on Movie {
+        runtime
+      }
+      ... on Series {
+        episodes
+      }
+    }
+  }
+}
+----
+
+.GraphQL params input
+[source,json,request=true]
+----
+{
+  "title": "RandomString4"
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "RandomString4",
+  "param1": "RandomString4"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Actor)
+WHERE (single(this0 IN [(this)-[:ACTED_IN]->(this0:Movie) WHERE this0.title = $param0 | 1] WHERE true) XOR single(this1 IN [(this)-[:ACTED_IN]->(this1:Series) WHERE this1.title = $param1 | 1] WHERE true))
+CALL {
+    WITH this
+    CALL {
+        WITH *
+        MATCH (this)-[this2:ACTED_IN]->(this3:Movie)
+        WITH this3 { .title, .runtime, __typename: "Movie", __id: toString(id(this3)) } AS this3
+        RETURN this3 AS var4
+        UNION
+        WITH *
+        MATCH (this)-[this5:ACTED_IN]->(this6:Series)
+        WITH this6 { .title, .episodes, __typename: "Series", __id: toString(id(this6)) } AS this6
+        RETURN this6 AS var4
+    }
+    WITH var4
+    RETURN collect(var4) AS var4
+}
+RETURN this { .name, actedIn: var4 } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "actors": [
+    {
+      "name": "RandomString2",
+      "actedIn": [
+        {
+          "title": "RandomString3",
+          "runtime": 51686
+        },
+        {
+          "title": "RandomString4",
+          "runtime": 51686
+        }
+      ]
+    }
+  ]
+}
+----
+
+== should read and return interface relationship fields with interface relationship filter NONE
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (a:Actor { name: "RandomString1" })
+ CREATE (m:Movie { title: "RandomString3", runtime:13985 })
+ CREATE (a)-[:ACTED_IN { screenTime: 20492 }]->(m)
+ CREATE (a)-[:ACTED_IN { screenTime: 70112 }]->(:Series { title: "RandomString5", episodes: 4471 })
+ CREATE (a2:Actor { name: "RandomString2" })
+ CREATE (a2)-[:ACTED_IN { screenTime: 20492 }]->(:Movie { title: "RandomString4", runtime:13985 })
+ CREATE (a2)-[:ACTED_IN { screenTime: 20492 }]->(m)
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+query Actors($title: String) {
+  actors(where: {actedIn_NONE: {title: $title}}) {
+    name
+    actedIn {
+      title
+      ... on Movie {
+        runtime
+      }
+      ... on Series {
+        episodes
+      }
+    }
+  }
+}
+----
+
+.GraphQL params input
+[source,json,request=true]
+----
+{
+  "title": "RandomString4"
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "RandomString4",
+  "param1": "RandomString4"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Actor)
+WHERE (NOT (EXISTS {
+    MATCH (this)-[:ACTED_IN]->(this0:Movie)
+    WHERE this0.title = $param0
+}) AND NOT (EXISTS {
+    MATCH (this)-[:ACTED_IN]->(this1:Series)
+    WHERE this1.title = $param1
+}))
+CALL {
+    WITH this
+    CALL {
+        WITH *
+        MATCH (this)-[this2:ACTED_IN]->(this3:Movie)
+        WITH this3 { .title, .runtime, __typename: "Movie", __id: toString(id(this3)) } AS this3
+        RETURN this3 AS var4
+        UNION
+        WITH *
+        MATCH (this)-[this5:ACTED_IN]->(this6:Series)
+        WITH this6 { .title, .episodes, __typename: "Series", __id: toString(id(this6)) } AS this6
+        RETURN this6 AS var4
+    }
+    WITH var4
+    RETURN collect(var4) AS var4
+}
+RETURN this { .name, actedIn: var4 } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "actors": [
+    {
+      "name": "RandomString1",
+      "actedIn": [
+        {
+          "title": "RandomString3",
+          "runtime": 13985
+        },
+        {
+          "title": "RandomString5",
+          "episodes": 4471
+        }
+      ]
+    }
+  ]
+}
+----
diff --git a/core/src/test/resources/integration-test-files/filtering/filter-union-relationship.adoc b/core/src/test/resources/integration-test-files/filtering/filter-union-relationship.adoc
index d7809c71..28c5f8a3 100644
--- a/core/src/test/resources/integration-test-files/filtering/filter-union-relationship.adoc
+++ b/core/src/test/resources/integration-test-files/filtering/filter-union-relationship.adoc
@@ -44,7 +44,7 @@ CREATE (a:Actor { name: "RandomString1" })
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query Actors($title: String) {
   actors(where: {actedIn_SOME: {Movie: {title: $title}}}) {
@@ -67,7 +67,7 @@ query Actors($title: String) {
 [source,json,request=true]
 ----
 {
-  "title": "RandomString4"
+  "title" : "RandomString4"
 }
 ----
 
@@ -75,7 +75,7 @@ query Actors($title: String) {
 [source,json]
 ----
 {
-  "param0": "RandomString4"
+  "param0" : "RandomString4"
 }
 ----
 
@@ -122,22 +122,16 @@ RETURN this {
 [source,json,response=true]
 ----
 {
-  "actors": [
-    {
-      "name": "RandomString2",
-      "actedIn": [
-        {
-          "title": "RandomString4",
-          "runtime": 18723
-        }
-      ]
-    }
-  ]
+  "actors" : [ {
+    "name" : "RandomString2",
+    "actedIn" : [ {
+      "title" : "RandomString4",
+      "runtime" : 18723
+    } ]
+  } ]
 }
 ----
 
-'''
-
 == should read and return union relationship fields with union relationship filter ALL (one out of two implementations in the input and DB)
 
 .Test Data
@@ -152,7 +146,7 @@ CREATE (a:Actor { name: "RandomString1" })
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query Actors($title: String) {
   actors(where: {actedIn_ALL: {Movie: {title: $title}}}) {
@@ -175,7 +169,7 @@ query Actors($title: String) {
 [source,json,request=true]
 ----
 {
-  "title": "RandomString3"
+  "title" : "RandomString3"
 }
 ----
 
@@ -183,7 +177,7 @@ query Actors($title: String) {
 [source,json]
 ----
 {
-  "param0": "RandomString3"
+  "param0" : "RandomString3"
 }
 ----
 
@@ -234,35 +228,25 @@ RETURN this {
 [source,json,response=true,ignore-order]
 ----
 {
-  "actors": [
-    {
-      "name": "RandomString1",
-      "actedIn": [
-        {
-          "title": "RandomString3",
-          "runtime": 61632
-        },
-        {
-          "title": "RandomString4",
-          "episodes": 61753
-        }
-      ]
-    },
-    {
-      "name": "RandomString2",
-      "actedIn": [
-        {
-          "title": "RandomString3",
-          "runtime": 61632
-        }
-      ]
-    }
-  ]
+  "actors" : [ {
+    "name" : "RandomString1",
+    "actedIn" : [ {
+      "title" : "RandomString3",
+      "runtime" : 61632
+    }, {
+      "title" : "RandomString4",
+      "episodes" : 61753
+    } ]
+  }, {
+    "name" : "RandomString2",
+    "actedIn" : [ {
+      "title" : "RandomString3",
+      "runtime" : 61632
+    } ]
+  } ]
 }
 ----
 
-'''
-
 == should read and return union relationship fields with union relationship filter ALL (both implementations in the input and DB)
 
 .Test Data
@@ -278,7 +262,7 @@ CREATE (a:Actor { name: "RandomString1" })
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query Actors($title: String) {
   actors(where: {actedIn_ALL: {Movie: {title: $title}, Series: {title: $title}}}) {
@@ -301,7 +285,7 @@ query Actors($title: String) {
 [source,json,request=true]
 ----
 {
-  "title": "RandomString3"
+  "title" : "RandomString3"
 }
 ----
 
@@ -309,8 +293,8 @@ query Actors($title: String) {
 [source,json]
 ----
 {
-  "param0": "RandomString3",
-  "param1": "RandomString3"
+  "param0" : "RandomString3",
+  "param1" : "RandomString3"
 }
 ----
 
@@ -369,26 +353,19 @@ RETURN this {
 [source,json,response=true,ignore-order]
 ----
 {
-  "actors": [
-    {
-      "name": "RandomString2",
-      "actedIn": [
-        {
-          "title": "RandomString3",
-          "runtime": 25423
-        },
-        {
-          "title": "RandomString3",
-          "episodes": 36248
-        }
-      ]
-    }
-  ]
+  "actors" : [ {
+    "name" : "RandomString2",
+    "actedIn" : [ {
+      "title" : "RandomString3",
+      "runtime" : 25423
+    }, {
+      "title" : "RandomString3",
+      "episodes" : 36248
+    } ]
+  } ]
 }
 ----
 
-'''
-
 == should read and return union relationship fields with union relationship filter ALL (both implementations in the input and one out of two in DB)
 
 .Test Data
@@ -403,7 +380,7 @@ CREATE (a:Actor { name: "RandomString1" })
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query Actors($title: String) {
   actors(where: {actedIn_ALL: {Movie: {title: $title}, Series: {title: $title}}}) {
@@ -426,7 +403,7 @@ query Actors($title: String) {
 [source,json,request=true]
 ----
 {
-  "title": "RandomString3"
+  "title" : "RandomString3"
 }
 ----
 
@@ -434,8 +411,8 @@ query Actors($title: String) {
 [source,json]
 ----
 {
-  "param0": "RandomString3",
-  "param1": "RandomString3"
+  "param0" : "RandomString3",
+  "param1" : "RandomString3"
 }
 ----
 
@@ -494,12 +471,10 @@ RETURN this {
 [source,json,response=true]
 ----
 {
-  "actors": []
+  "actors" : [ ]
 }
 ----
 
-'''
-
 == should read and return interface relationship fields with interface relationship filter SINGLE
 
 .Test Data
@@ -515,7 +490,7 @@ CREATE (a:Actor { name: "RandomString1" })
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query Actors($title: String) {
   actors(where: {actedIn_SINGLE: {Movie: {title: $title}}}) {
@@ -538,7 +513,7 @@ query Actors($title: String) {
 [source,json,request=true]
 ----
 {
-  "title": "RandomString4"
+  "title" : "RandomString4"
 }
 ----
 
@@ -546,7 +521,7 @@ query Actors($title: String) {
 [source,json]
 ----
 {
-  "param0": "RandomString4"
+  "param0" : "RandomString4"
 }
 ----
 
@@ -592,26 +567,19 @@ RETURN this {
 [source,json,response=true,ignore-order]
 ----
 {
-  "actors": [
-    {
-      "name": "RandomString2",
-      "actedIn": [
-        {
-          "title": "RandomString4",
-          "runtime": 55815
-        },
-        {
-          "title": "RandomString3",
-          "runtime": 55815
-        }
-      ]
-    }
-  ]
+  "actors" : [ {
+    "name" : "RandomString2",
+    "actedIn" : [ {
+      "title" : "RandomString4",
+      "runtime" : 55815
+    }, {
+      "title" : "RandomString3",
+      "runtime" : 55815
+    } ]
+  } ]
 }
 ----
 
-'''
-
 == should read and return interface relationship fields with interface relationship filter NONE
 
 .Test Data
@@ -627,7 +595,7 @@ CREATE (a:Actor { name: "RandomString1" })
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query Actors($title: String) {
   actors(where: {actedIn_NONE: {Movie: {title: $title}, Series: {title: $title}}}) {
@@ -650,7 +618,7 @@ query Actors($title: String) {
 [source,json,request=true]
 ----
 {
-  "title": "RandomString4"
+  "title" : "RandomString4"
 }
 ----
 
@@ -658,8 +626,8 @@ query Actors($title: String) {
 [source,json]
 ----
 {
-  "param0": "RandomString4",
-  "param1": "RandomString4"
+  "param0" : "RandomString4",
+  "param1" : "RandomString4"
 }
 ----
 
@@ -710,23 +678,15 @@ RETURN this {
 [source,json,response=true,ignore-order]
 ----
 {
-  "actors": [
-    {
-      "name": "RandomString1",
-      "actedIn": [
-        {
-          "title": "RandomString3",
-          "runtime": 9931
-        },
-        {
-          "title": "RandomString5",
-          "episodes": 15912
-        }
-      ]
-    }
-  ]
+  "actors" : [ {
+    "name" : "RandomString1",
+    "actedIn" : [ {
+      "title" : "RandomString3",
+      "runtime" : 9931
+    }, {
+      "title" : "RandomString5",
+      "episodes" : 15912
+    } ]
+  } ]
 }
 ----
-
-'''
-
diff --git a/core/src/test/resources/integration-test-files/filtering/filter-union-relationship.js.adoc b/core/src/test/resources/integration-test-files/filtering/filter-union-relationship.js.adoc
new file mode 100644
index 00000000..c51851fc
--- /dev/null
+++ b/core/src/test/resources/integration-test-files/filtering/filter-union-relationship.js.adoc
@@ -0,0 +1,638 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= union relationships
+
+== Setup
+
+.Schema
+[source,graphql,schema=true]
+----
+type Movie {
+  title: String!
+  runtime: Int!
+}
+
+type Series {
+  title: String!
+  episodes: Int!
+}
+
+union Production = Movie | Series
+
+type ActedIn @relationshipProperties {
+  screenTime: Int!
+}
+
+type Actor {
+  name: String!
+  currentlyActingIn: Production @relationship(type: "CURRENTLY_ACTING_IN", direction: OUT)
+  actedIn: [Production!]! @relationship(type: "ACTED_IN", direction: OUT, properties: "ActedIn")
+}
+----
+
+== should read and return union relationship fields with union relationship filter SOME
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (a:Actor { name: "RandomString1" })
+ CREATE (a)-[:ACTED_IN { screenTime: 83582 }]->(:Movie { title: "RandomString3", runtime:18723 })
+ CREATE (a)-[:ACTED_IN { screenTime: 8697 }]->(:Series { title: "RandomString5", episodes: 50148 })
+ CREATE (a2:Actor { name: "RandomString2" })
+ CREATE (a2)-[:ACTED_IN { screenTime: 83582 }]->(:Movie { title: "RandomString4", runtime:18723 })
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+query Actors($title: String) {
+  actors(where: {actedIn_SOME: {Movie: {title: $title}}}) {
+    name
+    actedIn {
+      ... on Movie {
+        title
+        runtime
+      }
+      ... on Series {
+        title
+        episodes
+      }
+    }
+  }
+}
+----
+
+.GraphQL params input
+[source,json,request=true]
+----
+{
+  "title": "RandomString4"
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "RandomString4"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Actor)
+WHERE EXISTS {
+    MATCH (this)-[:ACTED_IN]->(this0:Movie)
+    WHERE this0.title = $param0
+}
+CALL {
+    WITH this
+    CALL {
+        WITH *
+        MATCH (this)-[this1:ACTED_IN]->(this2:Movie)
+        WITH this2 { .title, .runtime, __typename: "Movie", __id: toString(id(this2)) } AS this2
+        RETURN this2 AS var3
+        UNION
+        WITH *
+        MATCH (this)-[this4:ACTED_IN]->(this5:Series)
+        WITH this5 { .title, .episodes, __typename: "Series", __id: toString(id(this5)) } AS this5
+        RETURN this5 AS var3
+    }
+    WITH var3
+    RETURN collect(var3) AS var3
+}
+RETURN this { .name, actedIn: var3 } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "actors": [
+    {
+      "name": "RandomString2",
+      "actedIn": [
+        {
+          "title": "RandomString4",
+          "runtime": 18723
+        }
+      ]
+    }
+  ]
+}
+----
+
+== should read and return union relationship fields with union relationship filter ALL (one out of two implementations in the input and DB)
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (a:Actor { name: "RandomString1" })
+ CREATE (m:Movie { title: "RandomString3", runtime:61632 })
+ CREATE (a)-[:ACTED_IN { screenTime: 69036 }]->(m)
+ CREATE (a)-[:ACTED_IN { screenTime: 51960 }]->(:Series { title: "RandomString4", episodes: 61753 })
+ CREATE (a2:Actor { name: "RandomString2" })
+ CREATE (a2)-[:ACTED_IN { screenTime: 69036 }]->(m)
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+query Actors($title: String) {
+  actors(where: {actedIn_ALL: {Movie: {title: $title}}}) {
+    name
+    actedIn {
+      ... on Movie {
+        title
+        runtime
+      }
+      ... on Series {
+        title
+        episodes
+      }
+    }
+  }
+}
+----
+
+.GraphQL params input
+[source,json,request=true]
+----
+{
+  "title": "RandomString3"
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "RandomString3"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Actor)
+WHERE (EXISTS {
+    MATCH (this)-[:ACTED_IN]->(this0:Movie)
+    WHERE this0.title = $param0
+} AND NOT (EXISTS {
+    MATCH (this)-[:ACTED_IN]->(this0:Movie)
+    WHERE NOT (this0.title = $param0)
+}))
+CALL {
+    WITH this
+    CALL {
+        WITH *
+        MATCH (this)-[this1:ACTED_IN]->(this2:Movie)
+        WITH this2 { .title, .runtime, __typename: "Movie", __id: toString(id(this2)) } AS this2
+        RETURN this2 AS var3
+        UNION
+        WITH *
+        MATCH (this)-[this4:ACTED_IN]->(this5:Series)
+        WITH this5 { .title, .episodes, __typename: "Series", __id: toString(id(this5)) } AS this5
+        RETURN this5 AS var3
+    }
+    WITH var3
+    RETURN collect(var3) AS var3
+}
+RETURN this { .name, actedIn: var3 } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "actors": [
+    {
+      "name": "RandomString1",
+      "actedIn": [
+        {
+          "title": "RandomString3",
+          "runtime": 61632
+        },
+        {
+          "title": "RandomString4",
+          "episodes": 61753
+        }
+      ]
+    },
+    {
+      "name": "RandomString2",
+      "actedIn": [
+        {
+          "title": "RandomString3",
+          "runtime": 61632
+        }
+      ]
+    }
+  ]
+}
+----
+
+== should read and return union relationship fields with union relationship filter ALL (both implementations in the input and DB)
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (a:Actor { name: "RandomString1" })
+ CREATE (m:Movie { title: "RandomString3", runtime:25423 })
+ CREATE (a)-[:ACTED_IN { screenTime: 26354 }]->(m)
+ CREATE (a)-[:ACTED_IN { screenTime: 74985 }]->(:Series { title: "RandomString4", episodes: 36248 })
+ CREATE (a2:Actor { name: "RandomString2" })
+ CREATE (a2)-[:ACTED_IN { screenTime: 26354 }]->(m)
+ CREATE (a2)-[:ACTED_IN { screenTime: 74985 }]->(:Series { title: "RandomString3", episodes: 36248 })
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+query Actors($title: String) {
+  actors(where: {actedIn_ALL: {Movie: {title: $title}, Series: {title: $title}}}) {
+    name
+    actedIn {
+      ... on Movie {
+        title
+        runtime
+      }
+      ... on Series {
+        title
+        episodes
+      }
+    }
+  }
+}
+----
+
+.GraphQL params input
+[source,json,request=true]
+----
+{
+  "title": "RandomString3"
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "RandomString3",
+  "param1": "RandomString3"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Actor)
+WHERE ((EXISTS {
+    MATCH (this)-[:ACTED_IN]->(this0:Movie)
+    WHERE this0.title = $param0
+} AND NOT (EXISTS {
+    MATCH (this)-[:ACTED_IN]->(this0:Movie)
+    WHERE NOT (this0.title = $param0)
+})) AND (EXISTS {
+    MATCH (this)-[:ACTED_IN]->(this1:Series)
+    WHERE this1.title = $param1
+} AND NOT (EXISTS {
+    MATCH (this)-[:ACTED_IN]->(this1:Series)
+    WHERE NOT (this1.title = $param1)
+})))
+CALL {
+    WITH this
+    CALL {
+        WITH *
+        MATCH (this)-[this2:ACTED_IN]->(this3:Movie)
+        WITH this3 { .title, .runtime, __typename: "Movie", __id: toString(id(this3)) } AS this3
+        RETURN this3 AS var4
+        UNION
+        WITH *
+        MATCH (this)-[this5:ACTED_IN]->(this6:Series)
+        WITH this6 { .title, .episodes, __typename: "Series", __id: toString(id(this6)) } AS this6
+        RETURN this6 AS var4
+    }
+    WITH var4
+    RETURN collect(var4) AS var4
+}
+RETURN this { .name, actedIn: var4 } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "actors": [
+    {
+      "name": "RandomString2",
+      "actedIn": [
+        {
+          "title": "RandomString3",
+          "runtime": 25423
+        },
+        {
+          "title": "RandomString3",
+          "episodes": 36248
+        }
+      ]
+    }
+  ]
+}
+----
+
+== should read and return union relationship fields with union relationship filter ALL (both implementations in the input and one out of two in DB)
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (a:Actor { name: "RandomString1" })
+ CREATE (m:Movie { title: "RandomString3", runtime:24426 })
+ CREATE (a)-[:ACTED_IN { screenTime: 65872 }]->(m)
+ CREATE (a)-[:ACTED_IN { screenTime: 26046 }]->(:Series { title: "RandomString4", episodes: 84714 })
+ CREATE (a2:Actor { name: "RandomString2" })
+ CREATE (a2)-[:ACTED_IN { screenTime: 65872 }]->(m)
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+query Actors($title: String) {
+  actors(where: {actedIn_ALL: {Movie: {title: $title}, Series: {title: $title}}}) {
+    name
+    actedIn {
+      ... on Movie {
+        title
+        runtime
+      }
+      ... on Series {
+        title
+        episodes
+      }
+    }
+  }
+}
+----
+
+.GraphQL params input
+[source,json,request=true]
+----
+{
+  "title": "RandomString3"
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "RandomString3",
+  "param1": "RandomString3"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Actor)
+WHERE ((EXISTS {
+    MATCH (this)-[:ACTED_IN]->(this0:Movie)
+    WHERE this0.title = $param0
+} AND NOT (EXISTS {
+    MATCH (this)-[:ACTED_IN]->(this0:Movie)
+    WHERE NOT (this0.title = $param0)
+})) AND (EXISTS {
+    MATCH (this)-[:ACTED_IN]->(this1:Series)
+    WHERE this1.title = $param1
+} AND NOT (EXISTS {
+    MATCH (this)-[:ACTED_IN]->(this1:Series)
+    WHERE NOT (this1.title = $param1)
+})))
+CALL {
+    WITH this
+    CALL {
+        WITH *
+        MATCH (this)-[this2:ACTED_IN]->(this3:Movie)
+        WITH this3 { .title, .runtime, __typename: "Movie", __id: toString(id(this3)) } AS this3
+        RETURN this3 AS var4
+        UNION
+        WITH *
+        MATCH (this)-[this5:ACTED_IN]->(this6:Series)
+        WITH this6 { .title, .episodes, __typename: "Series", __id: toString(id(this6)) } AS this6
+        RETURN this6 AS var4
+    }
+    WITH var4
+    RETURN collect(var4) AS var4
+}
+RETURN this { .name, actedIn: var4 } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "actors": []
+}
+----
+
+== should read and return interface relationship fields with interface relationship filter SINGLE
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (a:Actor { name: "RandomString1" })
+ CREATE (m:Movie { title: "RandomString3", runtime:55815 })
+ CREATE (a)-[:ACTED_IN { screenTime: 86611 }]->(m)
+ CREATE (a)-[:ACTED_IN { screenTime: 64097 }]->(:Series { title: "RandomString5", episodes: 61405 })
+ CREATE (a2:Actor { name: "RandomString2" })
+ CREATE (a2)-[:ACTED_IN { screenTime: 86611 }]->(:Movie { title: "RandomString4", runtime:55815 })
+ CREATE (a2)-[:ACTED_IN { screenTime: 86611 }]->(m)
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+query Actors($title: String) {
+  actors(where: {actedIn_SINGLE: {Movie: {title: $title}}}) {
+    name
+    actedIn {
+      ... on Movie {
+        title
+        runtime
+      }
+      ... on Series {
+        title
+        episodes
+      }
+    }
+  }
+}
+----
+
+.GraphQL params input
+[source,json,request=true]
+----
+{
+  "title": "RandomString4"
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "RandomString4"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Actor)
+WHERE single(this0 IN [(this)-[:ACTED_IN]->(this0:Movie) WHERE this0.title = $param0 | 1] WHERE true)
+CALL {
+    WITH this
+    CALL {
+        WITH *
+        MATCH (this)-[this1:ACTED_IN]->(this2:Movie)
+        WITH this2 { .title, .runtime, __typename: "Movie", __id: toString(id(this2)) } AS this2
+        RETURN this2 AS var3
+        UNION
+        WITH *
+        MATCH (this)-[this4:ACTED_IN]->(this5:Series)
+        WITH this5 { .title, .episodes, __typename: "Series", __id: toString(id(this5)) } AS this5
+        RETURN this5 AS var3
+    }
+    WITH var3
+    RETURN collect(var3) AS var3
+}
+RETURN this { .name, actedIn: var3 } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "actors": [
+    {
+      "name": "RandomString2",
+      "actedIn": [
+        {
+          "title": "RandomString3",
+          "runtime": 55815
+        },
+        {
+          "title": "RandomString4",
+          "runtime": 55815
+        }
+      ]
+    }
+  ]
+}
+----
+
+== should read and return interface relationship fields with interface relationship filter NONE
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (a:Actor { name: "RandomString1" })
+ CREATE (m:Movie { title: "RandomString3", runtime:9931 })
+ CREATE (a)-[:ACTED_IN { screenTime: 29383 }]->(m)
+ CREATE (a)-[:ACTED_IN { screenTime: 72093 }]->(:Series { title: "RandomString5", episodes: 15912 })
+ CREATE (a2:Actor { name: "RandomString2" })
+ CREATE (a2)-[:ACTED_IN { screenTime: 29383 }]->(:Movie { title: "RandomString4", runtime:9931 })
+ CREATE (a2)-[:ACTED_IN { screenTime: 29383 }]->(m)
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+query Actors($title: String) {
+  actors(where: {actedIn_NONE: {Movie: {title: $title}, Series: {title: $title}}}) {
+    name
+    actedIn {
+      ... on Movie {
+        title
+        runtime
+      }
+      ... on Series {
+        title
+        episodes
+      }
+    }
+  }
+}
+----
+
+.GraphQL params input
+[source,json,request=true]
+----
+{
+  "title": "RandomString4"
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "RandomString4",
+  "param1": "RandomString4"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Actor)
+WHERE (NOT (EXISTS {
+    MATCH (this)-[:ACTED_IN]->(this0:Movie)
+    WHERE this0.title = $param0
+}) AND NOT (EXISTS {
+    MATCH (this)-[:ACTED_IN]->(this1:Series)
+    WHERE this1.title = $param1
+}))
+CALL {
+    WITH this
+    CALL {
+        WITH *
+        MATCH (this)-[this2:ACTED_IN]->(this3:Movie)
+        WITH this3 { .title, .runtime, __typename: "Movie", __id: toString(id(this3)) } AS this3
+        RETURN this3 AS var4
+        UNION
+        WITH *
+        MATCH (this)-[this5:ACTED_IN]->(this6:Series)
+        WITH this6 { .title, .episodes, __typename: "Series", __id: toString(id(this6)) } AS this6
+        RETURN this6 AS var4
+    }
+    WITH var4
+    RETURN collect(var4) AS var4
+}
+RETURN this { .name, actedIn: var4 } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "actors": [
+    {
+      "name": "RandomString1",
+      "actedIn": [
+        {
+          "title": "RandomString3",
+          "runtime": 9931
+        },
+        {
+          "title": "RandomString5",
+          "episodes": 15912
+        }
+      ]
+    }
+  ]
+}
+----
diff --git a/core/src/test/resources/integration-test-files/filtering/operations.adoc b/core/src/test/resources/integration-test-files/filtering/operations.adoc
index c3a7ba0c..135c77a7 100644
--- a/core/src/test/resources/integration-test-files/filtering/operations.adoc
+++ b/core/src/test/resources/integration-test-files/filtering/operations.adoc
@@ -33,7 +33,7 @@ CREATE (:Movie {title: "The Matrix", released: 1999})
 == Combine AND and OR operations
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies(
@@ -49,9 +49,9 @@ CREATE (:Movie {title: "The Matrix", released: 1999})
 [source,json]
 ----
 {
-  "param0": "The Italian Job",
-  "param1": 2003,
-  "param2": "The Lion King"
+  "param0" : "The Italian Job",
+  "param1" : 2003,
+  "param2" : "The Lion King"
 }
 ----
 
@@ -72,18 +72,12 @@ RETURN this {
 [source,json,response=true,ignore-order]
 ----
 {
-  "movies": [
-    {
-      "title": "The Italian Job",
-      "released": 2003
-    },
-    {
-      "title": "The Lion King",
-      "released": 1994
-    }
-  ]
+  "movies" : [ {
+    "title" : "The Italian Job",
+    "released" : 2003
+  }, {
+    "title" : "The Lion King",
+    "released" : 1994
+  } ]
 }
 ----
-
-'''
-
diff --git a/core/src/test/resources/integration-test-files/filtering/operations.js.adoc b/core/src/test/resources/integration-test-files/filtering/operations.js.adoc
new file mode 100644
index 00000000..6183bf7b
--- /dev/null
+++ b/core/src/test/resources/integration-test-files/filtering/operations.js.adoc
@@ -0,0 +1,82 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= Filtering Operations
+
+== Setup
+
+.Schema
+[source,graphql,schema=true]
+----
+type Person {
+  name: String!
+  age: Int!
+  movies: [Movie!]! @relationship(type: "ACTED_IN", direction: IN)
+}
+
+type Movie {
+  title: String!
+  released: Int!
+  actors: [Person!]! @relationship(type: "ACTED_IN", direction: OUT)
+}
+----
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (:Movie {title: "The Matrix", released: 1999})
+ CREATE (:Movie {title: "The Italian Job", released: 1969})
+ CREATE (:Movie {title: "The Italian Job", released: 2003})
+ CREATE (:Movie {title: "The Lion King", released: 1994})
+----
+
+== Combine AND and OR operations
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies(
+    where: {OR: [{title: "The Italian Job", released: 2003}, {title: "The Lion King"}]}
+  ) {
+    title
+    released
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "The Italian Job",
+  "param1": 2003,
+  "param2": "The Lion King"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE ((this.title = $param0 AND this.released = $param1) OR this.title = $param2)
+RETURN this { .title, .released } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "movies": [
+    {
+      "title": "The Italian Job",
+      "released": 2003
+    },
+    {
+      "title": "The Lion King",
+      "released": 1994
+    }
+  ]
+}
+----
diff --git a/core/src/test/resources/integration-test-files/filtering/single-relationship.adoc b/core/src/test/resources/integration-test-files/filtering/single-relationship.adoc
index acf43a31..18adb1b5 100644
--- a/core/src/test/resources/integration-test-files/filtering/single-relationship.adoc
+++ b/core/src/test/resources/integration-test-files/filtering/single-relationship.adoc
@@ -45,7 +45,7 @@ CREATE(jw:Person {name: "Jon Wu"})
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies(
@@ -60,8 +60,8 @@ CREATE(jw:Person {name: "Jon Wu"})
 [source,json]
 ----
 {
-  "param0": "Jon Wu",
-  "param1": "Jon Wu"
+  "param0" : "Jon Wu",
+  "param1" : "Jon Wu"
 }
 ----
 
@@ -86,19 +86,14 @@ RETURN this {
 [source,json,response=true,ignore-order]
 ----
 {
-  "movies": [
-    {
-      "title": "Hard Target"
-    },
-    {
-      "title": "Chi bi"
-    }
-  ]
+  "movies" : [ {
+    "title" : "Hard Target"
+  }, {
+    "title" : "Chi bi"
+  } ]
 }
 ----
 
-'''
-
 == Filter on optional relationships without results
 
 .Test Data
@@ -112,7 +107,7 @@ CREATE(jw:Person {name: "Jon Wu"})
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies(where: {producer: {name: "Uw Noj"}}) {
@@ -125,7 +120,7 @@ CREATE(jw:Person {name: "Jon Wu"})
 [source,json]
 ----
 {
-  "param0": "Uw Noj"
+  "param0" : "Uw Noj"
 }
 ----
 
@@ -146,9 +141,6 @@ RETURN this {
 [source,json,response=true]
 ----
 {
-  "movies": []
+  "movies" : [ ]
 }
 ----
-
-'''
-
diff --git a/core/src/test/resources/integration-test-files/filtering/single-relationship.js.adoc b/core/src/test/resources/integration-test-files/filtering/single-relationship.js.adoc
new file mode 100644
index 00000000..07fb679d
--- /dev/null
+++ b/core/src/test/resources/integration-test-files/filtering/single-relationship.js.adoc
@@ -0,0 +1,139 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= Single relationship (1-*) filtering
+
+== Setup
+
+.Schema
+[source,graphql,schema=true]
+----
+type Person {
+  name: String!
+  actedIn: [Movie!]! @relationship(type: "ACTED_IN", direction: OUT)
+  directedMovies: [Movie!]! @relationship(type: "DIRECTED", direction: OUT)
+  producedMovies: [Movie!]! @relationship(type: "PRODUCED", direction: OUT)
+}
+
+type Movie {
+  title: String!
+  actors: [Person!]! @relationship(type: "ACTED_IN", direction: OUT)
+  director: Person! @relationship(type: "DIRECTED", direction: IN)
+  producer: Person @relationship(type: "PRODUCED", direction: IN)
+}
+----
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (:Movie {title: "The Matrix", released: 1999})
+ CREATE (:Movie {title: "The Italian Job", released: 1969})
+ CREATE (:Movie {title: "The Italian Job", released: 2003})
+ CREATE (:Movie {title: "The Lion King", released: 1994})
+----
+
+== Filter on required and optional relationships
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE(jw:Person {name: "Jon Wu"})
+ CREATE(:Movie {title: "Hard Target"})<-[:DIRECTED]-(jw)
+ CREATE(cb:Movie {title: "Chi bi"})<-[:DIRECTED]-(jw)
+ CREATE(cb)<-[:PRODUCED]-(jw)
+ CREATE(m:Movie {title: "Avatar"})<-[:DIRECTED]-(:Person {name: "Richie McFamous"})
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies(
+    where: {OR: [{director: {name: "Jon Wu"}}, {producer: {name: "Jon Wu"}}]}
+  ) {
+    title
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "Jon Wu",
+  "param1": "Jon Wu"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+OPTIONAL MATCH (this)<-[:DIRECTED]-(this0:Person)
+WITH *, count(this0) AS directorCount
+WITH *
+WHERE ((directorCount <> 0 AND this0.name = $param0) OR single(this1 IN [(this)<-[:PRODUCED]-(this1:Person) WHERE this1.name = $param1 | 1] WHERE true))
+RETURN this { .title } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "movies": [
+    {
+      "title": "Hard Target"
+    },
+    {
+      "title": "Chi bi"
+    }
+  ]
+}
+----
+
+== Filter on optional relationships without results
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE(jw:Person {name: "Jon Wu"})
+ CREATE(:Movie {title: "Hard Target"})<-[:DIRECTED]-(jw)
+ CREATE(cb:Movie {title: "Chi bi"})<-[:DIRECTED]-(jw)
+ CREATE(cb)<-[:PRODUCED]-(jw)
+ CREATE(m:Movie {title: "Avatar"})<-[:DIRECTED]-(:Person {name: "Richie McFamous"})
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies(where: {producer: {name: "Uw Noj"}}) {
+    title
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "Uw Noj"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE single(this0 IN [(this)<-[:PRODUCED]-(this0:Person) WHERE this0.name = $param0 | 1] WHERE true)
+RETURN this { .title } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "movies": []
+}
+----
diff --git a/core/src/test/resources/integration-test-files/filtering/typename-in.adoc b/core/src/test/resources/integration-test-files/filtering/typename-in.adoc
index b67889c8..ad281527 100644
--- a/core/src/test/resources/integration-test-files/filtering/typename-in.adoc
+++ b/core/src/test/resources/integration-test-files/filtering/typename-in.adoc
@@ -53,7 +53,7 @@ CREATE(a:Actor { name: "Keanu" })
 == top-level
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   productions(
@@ -69,9 +69,9 @@ CREATE(a:Actor { name: "Keanu" })
 [source,json]
 ----
 {
-  "param0": "The Matrix",
-  "param1": "The Matrix",
-  "param2": "The Matrix"
+  "param0" : "The Matrix",
+  "param1" : "The Matrix",
+  "param2" : "The Matrix"
 }
 ----
 
@@ -118,25 +118,20 @@ RETURN this AS this
 [source,json,response=true,ignore-order]
 ----
 {
-  "productions": [
-    {
-      "__typename": "Movie",
-      "title": "The Matrix"
-    },
-    {
-      "__typename": "Series",
-      "title": "The Matrix animated series"
-    }
-  ]
+  "productions" : [ {
+    "__typename" : "Movie",
+    "title" : "The Matrix"
+  }, {
+    "__typename" : "Series",
+    "title" : "The Matrix animated series"
+  } ]
 }
 ----
 
-'''
-
 == nested
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   actors {
@@ -154,9 +149,9 @@ RETURN this AS this
 [source,json]
 ----
 {
-  "param0": "The Matrix",
-  "param1": "The Matrix",
-  "param2": "The Matrix"
+  "param0" : "The Matrix",
+  "param1" : "The Matrix",
+  "param2" : "The Matrix"
 }
 ----
 
@@ -213,22 +208,14 @@ RETURN this {
 [source,json,response=true,ignore-order]
 ----
 {
-  "actors": [
-    {
-      "actedIn": [
-        {
-          "__typename": "Movie",
-          "title": "The Matrix"
-        },
-        {
-          "__typename": "Series",
-          "title": "The Matrix animated series"
-        }
-      ]
-    }
-  ]
+  "actors" : [ {
+    "actedIn" : [ {
+      "__typename" : "Movie",
+      "title" : "The Matrix"
+    }, {
+      "__typename" : "Series",
+      "title" : "The Matrix animated series"
+    } ]
+  } ]
 }
 ----
-
-'''
-
diff --git a/core/src/test/resources/integration-test-files/filtering/typename-in.js.adoc b/core/src/test/resources/integration-test-files/filtering/typename-in.js.adoc
new file mode 100644
index 00000000..c9a795cd
--- /dev/null
+++ b/core/src/test/resources/integration-test-files/filtering/typename-in.js.adoc
@@ -0,0 +1,196 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= typename_IN
+
+== Setup
+
+.Schema
+[source,graphql,schema=true]
+----
+interface Production {
+  title: String!
+  cost: Float!
+}
+
+type Movie implements Production {
+  title: String!
+  cost: Float!
+  runtime: Int!
+}
+
+type Series implements Production {
+  title: String!
+  cost: Float!
+  episodes: Int!
+}
+
+type Cartoon implements Production {
+  title: String!
+  cost: Float!
+  cartoonist: String!
+}
+
+type ActedIn @relationshipProperties {
+  screenTime: Int!
+}
+
+type Actor {
+  name: String!
+  actedIn: [Production!]! @relationship(type: "ACTED_IN", direction: OUT, properties: "ActedIn")
+}
+----
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE(a:Actor { name: "Keanu" })
+ CREATE(a)-[:ACTED_IN]->(m:Movie { title: "The Matrix" })
+ CREATE(a)-[:ACTED_IN]->(s:Series { title: "The Matrix animated series" })
+ CREATE(a)-[:ACTED_IN]->(c:Cartoon { title: "Matrix the cartoon" })
+----
+
+== top-level
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  productions(
+    where: {OR: [{AND: [{title: "The Matrix"}, {typename_IN: [Movie]}]}, {typename_IN: [Series]}]}
+  ) {
+    __typename
+    title
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "The Matrix",
+  "param1": "The Matrix",
+  "param2": "The Matrix"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+CALL {
+    MATCH (this0:Cartoon)
+    WHERE ((this0.title = $param0 AND this0:Movie) OR this0:Series)
+    WITH this0 { .title, __typename: "Cartoon", __id: toString(id(this0)) } AS this0
+    RETURN this0 AS this
+    UNION
+    MATCH (this1:Movie)
+    WHERE ((this1.title = $param1 AND this1:Movie) OR this1:Series)
+    WITH this1 { .title, __typename: "Movie", __id: toString(id(this1)) } AS this1
+    RETURN this1 AS this
+    UNION
+    MATCH (this2:Series)
+    WHERE ((this2.title = $param2 AND this2:Movie) OR this2:Series)
+    WITH this2 { .title, __typename: "Series", __id: toString(id(this2)) } AS this2
+    RETURN this2 AS this
+}
+WITH this
+RETURN this AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "productions": [
+    {
+      "__typename": "Movie",
+      "title": "The Matrix"
+    },
+    {
+      "__typename": "Series",
+      "title": "The Matrix animated series"
+    }
+  ]
+}
+----
+
+== nested
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  actors {
+    actedIn(
+      where: {OR: [{AND: [{title: "The Matrix"}, {typename_IN: [Movie]}]}, {typename_IN: [Series]}]}
+    ) {
+      __typename
+      title
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "The Matrix",
+  "param1": "The Matrix",
+  "param2": "The Matrix"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Actor)
+CALL {
+    WITH this
+    CALL {
+        WITH *
+        MATCH (this)-[this0:ACTED_IN]->(this1:Cartoon)
+        WHERE ((this1.title = $param0 AND this1:Movie) OR this1:Series)
+        WITH this1 { .title, __typename: "Cartoon", __id: toString(id(this1)) } AS this1
+        RETURN this1 AS var2
+        UNION
+        WITH *
+        MATCH (this)-[this3:ACTED_IN]->(this4:Movie)
+        WHERE ((this4.title = $param1 AND this4:Movie) OR this4:Series)
+        WITH this4 { .title, __typename: "Movie", __id: toString(id(this4)) } AS this4
+        RETURN this4 AS var2
+        UNION
+        WITH *
+        MATCH (this)-[this5:ACTED_IN]->(this6:Series)
+        WHERE ((this6.title = $param2 AND this6:Movie) OR this6:Series)
+        WITH this6 { .title, __typename: "Series", __id: toString(id(this6)) } AS this6
+        RETURN this6 AS var2
+    }
+    WITH var2
+    RETURN collect(var2) AS var2
+}
+RETURN this { actedIn: var2 } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "actors": [
+    {
+      "actedIn": [
+        {
+          "__typename": "Movie",
+          "title": "The Matrix"
+        },
+        {
+          "__typename": "Series",
+          "title": "The Matrix animated series"
+        }
+      ]
+    }
+  ]
+}
+----
diff --git a/core/src/test/resources/integration-test-files/find.adoc b/core/src/test/resources/integration-test-files/find.adoc
index ed9ce2f5..86e3493c 100644
--- a/core/src/test/resources/integration-test-files/find.adoc
+++ b/core/src/test/resources/integration-test-files/find.adoc
@@ -27,7 +27,7 @@ CREATE (:Movie {id: "RandomString1"}), (:Movie {id: "RandomString1"}), (:Movie {
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query ($id: ID) {
   movies(where: {id: $id}) {
@@ -40,7 +40,7 @@ query ($id: ID) {
 [source,json,request=true]
 ----
 {
-  "id": "RandomString1"
+  "id" : "RandomString1"
 }
 ----
 
@@ -48,7 +48,7 @@ query ($id: ID) {
 [source,json]
 ----
 {
-  "param0": "RandomString1"
+  "param0" : "RandomString1"
 }
 ----
 
@@ -66,22 +66,16 @@ RETURN this {
 [source,json,response=true,ignore-order]
 ----
 {
-  "movies": [
-    {
-      "id": "RandomString1"
-    },
-    {
-      "id": "RandomString1"
-    },
-    {
-      "id": "RandomString1"
-    }
-  ]
+  "movies" : [ {
+    "id" : "RandomString1"
+  }, {
+    "id" : "RandomString1"
+  }, {
+    "id" : "RandomString1"
+  } ]
 }
 ----
 
-'''
-
 == should find Move by id and limit
 
 .Schema
@@ -106,7 +100,7 @@ CREATE (:Movie {id: "RandomString1"}), (:Movie {id: "RandomString1"}), (:Movie {
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query ($id: ID) {
   movies(where: {id: $id}, options: {limit: 2}) {
@@ -119,7 +113,7 @@ query ($id: ID) {
 [source,json,request=true]
 ----
 {
-  "id": "RandomString1"
+  "id" : "RandomString1"
 }
 ----
 
@@ -127,8 +121,8 @@ query ($id: ID) {
 [source,json]
 ----
 {
-  "param0": "RandomString1",
-  "param1": 2
+  "param0" : "RandomString1",
+  "param1" : 2
 }
 ----
 
@@ -147,19 +141,14 @@ RETURN this {
 [source,json,response=true,ignore-order]
 ----
 {
-  "movies": [
-    {
-      "id": "RandomString1"
-    },
-    {
-      "id": "RandomString1"
-    }
-  ]
+  "movies" : [ {
+    "id" : "RandomString1"
+  }, {
+    "id" : "RandomString1"
+  } ]
 }
 ----
 
-'''
-
 == should find Movie IN ids
 
 .Schema
@@ -184,7 +173,7 @@ CREATE (:Movie {id: "RandomString1"}), (:Movie {id: "RandomString2"}), (:Movie {
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query ($ids: [ID!]) {
   movies(where: {id_IN: $ids}) {
@@ -197,11 +186,7 @@ query ($ids: [ID!]) {
 [source,json,request=true]
 ----
 {
-  "ids": [
-    "RandomString1",
-    "RandomString2",
-    "RandomString3"
-  ]
+  "ids" : [ "RandomString1", "RandomString2", "RandomString3" ]
 }
 ----
 
@@ -209,11 +194,7 @@ query ($ids: [ID!]) {
 [source,json]
 ----
 {
-  "param0": [
-    "RandomString1",
-    "RandomString2",
-    "RandomString3"
-  ]
+  "param0" : [ "RandomString1", "RandomString2", "RandomString3" ]
 }
 ----
 
@@ -231,22 +212,16 @@ RETURN this {
 [source,json,response=true,ignore-order]
 ----
 {
-  "movies": [
-    {
-      "id": "RandomString2"
-    },
-    {
-      "id": "RandomString3"
-    },
-    {
-      "id": "RandomString1"
-    }
-  ]
+  "movies" : [ {
+    "id" : "RandomString2"
+  }, {
+    "id" : "RandomString3"
+  }, {
+    "id" : "RandomString1"
+  } ]
 }
 ----
 
-'''
-
 == should find Movie IN ids with one other param
 
 .Schema
@@ -271,7 +246,7 @@ CREATE (:User {id: "RandomString1", title: "RandomString4"}), (:User {id: "Rando
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query ($ids: [ID!], $title: String) {
   movies(where: {id_IN: $ids, title: $title}) {
@@ -285,12 +260,8 @@ query ($ids: [ID!], $title: String) {
 [source,json,request=true]
 ----
 {
-  "ids": [
-    "RandomString1",
-    "RandomString2",
-    "RandomString3"
-  ],
-  "title": "RandomString4"
+  "ids" : [ "RandomString1", "RandomString2", "RandomString3" ],
+  "title" : "RandomString4"
 }
 ----
 
@@ -298,12 +269,8 @@ query ($ids: [ID!], $title: String) {
 [source,json]
 ----
 {
-  "param0": [
-    "RandomString1",
-    "RandomString2",
-    "RandomString3"
-  ],
-  "param1": "RandomString4"
+  "param0" : [ "RandomString1", "RandomString2", "RandomString3" ],
+  "param1" : "RandomString4"
 }
 ----
 
@@ -323,12 +290,10 @@ RETURN this {
 [source,json,response=true]
 ----
 {
-  "movies": []
+  "movies" : [ ]
 }
 ----
 
-'''
-
 == should find Movie IN id and many Movie.actor IN id
 
 .Schema
@@ -354,7 +319,7 @@ CREATE (:Movie {id: "RandomString1"})-[:ACTED_IN]->(:Actor {id: "RandomString4"}
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query ($movieIds: [ID!], $actorIds: [ID!]) {
   movies(where: {id_IN: $movieIds}) {
@@ -376,16 +341,8 @@ query ($movieIds: [ID!], $actorIds: [ID!]) {
 [source,json,request=true]
 ----
 {
-  "movieIds": [
-    "RandomString1",
-    "RandomString2",
-    "RandomString3"
-  ],
-  "actorIds": [
-    "RandomString4",
-    "RandomString5",
-    "RandomString6"
-  ]
+  "actorIds" : [ "RandomString4", "RandomString5", "RandomString6" ],
+  "movieIds" : [ "RandomString1", "RandomString2", "RandomString3" ]
 }
 ----
 
@@ -393,16 +350,8 @@ query ($movieIds: [ID!], $actorIds: [ID!]) {
 [source,json]
 ----
 {
-  "param0": [
-    "RandomString1",
-    "RandomString2",
-    "RandomString3"
-  ],
-  "param1": [
-    "RandomString4",
-    "RandomString5",
-    "RandomString6"
-  ]
+  "param0" : [ "RandomString1", "RandomString2", "RandomString3" ],
+  "param1" : [ "RandomString4", "RandomString5", "RandomString6" ]
 }
 ----
 
@@ -448,67 +397,43 @@ RETURN this {
 [source,json,response=true,ignore-order]
 ----
 {
-  "movies": [
-    {
-      "id": "RandomString3",
-      "actors": [
-        {
-          "id": "RandomString6",
-          "movies": [
-            {
-              "id": "RandomString3",
-              "actors": [
-                {
-                  "id": "RandomString6"
-                }
-              ]
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "id": "RandomString1",
-      "actors": [
-        {
-          "id": "RandomString4",
-          "movies": [
-            {
-              "id": "RandomString1",
-              "actors": [
-                {
-                  "id": "RandomString4"
-                }
-              ]
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "id": "RandomString2",
-      "actors": [
-        {
-          "id": "RandomString5",
-          "movies": [
-            {
-              "id": "RandomString2",
-              "actors": [
-                {
-                  "id": "RandomString5"
-                }
-              ]
-            }
-          ]
-        }
-      ]
-    }
-  ]
+  "movies" : [ {
+    "id" : "RandomString3",
+    "actors" : [ {
+      "id" : "RandomString6",
+      "movies" : [ {
+        "id" : "RandomString3",
+        "actors" : [ {
+          "id" : "RandomString6"
+        } ]
+      } ]
+    } ]
+  }, {
+    "id" : "RandomString1",
+    "actors" : [ {
+      "id" : "RandomString4",
+      "movies" : [ {
+        "id" : "RandomString1",
+        "actors" : [ {
+          "id" : "RandomString4"
+        } ]
+      } ]
+    } ]
+  }, {
+    "id" : "RandomString2",
+    "actors" : [ {
+      "id" : "RandomString5",
+      "movies" : [ {
+        "id" : "RandomString2",
+        "actors" : [ {
+          "id" : "RandomString5"
+        } ]
+      } ]
+    } ]
+  } ]
 }
 ----
 
-'''
-
 == should use OR and find Movie by id or title
 
 .Schema
@@ -534,7 +459,7 @@ CREATE (:Movie {id: "RandomString1", title: "RandomString2"})
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query ($movieWhere: MovieWhere) {
   movies(where: $movieWhere) {
@@ -548,13 +473,11 @@ query ($movieWhere: MovieWhere) {
 [source,json,request=true]
 ----
 {
-  "movieWhere": {
-    "OR": [
-      {
-        "title": "RandomString2",
-        "id": "RandomString1"
-      }
-    ]
+  "movieWhere" : {
+    "OR" : [ {
+      "title" : "RandomString2",
+      "id" : "RandomString1"
+    } ]
   }
 }
 ----
@@ -563,8 +486,8 @@ query ($movieWhere: MovieWhere) {
 [source,json]
 ----
 {
-  "param0": "RandomString1",
-  "param1": "RandomString2"
+  "param0" : "RandomString1",
+  "param1" : "RandomString2"
 }
 ----
 
@@ -584,14 +507,9 @@ RETURN this {
 [source,json,response=true]
 ----
 {
-  "movies": [
-    {
-      "id": "RandomString1",
-      "title": "RandomString2"
-    }
-  ]
+  "movies" : [ {
+    "id" : "RandomString1",
+    "title" : "RandomString2"
+  } ]
 }
 ----
-
-'''
-
diff --git a/core/src/test/resources/integration-test-files/find.js.adoc b/core/src/test/resources/integration-test-files/find.js.adoc
new file mode 100644
index 00000000..ddf469dc
--- /dev/null
+++ b/core/src/test/resources/integration-test-files/find.js.adoc
@@ -0,0 +1,562 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= find
+
+== should find Movie by id
+
+.Schema
+[source,graphql,schema=true]
+----
+type Actor {
+  name: String
+  movies: [Movie!]! @relationship(type: "ACTED_IN", direction: IN)
+}
+
+type Movie {
+  id: ID!
+  title: String!
+  actors: [Actor!]! @relationship(type: "ACTED_IN", direction: OUT)
+}
+----
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (:Movie {id: "RandomString1"}), (:Movie {id: "RandomString1"}), (:Movie {id: "RandomString1"})
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+query ($id: ID) {
+  movies(where: {id: $id}) {
+    id
+  }
+}
+----
+
+.GraphQL params input
+[source,json,request=true]
+----
+{
+  "id": "RandomString1"
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "RandomString1"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE this.id = $param0
+RETURN this { .id } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "movies": [
+    {
+      "id": "RandomString1"
+    },
+    {
+      "id": "RandomString1"
+    },
+    {
+      "id": "RandomString1"
+    }
+  ]
+}
+----
+
+== should find Move by id and limit
+
+.Schema
+[source,graphql,schema=true]
+----
+type Actor {
+  name: String
+  movies: [Movie!]! @relationship(type: "ACTED_IN", direction: IN)
+}
+
+type Movie {
+  id: ID!
+  title: String!
+  actors: [Actor!]! @relationship(type: "ACTED_IN", direction: OUT)
+}
+----
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (:Movie {id: "RandomString1"}), (:Movie {id: "RandomString1"}), (:Movie {id: "RandomString1"})
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+query ($id: ID) {
+  movies(where: {id: $id}, options: {limit: 2}) {
+    id
+  }
+}
+----
+
+.GraphQL params input
+[source,json,request=true]
+----
+{
+  "id": "RandomString1"
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "RandomString1",
+  "param1": 2
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE this.id = $param0
+WITH *
+
+LIMIT $param1
+RETURN this { .id } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "movies": [
+    {
+      "id": "RandomString1"
+    },
+    {
+      "id": "RandomString1"
+    }
+  ]
+}
+----
+
+== should find Movie IN ids
+
+.Schema
+[source,graphql,schema=true]
+----
+type Actor {
+  name: String
+  movies: [Movie!]! @relationship(type: "ACTED_IN", direction: IN)
+}
+
+type Movie {
+  id: ID!
+  title: String!
+  actors: [Actor!]! @relationship(type: "ACTED_IN", direction: OUT)
+}
+----
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (:Movie {id: "RandomString1"}), (:Movie {id: "RandomString2"}), (:Movie {id: "RandomString3"})
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+query ($ids: [ID!]) {
+  movies(where: {id_IN: $ids}) {
+    id
+  }
+}
+----
+
+.GraphQL params input
+[source,json,request=true]
+----
+{
+  "ids": [
+    "RandomString1",
+    "RandomString2",
+    "RandomString3"
+  ]
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": [
+    "RandomString1",
+    "RandomString2",
+    "RandomString3"
+  ]
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE this.id IN $param0
+RETURN this { .id } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "movies": [
+    {
+      "id": "RandomString1"
+    },
+    {
+      "id": "RandomString2"
+    },
+    {
+      "id": "RandomString3"
+    }
+  ]
+}
+----
+
+== should find Movie IN ids with one other param
+
+.Schema
+[source,graphql,schema=true]
+----
+type Actor {
+  name: String
+  movies: [Movie!]! @relationship(type: "ACTED_IN", direction: IN)
+}
+
+type Movie {
+  id: ID!
+  title: String!
+  actors: [Actor!]! @relationship(type: "ACTED_IN", direction: OUT)
+}
+----
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (:User {id: "RandomString1", title: "RandomString4"}), (:User {id: "RandomString2", title: "RandomString4"}), (:User {id: "RandomString3", title: "RandomString4"})
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+query ($ids: [ID!], $title: String) {
+  movies(where: {id_IN: $ids, title: $title}) {
+    id
+    title
+  }
+}
+----
+
+.GraphQL params input
+[source,json,request=true]
+----
+{
+  "ids": [
+    "RandomString1",
+    "RandomString2",
+    "RandomString3"
+  ],
+  "title": "RandomString4"
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": [
+    "RandomString1",
+    "RandomString2",
+    "RandomString3"
+  ],
+  "param1": "RandomString4"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE (this.id IN $param0 AND this.title = $param1)
+RETURN this { .id, .title } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "movies": []
+}
+----
+
+== should find Movie IN id and many Movie.actor IN id
+
+.Schema
+[source,graphql,schema=true]
+----
+type Actor {
+  id: ID!
+  movies: [Movie!]! @relationship(type: "ACTED_IN", direction: IN)
+}
+
+type Movie {
+  id: ID!
+  actors: [Actor!]! @relationship(type: "ACTED_IN", direction: OUT)
+}
+----
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (:Movie {id: "RandomString1"})-[:ACTED_IN]->(:Actor {id: "RandomString4"}),
+ (:Movie {id: "RandomString2"})-[:ACTED_IN]->(:Actor {id: "RandomString5"}),
+ (:Movie {id: "RandomString3"})-[:ACTED_IN]->(:Actor {id: "RandomString6"})
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+query ($movieIds: [ID!], $actorIds: [ID!]) {
+  movies(where: {id_IN: $movieIds}) {
+    id
+    actors(where: {id_IN: $actorIds}) {
+      id
+      movies {
+        id
+        actors {
+          id
+        }
+      }
+    }
+  }
+}
+----
+
+.GraphQL params input
+[source,json,request=true]
+----
+{
+  "movieIds": [
+    "RandomString1",
+    "RandomString2",
+    "RandomString3"
+  ],
+  "actorIds": [
+    "RandomString4",
+    "RandomString5",
+    "RandomString6"
+  ]
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": [
+    "RandomString1",
+    "RandomString2",
+    "RandomString3"
+  ],
+  "param1": [
+    "RandomString4",
+    "RandomString5",
+    "RandomString6"
+  ]
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE this.id IN $param0
+CALL {
+    WITH this
+    MATCH (this)-[this0:ACTED_IN]->(this1:Actor)
+    WHERE this1.id IN $param1
+    CALL {
+        WITH this1
+        MATCH (this1)<-[this2:ACTED_IN]-(this3:Movie)
+        CALL {
+            WITH this3
+            MATCH (this3)-[this4:ACTED_IN]->(this5:Actor)
+            WITH this5 { .id } AS this5
+            RETURN collect(this5) AS var6
+        }
+        WITH this3 { .id, actors: var6 } AS this3
+        RETURN collect(this3) AS var7
+    }
+    WITH this1 { .id, movies: var7 } AS this1
+    RETURN collect(this1) AS var8
+}
+RETURN this { .id, actors: var8 } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "movies": [
+    {
+      "id": "RandomString3",
+      "actors": [
+        {
+          "id": "RandomString6",
+          "movies": [
+            {
+              "id": "RandomString3",
+              "actors": [
+                {
+                  "id": "RandomString6"
+                }
+              ]
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "id": "RandomString1",
+      "actors": [
+        {
+          "id": "RandomString4",
+          "movies": [
+            {
+              "id": "RandomString1",
+              "actors": [
+                {
+                  "id": "RandomString4"
+                }
+              ]
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "id": "RandomString2",
+      "actors": [
+        {
+          "id": "RandomString5",
+          "movies": [
+            {
+              "id": "RandomString2",
+              "actors": [
+                {
+                  "id": "RandomString5"
+                }
+              ]
+            }
+          ]
+        }
+      ]
+    }
+  ]
+}
+----
+
+== should use OR and find Movie by id or title
+
+.Schema
+[source,graphql,schema=true]
+----
+type Actor {
+  name: String
+  movies: [Movie!]! @relationship(type: "ACTED_IN", direction: IN)
+}
+
+type Movie {
+  id: ID!
+  title: String!
+  actors: [Actor!]! @relationship(type: "ACTED_IN", direction: OUT)
+  mainActor: Actor! @relationship(type: "MAIN_ACTOR", direction: OUT)
+}
+----
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (:Movie {id: "RandomString1", title: "RandomString2"})
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+query ($movieWhere: MovieWhere) {
+  movies(where: $movieWhere) {
+    id
+    title
+  }
+}
+----
+
+.GraphQL params input
+[source,json,request=true]
+----
+{
+  "movieWhere": {
+    "OR": [
+      {
+        "title": "RandomString2",
+        "id": "RandomString1"
+      }
+    ]
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "RandomString1",
+  "param1": "RandomString2"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE (this.id = $param0 AND this.title = $param1)
+RETURN this { .id, .title } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "movies": [
+    {
+      "id": "RandomString1",
+      "title": "RandomString2"
+    }
+  ]
+}
+----
diff --git a/core/src/test/resources/integration-test-files/interfaces/relationships/read.adoc b/core/src/test/resources/integration-test-files/interfaces/relationships/read.adoc
index be1c7e06..c94773b4 100644
--- a/core/src/test/resources/integration-test-files/interfaces/relationships/read.adoc
+++ b/core/src/test/resources/integration-test-files/interfaces/relationships/read.adoc
@@ -44,7 +44,7 @@ CREATE (a:Actor { name: "RandomString1" })
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query Actors($name: String) {
   actors(where: {name: $name}) {
@@ -66,7 +66,7 @@ query Actors($name: String) {
 [source,json,request=true]
 ----
 {
-  "name": "RandomString1"
+  "name" : "RandomString1"
 }
 ----
 
@@ -74,7 +74,7 @@ query Actors($name: String) {
 [source,json]
 ----
 {
-  "param0": "RandomString1"
+  "param0" : "RandomString1"
 }
 ----
 
@@ -118,26 +118,19 @@ RETURN this {
 [source,json,response=true,ignore-order]
 ----
 {
-  "actors": [
-    {
-      "name": "RandomString1",
-      "actedIn": [
-        {
-          "title": "RandomString2",
-          "runtime": 88052
-        },
-        {
-          "title": "RandomString3",
-          "episodes": 45953
-        }
-      ]
-    }
-  ]
+  "actors" : [ {
+    "name" : "RandomString1",
+    "actedIn" : [ {
+      "title" : "RandomString2",
+      "runtime" : 88052
+    }, {
+      "title" : "RandomString3",
+      "episodes" : 45953
+    } ]
+  } ]
 }
 ----
 
-'''
-
 == should read and return sorted interface relationship fields
 
 .Test Data
@@ -149,7 +142,7 @@ CREATE (a:Actor { name: "RandomString1" })
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query Actors($name: String) {
   actors(where: {name: $name}) {
@@ -171,7 +164,7 @@ query Actors($name: String) {
 [source,json,request=true]
 ----
 {
-  "name": "RandomString1"
+  "name" : "RandomString1"
 }
 ----
 
@@ -179,7 +172,7 @@ query Actors($name: String) {
 [source,json]
 ----
 {
-  "param0": "RandomString1"
+  "param0" : "RandomString1"
 }
 ----
 
@@ -223,34 +216,25 @@ RETURN this {
 [source,json,response=true]
 ----
 {
-  "actors": [
-    {
-      "name": "RandomString1",
-      "actedIn": [
-        {
-          "title": "D",
-          "episodes": 8135
-        },
-        {
-          "title": "C",
-          "episodes": 64675
-        },
-        {
-          "title": "B",
-          "runtime": 76130
-        },
-        {
-          "title": "A",
-          "runtime": 23408
-        }
-      ]
-    }
-  ]
+  "actors" : [ {
+    "name" : "RandomString1",
+    "actedIn" : [ {
+      "title" : "D",
+      "episodes" : 8135
+    }, {
+      "title" : "C",
+      "episodes" : 64675
+    }, {
+      "title" : "B",
+      "runtime" : 76130
+    }, {
+      "title" : "A",
+      "runtime" : 23408
+    } ]
+  } ]
 }
 ----
 
-'''
-
 == should read and return non-array interface relationship fields
 
 .Test Data
@@ -263,7 +247,7 @@ CREATE (a:Actor { name: "RandomString1" })
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query Actors($name: String) {
   actors(where: {name: $name}) {
@@ -285,7 +269,7 @@ query Actors($name: String) {
 [source,json,request=true]
 ----
 {
-  "name": "RandomString1"
+  "name" : "RandomString1"
 }
 ----
 
@@ -293,7 +277,7 @@ query Actors($name: String) {
 [source,json]
 ----
 {
-  "param0": "RandomString1"
+  "param0" : "RandomString1"
 }
 ----
 
@@ -337,20 +321,16 @@ RETURN this {
 [source,json,response=true]
 ----
 {
-  "actors": [
-    {
-      "name": "RandomString1",
-      "currentlyActingIn": {
-        "title": "RandomString4",
-        "runtime": 6106
-      }
+  "actors" : [ {
+    "name" : "RandomString1",
+    "currentlyActingIn" : {
+      "title" : "RandomString4",
+      "runtime" : 6106
     }
-  ]
+  } ]
 }
 ----
 
-'''
-
 == should read and return interface relationship fields with shared where
 
 .Test Data
@@ -363,7 +343,7 @@ CREATE (a:Actor { name: "RandomString1" })
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query Actors($name: String, $title: String) {
   actors(where: {name: $name}) {
@@ -385,8 +365,8 @@ query Actors($name: String, $title: String) {
 [source,json,request=true]
 ----
 {
-  "name": "RandomString1",
-  "title": "Apple"
+  "name" : "RandomString1",
+  "title" : "Apple"
 }
 ----
 
@@ -394,9 +374,9 @@ query Actors($name: String, $title: String) {
 [source,json]
 ----
 {
-  "param0": "RandomString1",
-  "param1": "Apple",
-  "param2": "Apple"
+  "param0" : "RandomString1",
+  "param1" : "Apple",
+  "param2" : "Apple"
 }
 ----
 
@@ -442,23 +422,15 @@ RETURN this {
 [source,json,response=true,ignore-order]
 ----
 {
-  "actors": [
-    {
-      "name": "RandomString1",
-      "actedIn": [
-        {
-          "title": "Apple",
-          "runtime": 76300
-        },
-        {
-          "title": "Apple",
-          "episodes": 52388
-        }
-      ]
-    }
-  ]
+  "actors" : [ {
+    "name" : "RandomString1",
+    "actedIn" : [ {
+      "title" : "Apple",
+      "runtime" : 76300
+    }, {
+      "title" : "Apple",
+      "episodes" : 52388
+    } ]
+  } ]
 }
 ----
-
-'''
-
diff --git a/core/src/test/resources/integration-test-files/interfaces/relationships/read.js.adoc b/core/src/test/resources/integration-test-files/interfaces/relationships/read.js.adoc
new file mode 100644
index 00000000..f643d3be
--- /dev/null
+++ b/core/src/test/resources/integration-test-files/interfaces/relationships/read.js.adoc
@@ -0,0 +1,409 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= interface relationships
+
+== Setup
+
+.Schema
+[source,graphql,schema=true]
+----
+interface Production {
+  title: String!
+}
+
+type Movie implements Production {
+  title: String!
+  runtime: Int!
+}
+
+type Series implements Production {
+  title: String!
+  episodes: Int!
+}
+
+type ActedIn @relationshipProperties {
+  screenTime: Int!
+}
+
+type Actor {
+  name: String!
+  currentlyActingIn: Production @relationship(type: "CURRENTLY_ACTING_IN", direction: OUT)
+  actedIn: [Production!]! @relationship(type: "ACTED_IN", direction: OUT, properties: "ActedIn")
+}
+----
+
+== should read and return interface relationship fields
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (a:Actor { name: "RandomString1" })
+ CREATE (a)-[:ACTED_IN { screenTime: 47337 }]->(:Movie { title: "RandomString2", runtime:88052 })
+ CREATE (a)-[:ACTED_IN { screenTime: 99847 }]->(:Series { title: "RandomString3", episodes: 45953 })
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+query Actors($name: String) {
+  actors(where: {name: $name}) {
+    name
+    actedIn {
+      title
+      ... on Movie {
+        runtime
+      }
+      ... on Series {
+        episodes
+      }
+    }
+  }
+}
+----
+
+.GraphQL params input
+[source,json,request=true]
+----
+{
+  "name": "RandomString1"
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "RandomString1"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Actor)
+WHERE this.name = $param0
+CALL {
+    WITH this
+    CALL {
+        WITH *
+        MATCH (this)-[this0:ACTED_IN]->(this1:Movie)
+        WITH this1 { .title, .runtime, __typename: "Movie", __id: toString(id(this1)) } AS this1
+        RETURN this1 AS var2
+        UNION
+        WITH *
+        MATCH (this)-[this3:ACTED_IN]->(this4:Series)
+        WITH this4 { .title, .episodes, __typename: "Series", __id: toString(id(this4)) } AS this4
+        RETURN this4 AS var2
+    }
+    WITH var2
+    RETURN collect(var2) AS var2
+}
+RETURN this { .name, actedIn: var2 } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "actors": [
+    {
+      "name": "RandomString1",
+      "actedIn": [
+        {
+          "title": "RandomString2",
+          "runtime": 88052
+        },
+        {
+          "title": "RandomString3",
+          "episodes": 45953
+        }
+      ]
+    }
+  ]
+}
+----
+
+== should read and return sorted interface relationship fields
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (a:Actor { name: "RandomString1" })
+ CREATE (:Movie { title: "A", runtime:23408 })<-[:ACTED_IN { screenTime: 40446 }]-(a)-[:ACTED_IN { screenTime: 89440 }]->(:Movie { title: "B", runtime: 76130 })
+ CREATE (:Series { title: "C", episodes: 64675 })<-[:ACTED_IN { screenTime: 83928 }]-(a)-[:ACTED_IN { screenTime: 83728 }]->(:Series { title: "D", episodes: 8135 })
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+query Actors($name: String) {
+  actors(where: {name: $name}) {
+    name
+    actedIn(options: {sort: [{title: DESC}]}) {
+      title
+      ... on Movie {
+        runtime
+      }
+      ... on Series {
+        episodes
+      }
+    }
+  }
+}
+----
+
+.GraphQL params input
+[source,json,request=true]
+----
+{
+  "name": "RandomString1"
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "RandomString1"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Actor)
+WHERE this.name = $param0
+CALL {
+    WITH this
+    CALL {
+        WITH *
+        MATCH (this)-[this0:ACTED_IN]->(this1:Movie)
+        WITH this1 { .title, .runtime, __typename: "Movie", __id: toString(id(this1)) } AS this1
+        RETURN this1 AS var2
+        UNION
+        WITH *
+        MATCH (this)-[this3:ACTED_IN]->(this4:Series)
+        WITH this4 { .title, .episodes, __typename: "Series", __id: toString(id(this4)) } AS this4
+        RETURN this4 AS var2
+    }
+    WITH var2
+    ORDER BY var2.title DESC
+    RETURN collect(var2) AS var2
+}
+RETURN this { .name, actedIn: var2 } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "actors": [
+    {
+      "name": "RandomString1",
+      "actedIn": [
+        {
+          "title": "D",
+          "episodes": 8135
+        },
+        {
+          "title": "C",
+          "episodes": 64675
+        },
+        {
+          "title": "B",
+          "runtime": 76130
+        },
+        {
+          "title": "A",
+          "runtime": 23408
+        }
+      ]
+    }
+  ]
+}
+----
+
+== should read and return non-array interface relationship fields
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (a:Actor { name: "RandomString1" })
+ CREATE (a)-[:ACTED_IN { screenTime: 50667 }]->(:Movie { title: "RandomString2", runtime:85953 })
+ CREATE (a)-[:ACTED_IN { screenTime: 1726 }]->(:Series { title: "RandomString3", episodes: 85490 })
+ CREATE (a)-[:CURRENTLY_ACTING_IN]->(:Movie { title: "RandomString4", runtime: 6106 })
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+query Actors($name: String) {
+  actors(where: {name: $name}) {
+    name
+    currentlyActingIn {
+      title
+      ... on Movie {
+        runtime
+      }
+      ... on Series {
+        episodes
+      }
+    }
+  }
+}
+----
+
+.GraphQL params input
+[source,json,request=true]
+----
+{
+  "name": "RandomString1"
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "RandomString1"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Actor)
+WHERE this.name = $param0
+CALL {
+    WITH this
+    CALL {
+        WITH *
+        MATCH (this)-[this0:CURRENTLY_ACTING_IN]->(this1:Movie)
+        WITH this1 { .title, .runtime, __typename: "Movie", __id: toString(id(this1)) } AS this1
+        RETURN this1 AS var2
+        UNION
+        WITH *
+        MATCH (this)-[this3:CURRENTLY_ACTING_IN]->(this4:Series)
+        WITH this4 { .title, .episodes, __typename: "Series", __id: toString(id(this4)) } AS this4
+        RETURN this4 AS var2
+    }
+    WITH var2
+    RETURN head(collect(var2)) AS var2
+}
+RETURN this { .name, currentlyActingIn: var2 } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "actors": [
+    {
+      "name": "RandomString1",
+      "currentlyActingIn": {
+        "title": "RandomString4",
+        "runtime": 6106
+      }
+    }
+  ]
+}
+----
+
+== should read and return interface relationship fields with shared where
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (a:Actor { name: "RandomString1" })
+ CREATE (a)-[:ACTED_IN { screenTime: 28270 }]->(:Movie { title: "Apple", runtime:76300 })
+ CREATE (a)-[:ACTED_IN { screenTime: 28270 }]->(:Movie { title: "RandomString2", runtime:76300 })
+ CREATE (a)-[:ACTED_IN { screenTime: 70458 }]->(:Series { title: "Apple", episodes: 52388 })
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+query Actors($name: String, $title: String) {
+  actors(where: {name: $name}) {
+    name
+    actedIn(where: {title: $title}) {
+      title
+      ... on Movie {
+        runtime
+      }
+      ... on Series {
+        episodes
+      }
+    }
+  }
+}
+----
+
+.GraphQL params input
+[source,json,request=true]
+----
+{
+  "name": "RandomString1",
+  "title": "Apple"
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "RandomString1",
+  "param1": "Apple",
+  "param2": "Apple"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Actor)
+WHERE this.name = $param0
+CALL {
+    WITH this
+    CALL {
+        WITH *
+        MATCH (this)-[this0:ACTED_IN]->(this1:Movie)
+        WHERE this1.title = $param1
+        WITH this1 { .title, .runtime, __typename: "Movie", __id: toString(id(this1)) } AS this1
+        RETURN this1 AS var2
+        UNION
+        WITH *
+        MATCH (this)-[this3:ACTED_IN]->(this4:Series)
+        WHERE this4.title = $param2
+        WITH this4 { .title, .episodes, __typename: "Series", __id: toString(id(this4)) } AS this4
+        RETURN this4 AS var2
+    }
+    WITH var2
+    RETURN collect(var2) AS var2
+}
+RETURN this { .name, actedIn: var2 } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "actors": [
+    {
+      "name": "RandomString1",
+      "actedIn": [
+        {
+          "title": "Apple",
+          "runtime": 76300
+        },
+        {
+          "title": "Apple",
+          "episodes": 52388
+        }
+      ]
+    }
+  ]
+}
+----
diff --git a/core/src/test/resources/integration-test-files/issues/1683.adoc b/core/src/test/resources/integration-test-files/issues/1683.adoc
index 84610710..b4c9bfe2 100644
--- a/core/src/test/resources/integration-test-files/issues/1683.adoc
+++ b/core/src/test/resources/integration-test-files/issues/1683.adoc
@@ -28,7 +28,7 @@ CREATE (s:System { code: "arthur" });
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   systems {
@@ -47,7 +47,7 @@ CREATE (s:System { code: "arthur" });
 .Expected Cypher params
 [source,json]
 ----
-{}
+{ }
 ----
 
 .Expected Cypher output
@@ -88,16 +88,11 @@ RETURN this {
 [source,json,response=true]
 ----
 {
-  "systems": [
-    {
-      "code": "arthur",
-      "updatesDataConnection": {
-        "edges": []
-      }
+  "systems" : [ {
+    "code" : "arthur",
+    "updatesDataConnection" : {
+      "edges" : [ ]
     }
-  ]
+  } ]
 }
 ----
-
-'''
-
diff --git a/core/src/test/resources/integration-test-files/issues/1683.js.adoc b/core/src/test/resources/integration-test-files/issues/1683.js.adoc
new file mode 100644
index 00000000..235bbc20
--- /dev/null
+++ b/core/src/test/resources/integration-test-files/issues/1683.js.adoc
@@ -0,0 +1,87 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= https://github.com/neo4j/graphql/issues/1683
+
+== Setup
+
+.Schema
+[source,graphql,schema=true]
+----
+type System {
+  code: String!
+  updatesData: [GovernedData!]! @relationship(type: "UPDATED_BY", direction: IN)
+}
+
+type GovernedData {
+  code: String!
+  updatedBy: [System!]! @relationship(type: "UPDATED_BY", direction: OUT)
+}
+----
+
+== should return top level entity, even if no connections exist
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (s:System { code: "arthur" });
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  systems {
+    code
+    updatesDataConnection {
+      edges {
+        node {
+          code
+        }
+      }
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:System)
+CALL {
+    WITH this
+    MATCH (this)<-[this0:UPDATED_BY]-(this1:GovernedData)
+    WITH collect({ node: this1, relationship: this0 }) AS edges
+    WITH edges, size(edges) AS totalCount
+    CALL {
+        WITH edges
+        UNWIND edges AS edge
+        WITH edge.node AS this1, edge.relationship AS this0
+        RETURN collect({ node: { code: this1.code, __typename: "GovernedData" } }) AS var2
+    }
+    RETURN { edges: var2, totalCount: totalCount } AS var3
+}
+RETURN this { .code, updatesDataConnection: var3 } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "systems": [
+    {
+      "code": "arthur",
+      "updatesDataConnection": {
+        "edges": []
+      }
+    }
+  ]
+}
+----
diff --git a/core/src/test/resources/integration-test-files/issues/1686.adoc b/core/src/test/resources/integration-test-files/issues/1686.adoc
index b455f1d1..c93e70f3 100644
--- a/core/src/test/resources/integration-test-files/issues/1686.adoc
+++ b/core/src/test/resources/integration-test-files/issues/1686.adoc
@@ -36,7 +36,7 @@ CREATE (c:Movie { id: "1", title: "Matrix" })-[:HAS_GENRE]->(:Genre { id: "10",
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query MoviesConnection {
   moviesConnection {
@@ -48,7 +48,7 @@ query MoviesConnection {
 .Expected Cypher params
 [source,json]
 ----
-{}
+{ }
 ----
 
 .Expected Cypher output
@@ -68,11 +68,8 @@ RETURN {
 [source,json,response=true]
 ----
 {
-  "moviesConnection": {
-    "totalCount": 2
+  "moviesConnection" : {
+    "totalCount" : 2
   }
 }
 ----
-
-'''
-
diff --git a/core/src/test/resources/integration-test-files/issues/1686.js.adoc b/core/src/test/resources/integration-test-files/issues/1686.js.adoc
new file mode 100644
index 00000000..52795bec
--- /dev/null
+++ b/core/src/test/resources/integration-test-files/issues/1686.js.adoc
@@ -0,0 +1,78 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= https://github.com/neo4j/graphql/issues/1686
+
+== Setup
+
+.Schema
+[source,graphql,schema=true]
+----
+interface Production {
+  id: ID
+  title: String
+}
+
+type Movie implements Production {
+  id: ID
+  title: String
+  genres: [Genre!]! @relationship(type: "HAS_GENRE", direction: OUT)
+}
+
+type Genre {
+  name: String
+  movies: [Production!]! @relationship(type: "HAS_GENRE", direction: IN)
+}
+----
+
+== should be possible to count all the movies connections
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (c:Movie { id: "1", title: "Matrix" })-[:HAS_GENRE]->(:Genre { id: "10", name: "Sci-fi" })
+ CREATE (c)-[:HAS_GENRE]->(g2:Genre { id: "11", name: "Action" })
+ CREATE (h:Movie { id: "2", title: "The Hobbit" })-[:HAS_GENRE]->(g3:Genre { id: "12", name: "Fantasy" })
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+query MoviesConnection {
+  moviesConnection {
+    totalCount
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this0:Movie)
+WITH collect({ node: this0 }) AS edges
+WITH edges, size(edges) AS totalCount
+CALL {
+    WITH edges
+    UNWIND edges AS edge
+    WITH edge.node AS this0
+    RETURN collect({ node: { __id: toString(id(this0)), __typename: "Movie" } }) AS var1
+}
+RETURN { edges: var1, totalCount: totalCount } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "moviesConnection": {
+    "totalCount": 2
+  }
+}
+----
diff --git a/core/src/test/resources/integration-test-files/issues/1687.adoc b/core/src/test/resources/integration-test-files/issues/1687.adoc
index 384ca375..669eec98 100644
--- a/core/src/test/resources/integration-test-files/issues/1687.adoc
+++ b/core/src/test/resources/integration-test-files/issues/1687.adoc
@@ -36,7 +36,7 @@ CREATE (c:Movie { id: "1", title: "Matrix" })-[:HAS_GENRE]->(:Genre { id: "10",
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query Genres {
   genres(where: {moviesConnection_SOME: {node: {title: "Matrix"}}}) {
@@ -49,7 +49,7 @@ query Genres {
 [source,json]
 ----
 {
-  "param0": "Matrix"
+  "param0" : "Matrix"
 }
 ----
 
@@ -71,16 +71,10 @@ RETURN this {
 [source,json,response=true,ignore-order]
 ----
 {
-  "genres": [
-    {
-      "name": "Sci-fi"
-    },
-    {
-      "name": "Action"
-    }
-  ]
+  "genres" : [ {
+    "name" : "Sci-fi"
+  }, {
+    "name" : "Action"
+  } ]
 }
 ----
-
-'''
-
diff --git a/core/src/test/resources/integration-test-files/issues/1687.js.adoc b/core/src/test/resources/integration-test-files/issues/1687.js.adoc
new file mode 100644
index 00000000..7b48ff2e
--- /dev/null
+++ b/core/src/test/resources/integration-test-files/issues/1687.js.adoc
@@ -0,0 +1,81 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= https://github.com/neo4j/graphql/issues/1687
+
+== Setup
+
+.Schema
+[source,graphql,schema=true]
+----
+interface Production {
+  id: ID
+  title: String
+}
+
+type Movie implements Production {
+  id: ID
+  title: String
+  genres: [Genre!]! @relationship(type: "HAS_GENRE", direction: OUT)
+}
+
+type Genre {
+  name: String
+  movies: [Production!]! @relationship(type: "HAS_GENRE", direction: IN)
+}
+----
+
+== should be able to return all the genres related the Matrix movie using connection fields
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (c:Movie { id: "1", title: "Matrix" })-[:HAS_GENRE]->(:Genre { id: "10", name: "Sci-fi" })
+ CREATE (c)-[:HAS_GENRE]->(g2:Genre { id: "11", name: "Action" })
+ CREATE (h:Movie { id: "2", title: "The Hobbit" })-[:HAS_GENRE]->(g3:Genre { id: "12", name: "Fantasy" })
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+query Genres {
+  genres(where: {moviesConnection_SOME: {node: {title: "Matrix"}}}) {
+    name
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "Matrix"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Genre)
+WHERE EXISTS {
+    MATCH (this)<-[this0:HAS_GENRE]-(this1)
+    WHERE (this1.title = $param0 AND this1:Movie)
+}
+RETURN this { .name } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "genres": [
+    {
+      "name": "Action"
+    },
+    {
+      "name": "Sci-fi"
+    }
+  ]
+}
+----
diff --git a/core/src/test/resources/integration-test-files/issues/1779.adoc b/core/src/test/resources/integration-test-files/issues/1779.adoc
index 885422b0..0940907b 100644
--- a/core/src/test/resources/integration-test-files/issues/1779.adoc
+++ b/core/src/test/resources/integration-test-files/issues/1779.adoc
@@ -32,7 +32,7 @@ CREATE (personA:Person { name: "A", age: 24 })-[:ATTENDS]->(schoolOld:School { n
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   people {
@@ -48,7 +48,7 @@ CREATE (personA:Person { name: "A", age: 24 })-[:ATTENDS]->(schoolOld:School { n
 [source,json]
 ----
 {
-  "param0": 23
+  "param0" : 23
 }
 ----
 
@@ -82,34 +82,22 @@ RETURN this {
 [source,json,response=true,ignore-order]
 ----
 {
-  "people": [
-    {
-      "name": "A",
-      "attends": [
-        {
-          "name": "Old"
-        }
-      ]
-    },
-    {
-      "name": "C",
-      "attends": []
-    },
-    {
-      "name": "D",
-      "attends": []
-    },
-    {
-      "name": "B",
-      "attends": [
-        {
-          "name": "Old"
-        }
-      ]
-    }
-  ]
+  "people" : [ {
+    "name" : "A",
+    "attends" : [ {
+      "name" : "Old"
+    } ]
+  }, {
+    "name" : "C",
+    "attends" : [ ]
+  }, {
+    "name" : "D",
+    "attends" : [ ]
+  }, {
+    "name" : "B",
+    "attends" : [ {
+      "name" : "Old"
+    } ]
+  } ]
 }
 ----
-
-'''
-
diff --git a/core/src/test/resources/integration-test-files/issues/1779.js.adoc b/core/src/test/resources/integration-test-files/issues/1779.js.adoc
new file mode 100644
index 00000000..9cb2b546
--- /dev/null
+++ b/core/src/test/resources/integration-test-files/issues/1779.js.adoc
@@ -0,0 +1,107 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= https://github.com/neo4j/graphql/issues/1779
+
+== Setup
+
+.Schema
+[source,graphql,schema=true]
+----
+type Person {
+  name: String
+  age: Int
+  attends: [School!]! @relationship(type: "ATTENDS", direction: OUT)
+}
+
+type School {
+  name: String
+  students: [Person!]! @relationship(type: "ATTENDS", direction: IN)
+}
+----
+
+== Does not throw error 'The EXISTS subclause is not valid inside a WITH or RETURN clause. '
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (personA:Person { name: "A", age: 24 })-[:ATTENDS]->(schoolOld:School { name: "Old" })
+ CREATE (personB:Person { name: "B", age: 26 })-[:ATTENDS]->(schoolOld)
+ CREATE (personC:Person { name: "C", age: 23 })-[:ATTENDS]->(schoolYoung:School { name: "Young" })
+ CREATE (personD:Person { name: "D", age: 25 })-[:ATTENDS]->(schoolYoung)
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  people {
+    name
+    attends(where: {students_ALL: {age_GT: 23}}) {
+      name
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": 23
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Person)
+CALL {
+    WITH this
+    MATCH (this)-[this0:ATTENDS]->(this1:School)
+    WHERE (EXISTS {
+        MATCH (this1)<-[:ATTENDS]-(this2:Person)
+        WHERE this2.age > $param0
+    } AND NOT (EXISTS {
+        MATCH (this1)<-[:ATTENDS]-(this2:Person)
+        WHERE NOT (this2.age > $param0)
+    }))
+    WITH this1 { .name } AS this1
+    RETURN collect(this1) AS var3
+}
+RETURN this { .name, attends: var3 } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "people": [
+    {
+      "name": "B",
+      "attends": [
+        {
+          "name": "Old"
+        }
+      ]
+    },
+    {
+      "name": "C",
+      "attends": []
+    },
+    {
+      "name": "A",
+      "attends": [
+        {
+          "name": "Old"
+        }
+      ]
+    },
+    {
+      "name": "D",
+      "attends": []
+    }
+  ]
+}
+----
diff --git a/core/src/test/resources/integration-test-files/issues/207.adoc b/core/src/test/resources/integration-test-files/issues/207.adoc
index 5203fc30..4d8dda5f 100644
--- a/core/src/test/resources/integration-test-files/issues/207.adoc
+++ b/core/src/test/resources/integration-test-files/issues/207.adoc
@@ -24,7 +24,7 @@ type Query {
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query GetSearchResults {
   search {
@@ -43,18 +43,12 @@ query GetSearchResults {
 [source,json,response=true,ignore-order]
 ----
 {
-  "search": [
-    {
-      "__typename": "Book",
-      "title": "GraphQL Unions for Dummies"
-    },
-    {
-      "__typename": "Author",
-      "name": "Darrell"
-    }
-  ]
+  "search" : [ {
+    "__typename" : "Book",
+    "title" : "GraphQL Unions for Dummies"
+  }, {
+    "__typename" : "Author",
+    "name" : "Darrell"
+  } ]
 }
 ----
-
-'''
-
diff --git a/core/src/test/resources/integration-test-files/issues/207.js.adoc b/core/src/test/resources/integration-test-files/issues/207.js.adoc
new file mode 100644
index 00000000..c3fa8928
--- /dev/null
+++ b/core/src/test/resources/integration-test-files/issues/207.js.adoc
@@ -0,0 +1,58 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= https://github.com/neo4j/graphql/issues/207
+
+== __resolveType resolvers are correctly evaluated
+
+.Schema
+[source,graphql,schema=true]
+----
+union Result = Book | Author
+
+type Book {
+  title: String
+}
+
+type Author {
+  name: String
+}
+
+type Query {
+  search: [Result]
+}
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+query GetSearchResults {
+  search {
+    __typename
+    ... on Book {
+      title
+    }
+    ... on Author {
+      name
+    }
+  }
+}
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "search": [
+    {
+      "__typename": "Book",
+      "title": "GraphQL Unions for Dummies"
+    },
+    {
+      "__typename": "Author",
+      "name": "Darrell"
+    }
+  ]
+}
+----
diff --git a/core/src/test/resources/integration-test-files/issues/2262.adoc b/core/src/test/resources/integration-test-files/issues/2262.adoc
index f743c842..13ad8edc 100644
--- a/core/src/test/resources/integration-test-files/issues/2262.adoc
+++ b/core/src/test/resources/integration-test-files/issues/2262.adoc
@@ -30,7 +30,7 @@ CREATE(:Component {uuid: "c1"})<-[:OUTPUT]-(:Process {uuid: "p1"})
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query ComponentsProcesses {
   components(where: {uuid: "c1"}) {
@@ -57,7 +57,7 @@ query ComponentsProcesses {
 [source,json]
 ----
 {
-  "param0": "c1"
+  "param0" : "c1"
 }
 ----
 
@@ -125,25 +125,18 @@ RETURN this {
 [source,json,response=true]
 ----
 {
-  "components": [
-    {
-      "uuid": "c1",
-      "upstreamProcessConnection": {
-        "edges": [
-          {
-            "node": {
-              "uuid": "p1",
-              "componentInputsConnection": {
-                "edges": []
-              }
-            }
+  "components" : [ {
+    "uuid" : "c1",
+    "upstreamProcessConnection" : {
+      "edges" : [ {
+        "node" : {
+          "uuid" : "p1",
+          "componentInputsConnection" : {
+            "edges" : [ ]
           }
-        ]
-      }
+        }
+      } ]
     }
-  ]
+  } ]
 }
 ----
-
-'''
-
diff --git a/core/src/test/resources/integration-test-files/issues/2262.js.adoc b/core/src/test/resources/integration-test-files/issues/2262.js.adoc
new file mode 100644
index 00000000..43400d08
--- /dev/null
+++ b/core/src/test/resources/integration-test-files/issues/2262.js.adoc
@@ -0,0 +1,123 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= https://github.com/neo4j/graphql/issues/2262
+
+== Setup
+
+.Schema
+[source,graphql,schema=true]
+----
+type Component {
+  uuid: String
+  upstreamProcess: Process @relationship(type: "OUTPUT", direction: IN)
+  downstreamProcesses: [Process!]! @relationship(type: "INPUT", direction: OUT)
+}
+
+type Process {
+  uuid: String
+  componentOutputs: [Component!]! @relationship(type: "OUTPUT", direction: OUT)
+  componentInputs: [Component!]! @relationship(type: "INPUT", direction: IN)
+}
+----
+
+== nested update with create while using subscriptions should generate valid Cypher
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE(:Component {uuid: "c1"})<-[:OUTPUT]-(:Process {uuid: "p1"})
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+query ComponentsProcesses {
+  components(where: {uuid: "c1"}) {
+    uuid
+    upstreamProcessConnection {
+      edges {
+        node {
+          uuid
+          componentInputsConnection(sort: [{node: {uuid: DESC}}]) {
+            edges {
+              node {
+                uuid
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "c1"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Component)
+WHERE this.uuid = $param0
+CALL {
+    WITH this
+    MATCH (this)<-[this0:OUTPUT]-(this1:Process)
+    WITH collect({ node: this1, relationship: this0 }) AS edges
+    WITH edges, size(edges) AS totalCount
+    CALL {
+        WITH edges
+        UNWIND edges AS edge
+        WITH edge.node AS this1, edge.relationship AS this0
+        CALL {
+            WITH this1
+            MATCH (this1)<-[this2:INPUT]-(this3:Component)
+            WITH collect({ node: this3, relationship: this2 }) AS edges
+            WITH edges, size(edges) AS totalCount
+            CALL {
+                WITH edges
+                UNWIND edges AS edge
+                WITH edge.node AS this3, edge.relationship AS this2
+                WITH *
+                ORDER BY this3.uuid DESC
+                RETURN collect({ node: { uuid: this3.uuid, __typename: "Component" } }) AS var4
+            }
+            RETURN { edges: var4, totalCount: totalCount } AS var5
+        }
+        RETURN collect({ node: { uuid: this1.uuid, componentInputsConnection: var5, __typename: "Process" } }) AS var6
+    }
+    RETURN { edges: var6, totalCount: totalCount } AS var7
+}
+RETURN this { .uuid, upstreamProcessConnection: var7 } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "components": [
+    {
+      "uuid": "c1",
+      "upstreamProcessConnection": {
+        "edges": [
+          {
+            "node": {
+              "uuid": "p1",
+              "componentInputsConnection": {
+                "edges": []
+              }
+            }
+          }
+        ]
+      }
+    }
+  ]
+}
+----
diff --git a/core/src/test/resources/integration-test-files/issues/2820.adoc b/core/src/test/resources/integration-test-files/issues/2820.adoc
index a3312eeb..419e80e4 100644
--- a/core/src/test/resources/integration-test-files/issues/2820.adoc
+++ b/core/src/test/resources/integration-test-files/issues/2820.adoc
@@ -44,7 +44,7 @@ CREATE (a:Actor { name: "Actor" })
 === should return total count 4
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   actors {
@@ -58,7 +58,7 @@ CREATE (a:Actor { name: "Actor" })
 .Expected Cypher params
 [source,json]
 ----
-{}
+{ }
 ----
 
 .Expected Cypher output
@@ -103,22 +103,18 @@ RETURN this {
 [source,json,response=true]
 ----
 {
-  "actors": [
-    {
-      "actedInConnection": {
-        "totalCount": 4
-      }
+  "actors" : [ {
+    "actedInConnection" : {
+      "totalCount" : 4
     }
-  ]
+  } ]
 }
 ----
 
-'''
-
 === should return interface members in Connection
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   actors {
@@ -138,7 +134,7 @@ RETURN this {
 .Expected Cypher params
 [source,json]
 ----
-{}
+{ }
 ----
 
 .Expected Cypher output
@@ -185,48 +181,39 @@ RETURN this {
 [source,json,response=true,ignore-order]
 ----
 {
-  "actors": [
-    {
-      "actedInConnection": {
-        "totalCount": 4,
-        "edges": [
-          {
-            "node": {
-              "__typename": "Movie",
-              "title": "House"
-            }
-          },
-          {
-            "node": {
-              "__typename": "Movie",
-              "title": "Friends"
-            }
-          },
-          {
-            "node": {
-              "__typename": "Series",
-              "title": "House"
-            }
-          },
-          {
-            "node": {
-              "__typename": "Series",
-              "title": "Friends"
-            }
-          }
-        ]
-      }
+  "actors" : [ {
+    "actedInConnection" : {
+      "totalCount" : 4,
+      "edges" : [ {
+        "node" : {
+          "__typename" : "Movie",
+          "title" : "House"
+        }
+      }, {
+        "node" : {
+          "__typename" : "Movie",
+          "title" : "Friends"
+        }
+      }, {
+        "node" : {
+          "__typename" : "Series",
+          "title" : "House"
+        }
+      }, {
+        "node" : {
+          "__typename" : "Series",
+          "title" : "Friends"
+        }
+      } ]
     }
-  ]
+  } ]
 }
 ----
 
-'''
-
 === should return interface members in Connection without querying title
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   actors {
@@ -245,7 +232,7 @@ RETURN this {
 .Expected Cypher params
 [source,json]
 ----
-{}
+{ }
 ----
 
 .Expected Cypher output
@@ -290,44 +277,35 @@ RETURN this {
 [source,json,response=true,ignore-order]
 ----
 {
-  "actors": [
-    {
-      "actedInConnection": {
-        "totalCount": 4,
-        "edges": [
-          {
-            "node": {
-              "__typename": "Movie"
-            }
-          },
-          {
-            "node": {
-              "__typename": "Movie"
-            }
-          },
-          {
-            "node": {
-              "__typename": "Series"
-            }
-          },
-          {
-            "node": {
-              "__typename": "Series"
-            }
-          }
-        ]
-      }
+  "actors" : [ {
+    "actedInConnection" : {
+      "totalCount" : 4,
+      "edges" : [ {
+        "node" : {
+          "__typename" : "Movie"
+        }
+      }, {
+        "node" : {
+          "__typename" : "Movie"
+        }
+      }, {
+        "node" : {
+          "__typename" : "Series"
+        }
+      }, {
+        "node" : {
+          "__typename" : "Series"
+        }
+      } ]
     }
-  ]
+  } ]
 }
 ----
 
-'''
-
 === should return interface members in normal field
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   actors {
@@ -342,7 +320,7 @@ RETURN this {
 .Expected Cypher params
 [source,json]
 ----
-{}
+{ }
 ----
 
 .Expected Cypher output
@@ -381,37 +359,28 @@ RETURN this {
 [source,json,response=true,ignore-order]
 ----
 {
-  "actors": [
-    {
-      "actedIn": [
-        {
-          "__typename": "Movie",
-          "title": "House"
-        },
-        {
-          "__typename": "Movie",
-          "title": "Friends"
-        },
-        {
-          "__typename": "Series",
-          "title": "House"
-        },
-        {
-          "__typename": "Series",
-          "title": "Friends"
-        }
-      ]
-    }
-  ]
+  "actors" : [ {
+    "actedIn" : [ {
+      "__typename" : "Movie",
+      "title" : "House"
+    }, {
+      "__typename" : "Movie",
+      "title" : "Friends"
+    }, {
+      "__typename" : "Series",
+      "title" : "House"
+    }, {
+      "__typename" : "Series",
+      "title" : "Friends"
+    } ]
+  } ]
 }
 ----
 
-'''
-
 === should return interface members in normal field without querying title
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   actors {
@@ -425,7 +394,7 @@ RETURN this {
 .Expected Cypher params
 [source,json]
 ----
-{}
+{ }
 ----
 
 .Expected Cypher output
@@ -462,35 +431,26 @@ RETURN this {
 [source,json,response=true,ignore-order]
 ----
 {
-  "actors": [
-    {
-      "actedIn": [
-        {
-          "__typename": "Movie"
-        },
-        {
-          "__typename": "Movie"
-        },
-        {
-          "__typename": "Series"
-        },
-        {
-          "__typename": "Series"
-        }
-      ]
-    }
-  ]
+  "actors" : [ {
+    "actedIn" : [ {
+      "__typename" : "Movie"
+    }, {
+      "__typename" : "Movie"
+    }, {
+      "__typename" : "Series"
+    }, {
+      "__typename" : "Series"
+    } ]
+  } ]
 }
 ----
 
-'''
-
 == union count and amount should be correct
 
 === should return total count 4
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   actors {
@@ -504,7 +464,7 @@ RETURN this {
 .Expected Cypher params
 [source,json]
 ----
-{}
+{ }
 ----
 
 .Expected Cypher output
@@ -549,22 +509,18 @@ RETURN this {
 [source,json,response=true]
 ----
 {
-  "actors": [
-    {
-      "actedInUnionConnection": {
-        "totalCount": 4
-      }
+  "actors" : [ {
+    "actedInUnionConnection" : {
+      "totalCount" : 4
     }
-  ]
+  } ]
 }
 ----
 
-'''
-
 === should return interface members in Connection
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   actors {
@@ -589,7 +545,7 @@ RETURN this {
 .Expected Cypher params
 [source,json]
 ----
-{}
+{ }
 ----
 
 .Expected Cypher output
@@ -636,48 +592,39 @@ RETURN this {
 [source,json,response=true,ignore-order]
 ----
 {
-  "actors": [
-    {
-      "actedInUnionConnection": {
-        "totalCount": 4,
-        "edges": [
-          {
-            "node": {
-              "__typename": "Movie",
-              "title": "House"
-            }
-          },
-          {
-            "node": {
-              "__typename": "Movie",
-              "title": "Friends"
-            }
-          },
-          {
-            "node": {
-              "__typename": "Series",
-              "title": "Friends"
-            }
-          },
-          {
-            "node": {
-              "__typename": "Series",
-              "title": "House"
-            }
-          }
-        ]
-      }
+  "actors" : [ {
+    "actedInUnionConnection" : {
+      "totalCount" : 4,
+      "edges" : [ {
+        "node" : {
+          "__typename" : "Movie",
+          "title" : "House"
+        }
+      }, {
+        "node" : {
+          "__typename" : "Movie",
+          "title" : "Friends"
+        }
+      }, {
+        "node" : {
+          "__typename" : "Series",
+          "title" : "Friends"
+        }
+      }, {
+        "node" : {
+          "__typename" : "Series",
+          "title" : "House"
+        }
+      } ]
     }
-  ]
+  } ]
 }
 ----
 
-'''
-
 === should return interface members in Connection without querying title
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   actors {
@@ -696,7 +643,7 @@ RETURN this {
 .Expected Cypher params
 [source,json]
 ----
-{}
+{ }
 ----
 
 .Expected Cypher output
@@ -741,44 +688,35 @@ RETURN this {
 [source,json,response=true,ignore-order]
 ----
 {
-  "actors": [
-    {
-      "actedInUnionConnection": {
-        "totalCount": 4,
-        "edges": [
-          {
-            "node": {
-              "__typename": "Movie"
-            }
-          },
-          {
-            "node": {
-              "__typename": "Movie"
-            }
-          },
-          {
-            "node": {
-              "__typename": "Series"
-            }
-          },
-          {
-            "node": {
-              "__typename": "Series"
-            }
-          }
-        ]
-      }
+  "actors" : [ {
+    "actedInUnionConnection" : {
+      "totalCount" : 4,
+      "edges" : [ {
+        "node" : {
+          "__typename" : "Movie"
+        }
+      }, {
+        "node" : {
+          "__typename" : "Movie"
+        }
+      }, {
+        "node" : {
+          "__typename" : "Series"
+        }
+      }, {
+        "node" : {
+          "__typename" : "Series"
+        }
+      } ]
     }
-  ]
+  } ]
 }
 ----
 
-'''
-
 === should return interface members in normal field
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   actors {
@@ -798,7 +736,7 @@ RETURN this {
 .Expected Cypher params
 [source,json]
 ----
-{}
+{ }
 ----
 
 .Expected Cypher output
@@ -837,37 +775,28 @@ RETURN this {
 [source,json,response=true,ignore-order]
 ----
 {
-  "actors": [
-    {
-      "actedInUnion": [
-        {
-          "__typename": "Movie",
-          "title": "House"
-        },
-        {
-          "__typename": "Movie",
-          "title": "Friends"
-        },
-        {
-          "__typename": "Series",
-          "title": "House"
-        },
-        {
-          "__typename": "Series",
-          "title": "Friends"
-        }
-      ]
-    }
-  ]
+  "actors" : [ {
+    "actedInUnion" : [ {
+      "__typename" : "Movie",
+      "title" : "House"
+    }, {
+      "__typename" : "Movie",
+      "title" : "Friends"
+    }, {
+      "__typename" : "Series",
+      "title" : "House"
+    }, {
+      "__typename" : "Series",
+      "title" : "Friends"
+    } ]
+  } ]
 }
 ----
 
-'''
-
 === should return interface members in normal field without querying title
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   actors {
@@ -881,7 +810,7 @@ RETURN this {
 .Expected Cypher params
 [source,json]
 ----
-{}
+{ }
 ----
 
 .Expected Cypher output
@@ -918,26 +847,16 @@ RETURN this {
 [source,json,response=true,ignore-order]
 ----
 {
-  "actors": [
-    {
-      "actedInUnion": [
-        {
-          "__typename": "Movie"
-        },
-        {
-          "__typename": "Movie"
-        },
-        {
-          "__typename": "Series"
-        },
-        {
-          "__typename": "Series"
-        }
-      ]
-    }
-  ]
+  "actors" : [ {
+    "actedInUnion" : [ {
+      "__typename" : "Movie"
+    }, {
+      "__typename" : "Movie"
+    }, {
+      "__typename" : "Series"
+    }, {
+      "__typename" : "Series"
+    } ]
+  } ]
 }
 ----
-
-'''
-
diff --git a/core/src/test/resources/integration-test-files/issues/2820.js.adoc b/core/src/test/resources/integration-test-files/issues/2820.js.adoc
new file mode 100644
index 00000000..d5e7101d
--- /dev/null
+++ b/core/src/test/resources/integration-test-files/issues/2820.js.adoc
@@ -0,0 +1,803 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= https://github.com/neo4j/graphql/issues/2820
+
+== Setup
+
+.Schema
+[source,graphql,schema=true]
+----
+interface Production {
+  title: String!
+}
+
+type Movie implements Production {
+  title: String!
+}
+
+type Series implements Production {
+  title: String!
+}
+
+union ProductionUnion = Movie | Series
+
+type Actor {
+  name: String!
+  actedIn: [Production!]! @relationship(type: "ACTED_IN", direction: OUT)
+  actedInUnion: [ProductionUnion!]! @relationship(type: "ACTED_IN", direction: OUT)
+}
+----
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (a:Actor { name: "Actor" })
+ CREATE (a)-[:ACTED_IN]->(:Movie { title: "House" })
+ CREATE (a)-[:ACTED_IN]->(:Series { title: "House" })
+ CREATE (a)-[:ACTED_IN]->(:Movie { title: "Friends" })
+ CREATE (a)-[:ACTED_IN]->(:Series { title: "Friends" })
+----
+
+== interface count and amount should be correct
+
+=== should return total count 4
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  actors {
+    actedInConnection {
+      totalCount
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Actor)
+CALL {
+    WITH this
+    CALL {
+        WITH this
+        MATCH (this)-[this0:ACTED_IN]->(this1:Movie)
+        WITH { node: { __typename: "Movie", __id: toString(id(this1)) } } AS edge
+        RETURN edge
+        UNION
+        WITH this
+        MATCH (this)-[this2:ACTED_IN]->(this3:Series)
+        WITH { node: { __typename: "Series", __id: toString(id(this3)) } } AS edge
+        RETURN edge
+    }
+    WITH collect(edge) AS edges
+    WITH edges, size(edges) AS totalCount
+    RETURN { edges: edges, totalCount: totalCount } AS var4
+}
+RETURN this { actedInConnection: var4 } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "actors": [
+    {
+      "actedInConnection": {
+        "totalCount": 4
+      }
+    }
+  ]
+}
+----
+
+=== should return interface members in Connection
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  actors {
+    actedInConnection {
+      totalCount
+      edges {
+        node {
+          __typename
+          title
+        }
+      }
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Actor)
+CALL {
+    WITH this
+    CALL {
+        WITH this
+        MATCH (this)-[this0:ACTED_IN]->(this1:Movie)
+        WITH { node: { __typename: "Movie", __id: toString(id(this1)), title: this1.title } } AS edge
+        RETURN edge
+        UNION
+        WITH this
+        MATCH (this)-[this2:ACTED_IN]->(this3:Series)
+        WITH { node: { __typename: "Series", __id: toString(id(this3)), title: this3.title } } AS edge
+        RETURN edge
+    }
+    WITH collect(edge) AS edges
+    WITH edges, size(edges) AS totalCount
+    RETURN { edges: edges, totalCount: totalCount } AS var4
+}
+RETURN this { actedInConnection: var4 } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "actors": [
+    {
+      "actedInConnection": {
+        "totalCount": 4,
+        "edges": [
+          {
+            "node": {
+              "__typename": "Movie",
+              "title": "House"
+            }
+          },
+          {
+            "node": {
+              "__typename": "Movie",
+              "title": "Friends"
+            }
+          },
+          {
+            "node": {
+              "__typename": "Series",
+              "title": "Friends"
+            }
+          },
+          {
+            "node": {
+              "__typename": "Series",
+              "title": "House"
+            }
+          }
+        ]
+      }
+    }
+  ]
+}
+----
+
+=== should return interface members in Connection without querying title
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  actors {
+    actedInConnection {
+      totalCount
+      edges {
+        node {
+          __typename
+        }
+      }
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Actor)
+CALL {
+    WITH this
+    CALL {
+        WITH this
+        MATCH (this)-[this0:ACTED_IN]->(this1:Movie)
+        WITH { node: { __typename: "Movie", __id: toString(id(this1)) } } AS edge
+        RETURN edge
+        UNION
+        WITH this
+        MATCH (this)-[this2:ACTED_IN]->(this3:Series)
+        WITH { node: { __typename: "Series", __id: toString(id(this3)) } } AS edge
+        RETURN edge
+    }
+    WITH collect(edge) AS edges
+    WITH edges, size(edges) AS totalCount
+    RETURN { edges: edges, totalCount: totalCount } AS var4
+}
+RETURN this { actedInConnection: var4 } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "actors": [
+    {
+      "actedInConnection": {
+        "totalCount": 4,
+        "edges": [
+          {
+            "node": {
+              "__typename": "Movie"
+            }
+          },
+          {
+            "node": {
+              "__typename": "Movie"
+            }
+          },
+          {
+            "node": {
+              "__typename": "Series"
+            }
+          },
+          {
+            "node": {
+              "__typename": "Series"
+            }
+          }
+        ]
+      }
+    }
+  ]
+}
+----
+
+=== should return interface members in normal field
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  actors {
+    actedIn {
+      __typename
+      title
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Actor)
+CALL {
+    WITH this
+    CALL {
+        WITH *
+        MATCH (this)-[this0:ACTED_IN]->(this1:Movie)
+        WITH this1 { .title, __typename: "Movie", __id: toString(id(this1)) } AS this1
+        RETURN this1 AS var2
+        UNION
+        WITH *
+        MATCH (this)-[this3:ACTED_IN]->(this4:Series)
+        WITH this4 { .title, __typename: "Series", __id: toString(id(this4)) } AS this4
+        RETURN this4 AS var2
+    }
+    WITH var2
+    RETURN collect(var2) AS var2
+}
+RETURN this { actedIn: var2 } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "actors": [
+    {
+      "actedIn": [
+        {
+          "__typename": "Movie",
+          "title": "Friends"
+        },
+        {
+          "__typename": "Movie",
+          "title": "House"
+        },
+        {
+          "__typename": "Series",
+          "title": "House"
+        },
+        {
+          "__typename": "Series",
+          "title": "Friends"
+        }
+      ]
+    }
+  ]
+}
+----
+
+=== should return interface members in normal field without querying title
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  actors {
+    actedIn {
+      __typename
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Actor)
+CALL {
+    WITH this
+    CALL {
+        WITH *
+        MATCH (this)-[this0:ACTED_IN]->(this1:Movie)
+        WITH this1 { __typename: "Movie", __id: toString(id(this1)) } AS this1
+        RETURN this1 AS var2
+        UNION
+        WITH *
+        MATCH (this)-[this3:ACTED_IN]->(this4:Series)
+        WITH this4 { __typename: "Series", __id: toString(id(this4)) } AS this4
+        RETURN this4 AS var2
+    }
+    WITH var2
+    RETURN collect(var2) AS var2
+}
+RETURN this { actedIn: var2 } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "actors": [
+    {
+      "actedIn": [
+        {
+          "__typename": "Movie"
+        },
+        {
+          "__typename": "Movie"
+        },
+        {
+          "__typename": "Series"
+        },
+        {
+          "__typename": "Series"
+        }
+      ]
+    }
+  ]
+}
+----
+
+== union count and amount should be correct
+
+=== should return total count 4
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  actors {
+    actedInUnionConnection {
+      totalCount
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Actor)
+CALL {
+    WITH this
+    CALL {
+        WITH this
+        MATCH (this)-[this0:ACTED_IN]->(this1:Movie)
+        WITH { node: { __typename: "Movie", __id: toString(id(this1)) } } AS edge
+        RETURN edge
+        UNION
+        WITH this
+        MATCH (this)-[this2:ACTED_IN]->(this3:Series)
+        WITH { node: { __typename: "Series", __id: toString(id(this3)) } } AS edge
+        RETURN edge
+    }
+    WITH collect(edge) AS edges
+    WITH edges, size(edges) AS totalCount
+    RETURN { edges: edges, totalCount: totalCount } AS var4
+}
+RETURN this { actedInUnionConnection: var4 } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "actors": [
+    {
+      "actedInUnionConnection": {
+        "totalCount": 4
+      }
+    }
+  ]
+}
+----
+
+=== should return interface members in Connection
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  actors {
+    actedInUnionConnection {
+      totalCount
+      edges {
+        node {
+          __typename
+          ... on Movie {
+            title
+          }
+          ... on Series {
+            title
+          }
+        }
+      }
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Actor)
+CALL {
+    WITH this
+    CALL {
+        WITH this
+        MATCH (this)-[this0:ACTED_IN]->(this1:Movie)
+        WITH { node: { __typename: "Movie", __id: toString(id(this1)), title: this1.title } } AS edge
+        RETURN edge
+        UNION
+        WITH this
+        MATCH (this)-[this2:ACTED_IN]->(this3:Series)
+        WITH { node: { __typename: "Series", __id: toString(id(this3)), title: this3.title } } AS edge
+        RETURN edge
+    }
+    WITH collect(edge) AS edges
+    WITH edges, size(edges) AS totalCount
+    RETURN { edges: edges, totalCount: totalCount } AS var4
+}
+RETURN this { actedInUnionConnection: var4 } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "actors": [
+    {
+      "actedInUnionConnection": {
+        "totalCount": 4,
+        "edges": [
+          {
+            "node": {
+              "__typename": "Movie",
+              "title": "House"
+            }
+          },
+          {
+            "node": {
+              "__typename": "Movie",
+              "title": "Friends"
+            }
+          },
+          {
+            "node": {
+              "__typename": "Series",
+              "title": "House"
+            }
+          },
+          {
+            "node": {
+              "__typename": "Series",
+              "title": "Friends"
+            }
+          }
+        ]
+      }
+    }
+  ]
+}
+----
+
+=== should return interface members in Connection without querying title
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  actors {
+    actedInUnionConnection {
+      totalCount
+      edges {
+        node {
+          __typename
+        }
+      }
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Actor)
+CALL {
+    WITH this
+    CALL {
+        WITH this
+        MATCH (this)-[this0:ACTED_IN]->(this1:Movie)
+        WITH { node: { __typename: "Movie", __id: toString(id(this1)) } } AS edge
+        RETURN edge
+        UNION
+        WITH this
+        MATCH (this)-[this2:ACTED_IN]->(this3:Series)
+        WITH { node: { __typename: "Series", __id: toString(id(this3)) } } AS edge
+        RETURN edge
+    }
+    WITH collect(edge) AS edges
+    WITH edges, size(edges) AS totalCount
+    RETURN { edges: edges, totalCount: totalCount } AS var4
+}
+RETURN this { actedInUnionConnection: var4 } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "actors": [
+    {
+      "actedInUnionConnection": {
+        "totalCount": 4,
+        "edges": [
+          {
+            "node": {
+              "__typename": "Movie"
+            }
+          },
+          {
+            "node": {
+              "__typename": "Movie"
+            }
+          },
+          {
+            "node": {
+              "__typename": "Series"
+            }
+          },
+          {
+            "node": {
+              "__typename": "Series"
+            }
+          }
+        ]
+      }
+    }
+  ]
+}
+----
+
+=== should return interface members in normal field
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  actors {
+    actedInUnion {
+      __typename
+      ... on Movie {
+        title
+      }
+      ... on Series {
+        title
+      }
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Actor)
+CALL {
+    WITH this
+    CALL {
+        WITH *
+        MATCH (this)-[this0:ACTED_IN]->(this1:Movie)
+        WITH this1 { .title, __typename: "Movie", __id: toString(id(this1)) } AS this1
+        RETURN this1 AS var2
+        UNION
+        WITH *
+        MATCH (this)-[this3:ACTED_IN]->(this4:Series)
+        WITH this4 { .title, __typename: "Series", __id: toString(id(this4)) } AS this4
+        RETURN this4 AS var2
+    }
+    WITH var2
+    RETURN collect(var2) AS var2
+}
+RETURN this { actedInUnion: var2 } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "actors": [
+    {
+      "actedInUnion": [
+        {
+          "__typename": "Movie",
+          "title": "House"
+        },
+        {
+          "__typename": "Movie",
+          "title": "Friends"
+        },
+        {
+          "__typename": "Series",
+          "title": "Friends"
+        },
+        {
+          "__typename": "Series",
+          "title": "House"
+        }
+      ]
+    }
+  ]
+}
+----
+
+=== should return interface members in normal field without querying title
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  actors {
+    actedInUnion {
+      __typename
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Actor)
+CALL {
+    WITH this
+    CALL {
+        WITH *
+        MATCH (this)-[this0:ACTED_IN]->(this1:Movie)
+        WITH this1 { __typename: "Movie", __id: toString(id(this1)) } AS this1
+        RETURN this1 AS var2
+        UNION
+        WITH *
+        MATCH (this)-[this3:ACTED_IN]->(this4:Series)
+        WITH this4 { __typename: "Series", __id: toString(id(this4)) } AS this4
+        RETURN this4 AS var2
+    }
+    WITH var2
+    RETURN collect(var2) AS var2
+}
+RETURN this { actedInUnion: var2 } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "actors": [
+    {
+      "actedInUnion": [
+        {
+          "__typename": "Movie"
+        },
+        {
+          "__typename": "Movie"
+        },
+        {
+          "__typename": "Series"
+        },
+        {
+          "__typename": "Series"
+        }
+      ]
+    }
+  ]
+}
+----
diff --git a/core/src/test/resources/integration-test-files/issues/2847.adoc b/core/src/test/resources/integration-test-files/issues/2847.adoc
index 8c781662..a9e2db0e 100644
--- a/core/src/test/resources/integration-test-files/issues/2847.adoc
+++ b/core/src/test/resources/integration-test-files/issues/2847.adoc
@@ -32,7 +32,7 @@ CREATE (c:Actor)
 == should returns actors even without any related product
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   actors {
@@ -47,7 +47,7 @@ CREATE (c:Actor)
 .Expected Cypher params
 [source,json]
 ----
-{}
+{ }
 ----
 
 .Expected Cypher output
@@ -79,14 +79,9 @@ RETURN this {
 [source,json,response=true]
 ----
 {
-  "actors": [
-    {
-      "name": "Keanu",
-      "product": null
-    }
-  ]
+  "actors" : [ {
+    "name" : "Keanu",
+    "product" : null
+  } ]
 }
 ----
-
-'''
-
diff --git a/core/src/test/resources/integration-test-files/issues/2847.js.adoc b/core/src/test/resources/integration-test-files/issues/2847.js.adoc
new file mode 100644
index 00000000..c90e4d55
--- /dev/null
+++ b/core/src/test/resources/integration-test-files/issues/2847.js.adoc
@@ -0,0 +1,83 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= https://github.com/neo4j/graphql/issues/2847
+
+== Setup
+
+.Schema
+[source,graphql,schema=true]
+----
+interface Product {
+  name: String!
+}
+
+type Movie implements Product {
+  name: String!
+}
+
+type Actor {
+  name: String!
+  product: Product @relationship(type: "HAS_PRODUCT", direction: OUT)
+}
+----
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (c:Actor)
+ SET c.name = "Keanu"
+----
+
+== should returns actors even without any related product
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  actors {
+    name
+    product {
+      name
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Actor)
+CALL {
+    WITH this
+    CALL {
+        WITH *
+        MATCH (this)-[this0:HAS_PRODUCT]->(this1:Movie)
+        WITH this1 { .name, __typename: "Movie", __id: toString(id(this1)) } AS this1
+        RETURN this1 AS var2
+    }
+    WITH var2
+    RETURN head(collect(var2)) AS var2
+}
+RETURN this { .name, product: var2 } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "actors": [
+    {
+      "name": "Keanu",
+      "product": null
+    }
+  ]
+}
+----
diff --git a/core/src/test/resources/integration-test-files/issues/3009.adoc b/core/src/test/resources/integration-test-files/issues/3009.adoc
index d43ab326..ccaff090 100644
--- a/core/src/test/resources/integration-test-files/issues/3009.adoc
+++ b/core/src/test/resources/integration-test-files/issues/3009.adoc
@@ -14,7 +14,7 @@ type User {
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   users {
@@ -27,16 +27,12 @@ type User {
 [source,json,response=true]
 ----
 {
-  "users": [
-    {
-      "joinedAt": "2020-01-01"
-    }
-  ]
+  "users" : [ {
+    "joinedAt" : "2020-01-01"
+  } ]
 }
 ----
 
-'''
-
 == custom resolvers should correctly format dateTimes
 
 .Schema
@@ -48,7 +44,7 @@ type User {
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   users {
@@ -61,13 +57,8 @@ type User {
 [source,json,response=true]
 ----
 {
-  "users": [
-    {
-      "joinedAt": "2020-01-01T00:00:00.000Z"
-    }
-  ]
+  "users" : [ {
+    "joinedAt" : "2020-01-01T00:00:00.000Z"
+  } ]
 }
 ----
-
-'''
-
diff --git a/core/src/test/resources/integration-test-files/issues/3009.js.adoc b/core/src/test/resources/integration-test-files/issues/3009.js.adoc
new file mode 100644
index 00000000..47dd2589
--- /dev/null
+++ b/core/src/test/resources/integration-test-files/issues/3009.js.adoc
@@ -0,0 +1,69 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= https://github.com/neo4j/graphql/issues/3009
+
+== custom resolvers should correctly format dates
+
+.Schema
+[source,graphql,schema=true]
+----
+type User {
+  joinedAt: Date!
+}
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  users {
+    joinedAt
+  }
+}
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "users": [
+    {
+      "joinedAt": "2020-01-01"
+    }
+  ]
+}
+----
+
+== custom resolvers should correctly format dateTimes
+
+.Schema
+[source,graphql,schema=true]
+----
+type User {
+  joinedAt: DateTime!
+}
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  users {
+    joinedAt
+  }
+}
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "users": [
+    {
+      "joinedAt": "2020-01-01T00:00:00.000Z"
+    }
+  ]
+}
+----
diff --git a/core/src/test/resources/integration-test-files/issues/3394.adoc b/core/src/test/resources/integration-test-files/issues/3394.adoc
index 3cc6838b..b6d8cbbc 100644
--- a/core/src/test/resources/integration-test-files/issues/3394.adoc
+++ b/core/src/test/resources/integration-test-files/issues/3394.adoc
@@ -33,7 +33,7 @@ CREATE (e:Employee {fg_item_id: "p1", description: "a p1", fg_item: "part1"})
 == should sort elements by aliased field
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query listProducts {
   products(options: {sort: {partNumber: DESC}}) {
@@ -47,7 +47,7 @@ query listProducts {
 .Expected Cypher params
 [source,json]
 ----
-{}
+{ }
 ----
 
 .Expected Cypher output
@@ -66,27 +66,22 @@ RETURN this {
 [source,json,response=true]
 ----
 {
-  "products": [
-    {
-      "id": "p2",
-      "partNumber": "part2",
-      "description": "a p2"
-    },
-    {
-      "id": "p1",
-      "partNumber": "part1",
-      "description": "a p1"
-    }
-  ]
+  "products" : [ {
+    "id" : "p2",
+    "partNumber" : "part2",
+    "description" : "a p2"
+  }, {
+    "id" : "p1",
+    "partNumber" : "part1",
+    "description" : "a p1"
+  } ]
 }
 ----
 
-'''
-
 == should sort elements by aliased field in relationship
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query listProducts {
   employees {
@@ -102,7 +97,7 @@ query listProducts {
 .Expected Cypher params
 [source,json]
 ----
-{}
+{ }
 ----
 
 .Expected Cypher output
@@ -128,27 +123,20 @@ RETURN this {
 [source,json,response=true]
 ----
 {
-  "employees": [
-    {
-      "products": [
-        {
-          "id": "p2",
-          "partNumber": "part2",
-          "description": "a p2"
-        },
-        {
-          "id": "p1",
-          "partNumber": "part1",
-          "description": "a p1"
-        }
-      ]
-    }
-  ]
+  "employees" : [ {
+    "products" : [ {
+      "id" : "p2",
+      "partNumber" : "part2",
+      "description" : "a p2"
+    }, {
+      "id" : "p1",
+      "partNumber" : "part1",
+      "description" : "a p1"
+    } ]
+  } ]
 }
 ----
 
-'''
-
 == Connection sort
 
 === Setup
@@ -181,7 +169,7 @@ CREATE (e:Employee {fg_item_id: "p1", description: "a p1", fg_item: "part1"})
 === should sort elements by aliased field in connection
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query listProducts {
   productsConnection(sort: {partNumber: DESC}) {
@@ -199,7 +187,7 @@ query listProducts {
 .Expected Cypher params
 [source,json]
 ----
-{}
+{ }
 ----
 
 .Expected Cypher output
@@ -234,33 +222,28 @@ RETURN {
 [source,json,response=true]
 ----
 {
-  "productsConnection": {
-    "edges": [
-      {
-        "node": {
-          "id": "p2",
-          "partNumber": "part2",
-          "description": "a p2"
-        }
-      },
-      {
-        "node": {
-          "id": "p1",
-          "partNumber": "part1",
-          "description": "a p1"
-        }
+  "productsConnection" : {
+    "edges" : [ {
+      "node" : {
+        "id" : "p2",
+        "partNumber" : "part2",
+        "description" : "a p2"
       }
-    ]
+    }, {
+      "node" : {
+        "id" : "p1",
+        "partNumber" : "part1",
+        "description" : "a p1"
+      }
+    } ]
   }
 }
 ----
 
-'''
-
 === should sort elements by aliased field in nested  connection
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query listProducts {
   employees {
@@ -280,7 +263,7 @@ query listProducts {
 .Expected Cypher params
 [source,json]
 ----
-{}
+{ }
 ----
 
 .Expected Cypher output
@@ -322,30 +305,22 @@ RETURN this {
 [source,json,response=true]
 ----
 {
-  "employees": [
-    {
-      "productsConnection": {
-        "edges": [
-          {
-            "node": {
-              "id": "p2",
-              "partNumber": "part2",
-              "description": "a p2"
-            }
-          },
-          {
-            "node": {
-              "id": "p1",
-              "partNumber": "part1",
-              "description": "a p1"
-            }
-          }
-        ]
-      }
+  "employees" : [ {
+    "productsConnection" : {
+      "edges" : [ {
+        "node" : {
+          "id" : "p2",
+          "partNumber" : "part2",
+          "description" : "a p2"
+        }
+      }, {
+        "node" : {
+          "id" : "p1",
+          "partNumber" : "part1",
+          "description" : "a p1"
+        }
+      } ]
     }
-  ]
+  } ]
 }
 ----
-
-'''
-
diff --git a/core/src/test/resources/integration-test-files/issues/3394.js.adoc b/core/src/test/resources/integration-test-files/issues/3394.js.adoc
new file mode 100644
index 00000000..22cd3cda
--- /dev/null
+++ b/core/src/test/resources/integration-test-files/issues/3394.js.adoc
@@ -0,0 +1,311 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= https://github.com/neo4j/graphql/issues/3394
+
+== Setup
+
+.Schema
+[source,graphql,schema=true]
+----
+type Employee {
+  products: [Product!]! @relationship(type: "CAN_ACCESS", direction: OUT)
+}
+
+type Product {
+  id: String! @alias(property: "fg_item_id")
+  description: String!
+  partNumber: ID! @alias(property: "fg_item")
+}
+----
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (e:Employee {fg_item_id: "p1", description: "a p1", fg_item: "part1"})
+ CREATE (p1:Product {fg_item_id: "p1", description: "a p1", fg_item: "part1"})
+ CREATE (p2:Product {fg_item_id: "p2", description: "a p2", fg_item: "part2"})
+
+ CREATE (e)-[:CAN_ACCESS]->(p1)
+ CREATE (e)-[:CAN_ACCESS]->(p2)
+----
+
+== should sort elements by aliased field
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+query listProducts {
+  products(options: {sort: {partNumber: DESC}}) {
+    id
+    partNumber
+    description
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Product)
+WITH *
+ORDER BY this.fg_item DESC
+RETURN this { .description, id: this.fg_item_id, partNumber: this.fg_item } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "products": [
+    {
+      "id": "p2",
+      "partNumber": "part2",
+      "description": "a p2"
+    },
+    {
+      "id": "p1",
+      "partNumber": "part1",
+      "description": "a p1"
+    }
+  ]
+}
+----
+
+== should sort elements by aliased field in relationship
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+query listProducts {
+  employees {
+    products(options: {sort: {partNumber: DESC}}) {
+      id
+      partNumber
+      description
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Employee)
+CALL {
+    WITH this
+    MATCH (this)-[this0:CAN_ACCESS]->(this1:Product)
+    WITH this1 { .description, id: this1.fg_item_id, partNumber: this1.fg_item } AS this1
+    ORDER BY this1.partNumber DESC
+    RETURN collect(this1) AS var2
+}
+RETURN this { products: var2 } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "employees": [
+    {
+      "products": [
+        {
+          "id": "p2",
+          "partNumber": "part2",
+          "description": "a p2"
+        },
+        {
+          "id": "p1",
+          "partNumber": "part1",
+          "description": "a p1"
+        }
+      ]
+    }
+  ]
+}
+----
+
+== Connection sort
+
+=== Setup
+
+.Schema
+[source,graphql,schema=true]
+----
+type Employee {
+  products: [Product!]! @relationship(type: "CAN_ACCESS", direction: OUT)
+}
+
+type Product {
+  id: String! @alias(property: "fg_item_id")
+  description: String!
+  partNumber: ID! @alias(property: "fg_item")
+}
+----
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (e:Employee {fg_item_id: "p1", description: "a p1", fg_item: "part1"})
+ CREATE (p1:Product {fg_item_id: "p1", description: "a p1", fg_item: "part1"})
+ CREATE (p2:Product {fg_item_id: "p2", description: "a p2", fg_item: "part2"})
+
+ CREATE (e)-[:CAN_ACCESS]->(p1)
+ CREATE (e)-[:CAN_ACCESS]->(p2)
+----
+
+=== should sort elements by aliased field in connection
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+query listProducts {
+  productsConnection(sort: {partNumber: DESC}) {
+    edges {
+      node {
+        id
+        partNumber
+        description
+      }
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this0:Product)
+WITH collect({ node: this0 }) AS edges
+WITH edges, size(edges) AS totalCount
+CALL {
+    WITH edges
+    UNWIND edges AS edge
+    WITH edge.node AS this0
+    WITH *
+    ORDER BY this0.fg_item DESC
+    RETURN collect({ node: { id: this0.fg_item_id, partNumber: this0.fg_item, description: this0.description, __typename: "Product" } }) AS var1
+}
+RETURN { edges: var1, totalCount: totalCount } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "productsConnection": {
+    "edges": [
+      {
+        "node": {
+          "id": "p2",
+          "partNumber": "part2",
+          "description": "a p2"
+        }
+      },
+      {
+        "node": {
+          "id": "p1",
+          "partNumber": "part1",
+          "description": "a p1"
+        }
+      }
+    ]
+  }
+}
+----
+
+=== should sort elements by aliased field in nested  connection
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+query listProducts {
+  employees {
+    productsConnection(sort: {node: {partNumber: DESC}}) {
+      edges {
+        node {
+          id
+          partNumber
+          description
+        }
+      }
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Employee)
+CALL {
+    WITH this
+    MATCH (this)-[this0:CAN_ACCESS]->(this1:Product)
+    WITH collect({ node: this1, relationship: this0 }) AS edges
+    WITH edges, size(edges) AS totalCount
+    CALL {
+        WITH edges
+        UNWIND edges AS edge
+        WITH edge.node AS this1, edge.relationship AS this0
+        WITH *
+        ORDER BY this1.fg_item DESC
+        RETURN collect({ node: { id: this1.fg_item_id, partNumber: this1.fg_item, description: this1.description, __typename: "Product" } }) AS var2
+    }
+    RETURN { edges: var2, totalCount: totalCount } AS var3
+}
+RETURN this { productsConnection: var3 } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "employees": [
+    {
+      "productsConnection": {
+        "edges": [
+          {
+            "node": {
+              "id": "p2",
+              "partNumber": "part2",
+              "description": "a p2"
+            }
+          },
+          {
+            "node": {
+              "id": "p1",
+              "partNumber": "part1",
+              "description": "a p1"
+            }
+          }
+        ]
+      }
+    }
+  ]
+}
+----
diff --git a/core/src/test/resources/integration-test-files/issues/360.adoc b/core/src/test/resources/integration-test-files/issues/360.adoc
index c40b4c20..93139801 100644
--- a/core/src/test/resources/integration-test-files/issues/360.adoc
+++ b/core/src/test/resources/integration-test-files/issues/360.adoc
@@ -28,7 +28,7 @@ CREATE (:Event {id: "A", name: "name1", start: datetime(), end: datetime()})
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query ($rangeStart: DateTime, $rangeEnd: DateTime, $activity: String) {
   events(
@@ -42,7 +42,7 @@ query ($rangeStart: DateTime, $rangeEnd: DateTime, $activity: String) {
 .Expected Cypher params
 [source,json]
 ----
-{}
+{ }
 ----
 
 .Expected Cypher output
@@ -58,22 +58,16 @@ RETURN this {
 [source,json,response=true,ignore-order]
 ----
 {
-  "events": [
-    {
-      "id": "A"
-    },
-    {
-      "id": "B"
-    },
-    {
-      "id": "C"
-    }
-  ]
+  "events" : [ {
+    "id" : "A"
+  }, {
+    "id" : "B"
+  }, {
+    "id" : "C"
+  } ]
 }
 ----
 
-'''
-
 == should return all nodes when OR is used and members are optional
 
 .Test Data
@@ -85,7 +79,7 @@ CREATE (:Event {id: "A", name: "name1", start: datetime(), end: datetime()})
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query ($rangeStart: DateTime, $rangeEnd: DateTime, $activity: String) {
   events(
@@ -99,7 +93,7 @@ query ($rangeStart: DateTime, $rangeEnd: DateTime, $activity: String) {
 .Expected Cypher params
 [source,json]
 ----
-{}
+{ }
 ----
 
 .Expected Cypher output
@@ -115,34 +109,28 @@ RETURN this {
 [source,json,response=true,ignore-order]
 ----
 {
-  "events": [
-    {
-      "id": "A"
-    },
-    {
-      "id": "B"
-    },
-    {
-      "id": "C"
-    }
-  ]
+  "events" : [ {
+    "id" : "A"
+  }, {
+    "id" : "B"
+  }, {
+    "id" : "C"
+  } ]
 }
 ----
 
-'''
-
 == should recreate given test in issue and return correct results
 
 .Test Data
 [source,cypher,test-data=true]
 ----
-CREATE (:Event {id: "A", name: "name1", start: datetime("2024-12-01T15:47:19.274Z"), end: datetime("2024-12-01T15:47:19.274Z")})
- CREATE (:Event {id: "B", name: "name2", start: datetime("2024-12-01T15:47:19.274Z"), end: datetime("2024-12-01T15:47:19.274Z")})
+CREATE (:Event {id: "A", name: "name1", start: datetime("2024-12-24T18:42:24.123Z"), end: datetime("2024-12-24T18:42:24.456Z")})
+ CREATE (:Event {id: "B", name: "name2", start: datetime("2024-12-24T18:42:24.123Z"), end: datetime("2024-12-24T18:42:24.456Z")})
  CREATE (:Event {id: "C", name: "name3", start: datetime(), end: datetime()})
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query ($rangeStart: DateTime, $rangeEnd: DateTime, $activity: String) {
   events(
@@ -157,8 +145,8 @@ query ($rangeStart: DateTime, $rangeEnd: DateTime, $activity: String) {
 [source,json,request=true]
 ----
 {
-  "rangeStart": "2024-12-01T15:47:19.274Z",
-  "rangeEnd": "2024-12-01T15:47:19.274Z"
+  "rangeEnd" : "2024-12-01T15:47:19.274Z",
+  "rangeStart" : "2024-12-01T15:47:19.274Z"
 }
 ----
 
@@ -186,19 +174,12 @@ RETURN this {
 [source,json,response=true,ignore-order]
 ----
 {
-  "events": [
-    {
-      "id": "A"
-    },
-    {
-      "id": "B"
-    },
-    {
-      "id": "C"
-    }
-  ]
+  "events" : [ {
+    "id" : "A"
+  }, {
+    "id" : "B"
+  }, {
+    "id" : "C"
+  } ]
 }
 ----
-
-'''
-
diff --git a/core/src/test/resources/integration-test-files/issues/360.js.adoc b/core/src/test/resources/integration-test-files/issues/360.js.adoc
new file mode 100644
index 00000000..53b65346
--- /dev/null
+++ b/core/src/test/resources/integration-test-files/issues/360.js.adoc
@@ -0,0 +1,191 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= https://github.com/neo4j/graphql/issues/360
+
+== Setup
+
+.Schema
+[source,graphql,schema=true]
+----
+type Event {
+  id: ID!
+  name: String
+  start: DateTime
+  end: DateTime
+  activity: String
+}
+----
+
+== should return all nodes when AND is used and members are optional
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (:Event {id: "A", name: "name1", start: datetime(), end: datetime()})
+ CREATE (:Event {id: "B", name: "name2", start: datetime(), end: datetime()})
+ CREATE (:Event {id: "C", name: "name3", start: datetime(), end: datetime()})
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+query ($rangeStart: DateTime, $rangeEnd: DateTime, $activity: String) {
+  events(
+    where: {AND: [{start_GTE: $rangeStart}, {start_LTE: $rangeEnd}, {activity: $activity}]}
+  ) {
+    id
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Event)
+RETURN this { .id } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "events": [
+    {
+      "id": "A"
+    },
+    {
+      "id": "B"
+    },
+    {
+      "id": "C"
+    }
+  ]
+}
+----
+
+== should return all nodes when OR is used and members are optional
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (:Event {id: "A", name: "name1", start: datetime(), end: datetime()})
+ CREATE (:Event {id: "B", name: "name2", start: datetime(), end: datetime()})
+ CREATE (:Event {id: "C", name: "name3", start: datetime(), end: datetime()})
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+query ($rangeStart: DateTime, $rangeEnd: DateTime, $activity: String) {
+  events(
+    where: {OR: [{start_GTE: $rangeStart}, {start_LTE: $rangeEnd}, {activity: $activity}]}
+  ) {
+    id
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Event)
+RETURN this { .id } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "events": [
+    {
+      "id": "A"
+    },
+    {
+      "id": "B"
+    },
+    {
+      "id": "C"
+    }
+  ]
+}
+----
+
+== should recreate given test in issue and return correct results
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (:Event {id: "A", name: "name1", start: datetime("2024-12-24T18:42:24.123Z"), end: datetime("2024-12-24T18:42:24.456Z")})
+ CREATE (:Event {id: "B", name: "name2", start: datetime("2024-12-24T18:42:24.123Z"), end: datetime("2024-12-24T18:42:24.456Z")})
+ CREATE (:Event {id: "C", name: "name3", start: datetime(), end: datetime()})
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+query ($rangeStart: DateTime, $rangeEnd: DateTime, $activity: String) {
+  events(
+    where: {OR: [{start_GTE: $rangeStart}, {start_LTE: $rangeEnd}, {activity: $activity}]}
+  ) {
+    id
+  }
+}
+----
+
+.GraphQL params input
+[source,json,request=true]
+----
+{
+  "rangeStart": "2024-12-24T18:42:24.123Z",
+  "rangeEnd": "2024-12-24T18:42:24.456Z"
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "2024-12-24T18:42:24.123000000Z",
+  "param1": "2024-12-24T18:42:24.456000000Z"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Event)
+WHERE (this.start >= $param0 OR this.start <= $param1)
+RETURN this { .id } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "events": [
+    {
+      "id": "C"
+    },
+    {
+      "id": "B"
+    },
+    {
+      "id": "A"
+    }
+  ]
+}
+----
diff --git a/core/src/test/resources/integration-test-files/issues/4007.adoc b/core/src/test/resources/integration-test-files/issues/4007.adoc
index 71353d13..bd475270 100644
--- a/core/src/test/resources/integration-test-files/issues/4007.adoc
+++ b/core/src/test/resources/integration-test-files/issues/4007.adoc
@@ -29,7 +29,7 @@ CREATE (m:Movie {title: "RandomString1"})
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   m: movies(where: {title: "RandomString1"}) {
@@ -48,7 +48,7 @@ CREATE (m:Movie {title: "RandomString1"})
 [source,json]
 ----
 {
-  "param0": "RandomString1"
+  "param0" : "RandomString1"
 }
 ----
 
@@ -90,31 +90,22 @@ RETURN this {
 [source,json,response=true,ignore-order]
 ----
 {
-  "m": [
-    {
-      "t": {
-        "e": [
-          {
-            "no": {
-              "ne": "A"
-            }
-          },
-          {
-            "no": {
-              "ne": "B"
-            }
-          },
-          {
-            "no": {
-              "ne": "C"
-            }
-          }
-        ]
-      }
+  "m" : [ {
+    "t" : {
+      "e" : [ {
+        "no" : {
+          "ne" : "A"
+        }
+      }, {
+        "no" : {
+          "ne" : "B"
+        }
+      }, {
+        "no" : {
+          "ne" : "C"
+        }
+      } ]
     }
-  ]
+  } ]
 }
 ----
-
-'''
-
diff --git a/core/src/test/resources/integration-test-files/issues/4007.js.adoc b/core/src/test/resources/integration-test-files/issues/4007.js.adoc
new file mode 100644
index 00000000..7e5c08a7
--- /dev/null
+++ b/core/src/test/resources/integration-test-files/issues/4007.js.adoc
@@ -0,0 +1,105 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= https://github.com/neo4j/graphql/issues/4007
+
+== should return name from aliased selection
+
+.Schema
+[source,graphql,schema=true]
+----
+type Movie {
+  title: String!
+  actors: [Actor!]! @relationship(type: "ACTED_IN", direction: IN)
+}
+
+type Actor {
+  name: String!
+  movies: [Movie!]! @relationship(type: "ACTED_IN", direction: OUT)
+}
+----
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (m:Movie {title: "RandomString1"})
+ CREATE (m)<-[:ACTED_IN]-(:Actor {name: "A"})
+ CREATE (m)<-[:ACTED_IN]-(:Actor {name: "B"})
+ CREATE (m)<-[:ACTED_IN]-(:Actor {name: "C"})
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  m: movies(where: {title: "RandomString1"}) {
+    t: actorsConnection {
+      e: edges {
+        no: node {
+          ne: name
+        }
+      }
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "RandomString1"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE this.title = $param0
+CALL {
+    WITH this
+    MATCH (this)<-[this0:ACTED_IN]-(this1:Actor)
+    WITH collect({ node: this1, relationship: this0 }) AS edges
+    WITH edges, size(edges) AS totalCount
+    CALL {
+        WITH edges
+        UNWIND edges AS edge
+        WITH edge.node AS this1, edge.relationship AS this0
+        RETURN collect({ node: { ne: this1.name, __typename: "Actor" } }) AS var2
+    }
+    RETURN { edges: var2, totalCount: totalCount } AS var3
+}
+RETURN this { t: var3 } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "m": [
+    {
+      "t": {
+        "e": [
+          {
+            "no": {
+              "ne": "A"
+            }
+          },
+          {
+            "no": {
+              "ne": "C"
+            }
+          },
+          {
+            "no": {
+              "ne": "B"
+            }
+          }
+        ]
+      }
+    }
+  ]
+}
+----
diff --git a/core/src/test/resources/integration-test-files/issues/4015.adoc b/core/src/test/resources/integration-test-files/issues/4015.adoc
index a13f6385..5111d5c5 100644
--- a/core/src/test/resources/integration-test-files/issues/4015.adoc
+++ b/core/src/test/resources/integration-test-files/issues/4015.adoc
@@ -30,7 +30,7 @@ CREATE (m:Movie {title: "RandomString1"})
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies {
@@ -51,7 +51,7 @@ CREATE (m:Movie {title: "RandomString1"})
 .Expected Cypher params
 [source,json]
 ----
-{}
+{ }
 ----
 
 .Expected Cypher output
@@ -95,40 +95,31 @@ RETURN this {
 [source,json,response=true,ignore-order]
 ----
 {
-  "movies": [
-    {
-      "actorsConnection": {
-        "edges": [
-          {
-            "node": {
-              "surname": "surname1"
-            },
-            "no": {
-              "name": "name1"
-            }
-          },
-          {
-            "node": {
-              "surname": "surname3"
-            },
-            "no": {
-              "name": "name3"
-            }
-          },
-          {
-            "node": {
-              "surname": "surname2"
-            },
-            "no": {
-              "name": "name2"
-            }
-          }
-        ]
-      }
+  "movies" : [ {
+    "actorsConnection" : {
+      "edges" : [ {
+        "node" : {
+          "surname" : "surname1"
+        },
+        "no" : {
+          "name" : "name1"
+        }
+      }, {
+        "node" : {
+          "surname" : "surname3"
+        },
+        "no" : {
+          "name" : "name3"
+        }
+      }, {
+        "node" : {
+          "surname" : "surname2"
+        },
+        "no" : {
+          "name" : "name2"
+        }
+      } ]
     }
-  ]
+  } ]
 }
 ----
-
-'''
-
diff --git a/core/src/test/resources/integration-test-files/issues/4015.js.adoc b/core/src/test/resources/integration-test-files/issues/4015.js.adoc
new file mode 100644
index 00000000..ec8ead11
--- /dev/null
+++ b/core/src/test/resources/integration-test-files/issues/4015.js.adoc
@@ -0,0 +1,115 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= https://github.com/neo4j/graphql/issues/4007
+
+== should return all the selected node fields
+
+.Schema
+[source,graphql,schema=true]
+----
+type Movie {
+  title: String!
+  actors: [Actor!]! @relationship(type: "ACTED_IN", direction: IN)
+}
+
+type Actor {
+  name: String!
+  surname: String
+  movies: [Movie!]! @relationship(type: "ACTED_IN", direction: OUT)
+}
+----
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (m:Movie {title: "RandomString1"})
+ CREATE (m)<-[:ACTED_IN]-(:Actor {name: "name1", surname: "surname1"})
+ CREATE (m)<-[:ACTED_IN]-(:Actor {name: "name2", surname: "surname2"})
+ CREATE (m)<-[:ACTED_IN]-(:Actor {name: "name3", surname: "surname3"})
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies {
+    actorsConnection {
+      edges {
+        node {
+          surname
+        }
+        no: node {
+          name
+        }
+      }
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+CALL {
+    WITH this
+    MATCH (this)<-[this0:ACTED_IN]-(this1:Actor)
+    WITH collect({ node: this1, relationship: this0 }) AS edges
+    WITH edges, size(edges) AS totalCount
+    CALL {
+        WITH edges
+        UNWIND edges AS edge
+        WITH edge.node AS this1, edge.relationship AS this0
+        RETURN collect({ node: { surname: this1.surname, name: this1.name, __typename: "Actor" } }) AS var2
+    }
+    RETURN { edges: var2, totalCount: totalCount } AS var3
+}
+RETURN this { actorsConnection: var3 } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "movies": [
+    {
+      "actorsConnection": {
+        "edges": [
+          {
+            "node": {
+              "surname": "surname1"
+            },
+            "no": {
+              "name": "name1"
+            }
+          },
+          {
+            "node": {
+              "surname": "surname2"
+            },
+            "no": {
+              "name": "name2"
+            }
+          },
+          {
+            "node": {
+              "surname": "surname3"
+            },
+            "no": {
+              "name": "name3"
+            }
+          }
+        ]
+      }
+    }
+  ]
+}
+----
diff --git a/core/src/test/resources/integration-test-files/issues/402.adoc b/core/src/test/resources/integration-test-files/issues/402.adoc
index 56b8fc2f..68d8d021 100644
--- a/core/src/test/resources/integration-test-files/issues/402.adoc
+++ b/core/src/test/resources/integration-test-files/issues/402.adoc
@@ -25,7 +25,7 @@ CREATE (:Event {id: "RandomString1"})-[:HAPPENS_IN]->(:Area {id: "RandomString2"
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query ($area: [ID!]) {
   events(where: {id: "RandomString1", area: {id_IN: $area}}) {
@@ -41,7 +41,7 @@ query ($area: [ID!]) {
 [source,json]
 ----
 {
-  "param0": "RandomString1"
+  "param0" : "RandomString1"
 }
 ----
 
@@ -68,16 +68,11 @@ RETURN this {
 [source,json,response=true]
 ----
 {
-  "events": [
-    {
-      "id": "RandomString1",
-      "area": {
-        "id": "RandomString2"
-      }
+  "events" : [ {
+    "id" : "RandomString1",
+    "area" : {
+      "id" : "RandomString2"
     }
-  ]
+  } ]
 }
 ----
-
-'''
-
diff --git a/core/src/test/resources/integration-test-files/issues/402.js.adoc b/core/src/test/resources/integration-test-files/issues/402.js.adoc
new file mode 100644
index 00000000..2e4774ad
--- /dev/null
+++ b/core/src/test/resources/integration-test-files/issues/402.js.adoc
@@ -0,0 +1,76 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= https://github.com/neo4j/graphql/issues/402
+
+== should recreate test and return correct data
+
+.Schema
+[source,graphql,schema=true]
+----
+type Event {
+  id: ID!
+  area: Area! @relationship(type: "HAPPENS_IN", direction: OUT)
+}
+
+type Area {
+  id: ID!
+}
+----
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (:Event {id: "RandomString1"})-[:HAPPENS_IN]->(:Area {id: "RandomString2"})
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+query ($area: [ID!]) {
+  events(where: {id: "RandomString1", area: {id_IN: $area}}) {
+    id
+    area {
+      id
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "RandomString1"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Event)
+WHERE this.id = $param0
+CALL {
+    WITH this
+    MATCH (this)-[this0:HAPPENS_IN]->(this1:Area)
+    WITH this1 { .id } AS this1
+    RETURN head(collect(this1)) AS var2
+}
+RETURN this { .id, area: var2 } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "events": [
+    {
+      "id": "RandomString1",
+      "area": {
+        "id": "RandomString2"
+      }
+    }
+  ]
+}
+----
diff --git a/core/src/test/resources/integration-test-files/issues/4196.adoc b/core/src/test/resources/integration-test-files/issues/4196.adoc
index 174abbe7..cc9ac681 100644
--- a/core/src/test/resources/integration-test-files/issues/4196.adoc
+++ b/core/src/test/resources/integration-test-files/issues/4196.adoc
@@ -37,7 +37,7 @@ MERGE (:Foo {name: "A"})-[:relatesTo]->(b1:Bar {name: "bar1"})
 == querying multiple nested nodes should be sorted correctly
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   foos(options: {sort: {name: ASC}}) {
@@ -54,7 +54,7 @@ MERGE (:Foo {name: "A"})-[:relatesTo]->(b1:Bar {name: "bar1"})
 .Expected Cypher params
 [source,json]
 ----
-{}
+{ }
 ----
 
 .Expected Cypher output
@@ -88,38 +88,23 @@ RETURN this {
 [source,json,response=true]
 ----
 {
-  "foos": [
-    {
-      "name": "A",
-      "bars": [
-        {
-          "foobars": [
-            {
-              "name": "a"
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "name": "B",
-      "bars": []
-    },
-    {
-      "name": "C",
-      "bars": [
-        {
-          "foobars": [
-            {
-              "name": "b"
-            }
-          ]
-        }
-      ]
-    }
-  ]
+  "foos" : [ {
+    "name" : "A",
+    "bars" : [ {
+      "foobars" : [ {
+        "name" : "a"
+      } ]
+    } ]
+  }, {
+    "name" : "B",
+    "bars" : [ ]
+  }, {
+    "name" : "C",
+    "bars" : [ {
+      "foobars" : [ {
+        "name" : "b"
+      } ]
+    } ]
+  } ]
 }
 ----
-
-'''
-
diff --git a/core/src/test/resources/integration-test-files/issues/4196.js.adoc b/core/src/test/resources/integration-test-files/issues/4196.js.adoc
new file mode 100644
index 00000000..16e4641d
--- /dev/null
+++ b/core/src/test/resources/integration-test-files/issues/4196.js.adoc
@@ -0,0 +1,117 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= https://github.com/neo4j/graphql/issues/4196
+
+== Setup
+
+.Schema
+[source,graphql,schema=true]
+----
+type Foo {
+  name: String
+  bars: [Bar!]! @relationship(type: "relatesTo", direction: OUT)
+}
+
+type Bar {
+  name: String
+  foobars: [FooBar!]! @relationship(type: "relatesTo", direction: OUT)
+}
+
+type FooBar {
+  name: String
+  bars: [FooBar!]! @relationship(type: "relatesTo", direction: IN)
+}
+----
+
+.Test Data
+[source,cypher,test-data=true]
+----
+MERGE (:Foo {name: "A"})-[:relatesTo]->(b1:Bar {name: "bar1"})
+ MERGE (:Foo {name: "B"})
+ MERGE (:Foo {name: "C"})-[:relatesTo]->(b3:Bar {name: "bar3"})
+ MERGE (b1)-[:relatesTo]->(:FooBar {name: "a"})
+ MERGE (b3)-[:relatesTo]->(:FooBar {name: "b"})
+----
+
+== querying multiple nested nodes should be sorted correctly
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  foos(options: {sort: {name: ASC}}) {
+    name
+    bars {
+      foobars {
+        name
+      }
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Foo)
+WITH *
+ORDER BY this.name ASC
+CALL {
+    WITH this
+    MATCH (this)-[this0:relatesTo]->(this1:Bar)
+    CALL {
+        WITH this1
+        MATCH (this1)-[this2:relatesTo]->(this3:FooBar)
+        WITH this3 { .name } AS this3
+        RETURN collect(this3) AS var4
+    }
+    WITH this1 { foobars: var4 } AS this1
+    RETURN collect(this1) AS var5
+}
+RETURN this { .name, bars: var5 } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "foos": [
+    {
+      "name": "A",
+      "bars": [
+        {
+          "foobars": [
+            {
+              "name": "a"
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "name": "B",
+      "bars": []
+    },
+    {
+      "name": "C",
+      "bars": [
+        {
+          "foobars": [
+            {
+              "name": "b"
+            }
+          ]
+        }
+      ]
+    }
+  ]
+}
+----
diff --git a/core/src/test/resources/integration-test-files/issues/4287.adoc b/core/src/test/resources/integration-test-files/issues/4287.adoc
index d6f47ba7..2be1369e 100644
--- a/core/src/test/resources/integration-test-files/issues/4287.adoc
+++ b/core/src/test/resources/integration-test-files/issues/4287.adoc
@@ -45,7 +45,7 @@ CREATE (a:Actor { name: "Someone" })
 == filter by logical operator on interface connection
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   actors {
@@ -67,10 +67,10 @@ CREATE (a:Actor { name: "Someone" })
 [source,json]
 ----
 {
-  "param0": "something",
-  "param1": "whatever",
-  "param2": "something",
-  "param3": "whatever"
+  "param0" : "something",
+  "param1" : "whatever",
+  "param2" : "something",
+  "param3" : "whatever"
 }
 ----
 
@@ -122,28 +122,20 @@ RETURN this {
 [source,json,response=true,ignore-order]
 ----
 {
-  "actors": [
-    {
-      "actedInConnection": {
-        "edges": [
-          {
-            "node": {
-              "__typename": "Movie",
-              "title": "something"
-            }
-          },
-          {
-            "node": {
-              "__typename": "Series",
-              "title": "whatever"
-            }
-          }
-        ]
-      }
+  "actors" : [ {
+    "actedInConnection" : {
+      "edges" : [ {
+        "node" : {
+          "__typename" : "Movie",
+          "title" : "something"
+        }
+      }, {
+        "node" : {
+          "__typename" : "Series",
+          "title" : "whatever"
+        }
+      } ]
     }
-  ]
+  } ]
 }
 ----
-
-'''
-
diff --git a/core/src/test/resources/integration-test-files/issues/4287.js.adoc b/core/src/test/resources/integration-test-files/issues/4287.js.adoc
new file mode 100644
index 00000000..3e11d962
--- /dev/null
+++ b/core/src/test/resources/integration-test-files/issues/4287.js.adoc
@@ -0,0 +1,129 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= https://github.com/neo4j/graphql/issues/4287
+
+== Setup
+
+.Schema
+[source,graphql,schema=true]
+----
+type Actor {
+  name: String
+  actedIn: [Production!]! @relationship(type: "ACTED_IN", properties: "actedIn", direction: OUT)
+}
+
+type actedIn @relationshipProperties {
+  role: String
+}
+
+interface Production {
+  title: String
+}
+
+type Movie implements Production {
+  title: String
+  runtime: Int
+}
+
+type Series implements Production {
+  title: String
+  episodes: Int
+}
+----
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (a:Actor { name: "Someone" })
+ CREATE (a)-[:ACTED_IN]->(:Movie {title: "something"})
+ CREATE (a)-[:ACTED_IN]->(:Series {title: "whatever"})
+ CREATE (a)-[:ACTED_IN]->(:Movie {title: "whatever 2"})
+ CREATE (a)-[:ACTED_IN]->(:Series {title: "something 2"})
+----
+
+== filter by logical operator on interface connection
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  actors {
+    actedInConnection(
+      where: {OR: [{node: {title: "something"}}, {node: {title: "whatever"}}]}
+    ) {
+      edges {
+        node {
+          __typename
+          title
+        }
+      }
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "something",
+  "param1": "whatever",
+  "param2": "something",
+  "param3": "whatever"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Actor)
+CALL {
+    WITH this
+    CALL {
+        WITH this
+        MATCH (this)-[this0:ACTED_IN]->(this1:Movie)
+        WHERE (this1.title = $param0 OR this1.title = $param1)
+        WITH { node: { __typename: "Movie", __id: toString(id(this1)), title: this1.title } } AS edge
+        RETURN edge
+        UNION
+        WITH this
+        MATCH (this)-[this2:ACTED_IN]->(this3:Series)
+        WHERE (this3.title = $param2 OR this3.title = $param3)
+        WITH { node: { __typename: "Series", __id: toString(id(this3)), title: this3.title } } AS edge
+        RETURN edge
+    }
+    WITH collect(edge) AS edges
+    WITH edges, size(edges) AS totalCount
+    RETURN { edges: edges, totalCount: totalCount } AS var4
+}
+RETURN this { actedInConnection: var4 } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "actors": [
+    {
+      "actedInConnection": {
+        "edges": [
+          {
+            "node": {
+              "__typename": "Movie",
+              "title": "something"
+            }
+          },
+          {
+            "node": {
+              "__typename": "Series",
+              "title": "whatever"
+            }
+          }
+        ]
+      }
+    }
+  ]
+}
+----
diff --git a/core/src/test/resources/integration-test-files/issues/433.adoc b/core/src/test/resources/integration-test-files/issues/433.adoc
index e494fa0c..2643432f 100644
--- a/core/src/test/resources/integration-test-files/issues/433.adoc
+++ b/core/src/test/resources/integration-test-files/issues/433.adoc
@@ -25,7 +25,7 @@ CREATE (:Movie {title: "RandomString1"})<-[:ACTED_IN]-(:Person {name: "RandomStr
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies(where: {title: "RandomString1"}) {
@@ -45,7 +45,7 @@ CREATE (:Movie {title: "RandomString1"})<-[:ACTED_IN]-(:Person {name: "RandomStr
 [source,json]
 ----
 {
-  "param0": "RandomString1"
+  "param0" : "RandomString1"
 }
 ----
 
@@ -88,22 +88,15 @@ RETURN this {
 [source,json,response=true]
 ----
 {
-  "movies": [
-    {
-      "title": "RandomString1",
-      "actorsConnection": {
-        "edges": [
-          {
-            "node": {
-              "name": "RandomString2"
-            }
-          }
-        ]
-      }
+  "movies" : [ {
+    "title" : "RandomString1",
+    "actorsConnection" : {
+      "edges" : [ {
+        "node" : {
+          "name" : "RandomString2"
+        }
+      } ]
     }
-  ]
+  } ]
 }
 ----
-
-'''
-
diff --git a/core/src/test/resources/integration-test-files/issues/433.js.adoc b/core/src/test/resources/integration-test-files/issues/433.js.adoc
new file mode 100644
index 00000000..d88dacd3
--- /dev/null
+++ b/core/src/test/resources/integration-test-files/issues/433.js.adoc
@@ -0,0 +1,93 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= https://github.com/neo4j/graphql/issues/433
+
+== should recreate issue and return correct data
+
+.Schema
+[source,graphql,schema=true]
+----
+type Movie {
+  title: String
+  actors: [Person!]! @relationship(type: "ACTED_IN", direction: IN)
+}
+
+type Person {
+  name: String
+}
+----
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (:Movie {title: "RandomString1"})<-[:ACTED_IN]-(:Person {name: "RandomString2"})
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies(where: {title: "RandomString1"}) {
+    title
+    actorsConnection(where: {}) {
+      edges {
+        node {
+          name
+        }
+      }
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "RandomString1"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE this.title = $param0
+CALL {
+    WITH this
+    MATCH (this)<-[this0:ACTED_IN]-(this1:Person)
+    WITH collect({ node: this1, relationship: this0 }) AS edges
+    WITH edges, size(edges) AS totalCount
+    CALL {
+        WITH edges
+        UNWIND edges AS edge
+        WITH edge.node AS this1, edge.relationship AS this0
+        RETURN collect({ node: { name: this1.name, __typename: "Person" } }) AS var2
+    }
+    RETURN { edges: var2, totalCount: totalCount } AS var3
+}
+RETURN this { .title, actorsConnection: var3 } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "movies": [
+    {
+      "title": "RandomString1",
+      "actorsConnection": {
+        "edges": [
+          {
+            "node": {
+              "name": "RandomString2"
+            }
+          }
+        ]
+      }
+    }
+  ]
+}
+----
diff --git a/core/src/test/resources/integration-test-files/issues/4450.adoc b/core/src/test/resources/integration-test-files/issues/4450.adoc
index 8021b321..452a0cef 100644
--- a/core/src/test/resources/integration-test-files/issues/4450.adoc
+++ b/core/src/test/resources/integration-test-files/issues/4450.adoc
@@ -38,7 +38,7 @@ CREATE (:Actor {name: "actor-1"})-[:IN_SCENE {cut: true}]->(:Scene {number: 1})-
 == filtering through a connection to a many-to-1 relationship should work
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   actors(
@@ -53,8 +53,8 @@ CREATE (:Actor {name: "actor-1"})-[:IN_SCENE {cut: true}]->(:Scene {number: 1})-
 [source,json]
 ----
 {
-  "param0": "test",
-  "param1": true
+  "param0" : "test",
+  "param1" : true
 }
 ----
 
@@ -79,13 +79,8 @@ RETURN this {
 [source,json,response=true]
 ----
 {
-  "actors": [
-    {
-      "name": "actor-1"
-    }
-  ]
+  "actors" : [ {
+    "name" : "actor-1"
+  } ]
 }
 ----
-
-'''
-
diff --git a/core/src/test/resources/integration-test-files/issues/4450.js.adoc b/core/src/test/resources/integration-test-files/issues/4450.js.adoc
new file mode 100644
index 00000000..ccf21b8a
--- /dev/null
+++ b/core/src/test/resources/integration-test-files/issues/4450.js.adoc
@@ -0,0 +1,90 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= https://github.com/neo4j/graphql/issues/4450
+
+== Setup
+
+.Schema
+[source,graphql,schema=true]
+----
+type Actor {
+  name: String
+  scene: [Scene!]! @relationship(type: "IN_SCENE", properties: "ActorScene", direction: OUT)
+}
+
+type Scene {
+  number: Int
+  actors: [Actor!]! @relationship(type: "IN_SCENE", properties: "ActorScene", direction: IN)
+  location: Location! @relationship(type: "AT_LOCATION", direction: OUT)
+}
+
+type Location {
+  city: String
+  scenes: [Scene!]! @relationship(type: "AT_LOCATION", direction: IN)
+}
+
+type ActorScene @relationshipProperties {
+  cut: Boolean
+}
+----
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (:Actor {name: "actor-1"})-[:IN_SCENE {cut: true}]->(:Scene {number: 1})-[:AT_LOCATION]->(:Location {city: "test"})
+----
+
+== filtering through a connection to a many-to-1 relationship should work
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  actors(
+    where: {sceneConnection_SOME: {edge: {cut: true}, node: {location: {city: "test"}}}}
+  ) {
+    name
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "test",
+  "param1": true
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Actor)
+CALL {
+    WITH this
+    MATCH (this)-[this0:IN_SCENE]->(this1:Scene)
+    OPTIONAL MATCH (this1)-[:AT_LOCATION]->(this2:Location)
+    WITH *, count(this2) AS locationCount
+    WITH *
+    WHERE ((locationCount <> 0 AND this2.city = $param0) AND this0.cut = $param1)
+    RETURN count(this1) > 0 AS var3
+}
+WITH *
+WHERE var3 = true
+RETURN this { .name } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "actors": [
+    {
+      "name": "actor-1"
+    }
+  ]
+}
+----
diff --git a/core/src/test/resources/integration-test-files/issues/4532.adoc b/core/src/test/resources/integration-test-files/issues/4532.adoc
index f25aecae..94fda4d7 100644
--- a/core/src/test/resources/integration-test-files/issues/4532.adoc
+++ b/core/src/test/resources/integration-test-files/issues/4532.adoc
@@ -38,7 +38,7 @@ CREATE(i:Inventory {id: "i1"})
 === should return all elements when ordering by nested connection
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   inventories {
@@ -60,7 +60,7 @@ CREATE(i:Inventory {id: "i1"})
 .Expected Cypher params
 [source,json]
 ----
-{}
+{ }
 ----
 
 .Expected Cypher output
@@ -105,50 +105,41 @@ RETURN this {
 [source,json,response=true,ignore-order]
 ----
 {
-  "inventories": [
-    {
-      "id": "i2",
-      "childrenConnection": {
-        "edges": []
-      }
-    },
-    {
-      "id": "i1",
-      "childrenConnection": {
-        "edges": [
-          {
-            "properties": {
-              "order": 1
-            },
-            "node": {
-              "id": "c1"
-            }
-          },
-          {
-            "properties": {
-              "order": 2
-            },
-            "node": {
-              "id": "c2"
-            }
-          },
-          {
-            "properties": {
-              "order": 3
-            },
-            "node": {
-              "id": "c3"
-            }
-          }
-        ]
-      }
+  "inventories" : [ {
+    "id" : "i2",
+    "childrenConnection" : {
+      "edges" : [ ]
+    }
+  }, {
+    "id" : "i1",
+    "childrenConnection" : {
+      "edges" : [ {
+        "properties" : {
+          "order" : 1
+        },
+        "node" : {
+          "id" : "c1"
+        }
+      }, {
+        "properties" : {
+          "order" : 2
+        },
+        "node" : {
+          "id" : "c2"
+        }
+      }, {
+        "properties" : {
+          "order" : 3
+        },
+        "node" : {
+          "id" : "c3"
+        }
+      } ]
     }
-  ]
+  } ]
 }
 ----
 
-'''
-
 == order-by relationship property on interface node target
 
 === Setup
@@ -192,7 +183,7 @@ CREATE(i:Inventory {id: "i1"})
 === should return all elements when ordering by nested connection on an interface target
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   inventories {
@@ -214,7 +205,7 @@ CREATE(i:Inventory {id: "i1"})
 .Expected Cypher params
 [source,json]
 ----
-{}
+{ }
 ----
 
 .Expected Cypher output
@@ -276,47 +267,37 @@ RETURN this {
 [source,json,response=true,ignore-order]
 ----
 {
-  "inventories": [
-    {
-      "id": "i1",
-      "childrenConnection": {
-        "edges": [
-          {
-            "properties": {
-              "order": 1
-            },
-            "node": {
-              "id": "c1"
-            }
-          },
-          {
-            "properties": {
-              "order": 2
-            },
-            "node": {
-              "id": "c2"
-            }
-          },
-          {
-            "properties": {
-              "order": 3
-            },
-            "node": {
-              "id": "c3"
-            }
-          }
-        ]
-      }
-    },
-    {
-      "id": "i2",
-      "childrenConnection": {
-        "edges": []
-      }
+  "inventories" : [ {
+    "id" : "i1",
+    "childrenConnection" : {
+      "edges" : [ {
+        "properties" : {
+          "order" : 1
+        },
+        "node" : {
+          "id" : "c1"
+        }
+      }, {
+        "properties" : {
+          "order" : 2
+        },
+        "node" : {
+          "id" : "c2"
+        }
+      }, {
+        "properties" : {
+          "order" : 3
+        },
+        "node" : {
+          "id" : "c3"
+        }
+      } ]
     }
-  ]
+  }, {
+    "id" : "i2",
+    "childrenConnection" : {
+      "edges" : [ ]
+    }
+  } ]
 }
 ----
-
-'''
-
diff --git a/core/src/test/resources/integration-test-files/issues/4532.js.adoc b/core/src/test/resources/integration-test-files/issues/4532.js.adoc
new file mode 100644
index 00000000..2e0e6019
--- /dev/null
+++ b/core/src/test/resources/integration-test-files/issues/4532.js.adoc
@@ -0,0 +1,278 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= https://github.com/neo4j/graphql/issues/4532
+
+== order-by relationship property
+
+=== Setup
+
+.Schema
+[source,graphql,schema=true]
+----
+type Inventory {
+  id: ID
+  children: [Scenario!]! @relationship(type: "HasChildren", properties: "InventoryChildRelation", direction: OUT)
+}
+
+type Scenario {
+  id: ID
+}
+
+type InventoryChildRelation @relationshipProperties {
+  order: Int
+}
+----
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE(i:Inventory {id: "i1"})
+ CREATE(i)-[:HasChildren { order: 3 }]->(c1:Scenario { id: "c3"})
+ CREATE(i)-[:HasChildren { order: 1 }]->(c2:Scenario { id: "c1"})
+ CREATE(i)-[:HasChildren { order: 2 }]->(c3:Scenario { id: "c2"})
+
+ CREATE(:Inventory {id: "i2"})
+----
+
+=== should return all elements when ordering by nested connection
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  inventories {
+    id
+    childrenConnection(sort: {edge: {order: ASC}}) {
+      edges {
+        properties {
+          order
+        }
+        node {
+          id
+        }
+      }
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Inventory)
+CALL {
+    WITH this
+    MATCH (this)-[this0:HasChildren]->(this1:Scenario)
+    WITH collect({ node: this1, relationship: this0 }) AS edges
+    WITH edges, size(edges) AS totalCount
+    CALL {
+        WITH edges
+        UNWIND edges AS edge
+        WITH edge.node AS this1, edge.relationship AS this0
+        WITH *
+        ORDER BY this0.order ASC
+        RETURN collect({ properties: { order: this0.order, __typename: "InventoryChildRelation" }, node: { id: this1.id, __typename: "Scenario" } }) AS var2
+    }
+    RETURN { edges: var2, totalCount: totalCount } AS var3
+}
+RETURN this { .id, childrenConnection: var3 } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "inventories": [
+    {
+      "id": "i1",
+      "childrenConnection": {
+        "edges": [
+          {
+            "properties": {
+              "order": 1
+            },
+            "node": {
+              "id": "c1"
+            }
+          },
+          {
+            "properties": {
+              "order": 2
+            },
+            "node": {
+              "id": "c2"
+            }
+          },
+          {
+            "properties": {
+              "order": 3
+            },
+            "node": {
+              "id": "c3"
+            }
+          }
+        ]
+      }
+    },
+    {
+      "id": "i2",
+      "childrenConnection": {
+        "edges": []
+      }
+    }
+  ]
+}
+----
+
+== order-by relationship property on interface node target
+
+=== Setup
+
+.Schema
+[source,graphql,schema=true]
+----
+type Inventory {
+  id: ID
+  children: [Scenario!]! @relationship(type: "HasChildren", properties: "InventoryChildRelation", direction: OUT)
+}
+
+interface Scenario {
+  id: ID
+}
+
+type Image implements Scenario {
+  id: ID
+}
+
+type Video implements Scenario {
+  id: ID
+}
+
+type InventoryChildRelation @relationshipProperties {
+  order: Int
+}
+----
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE(i:Inventory {id: "i1"})
+ CREATE(i)-[:HasChildren { order: 3 }]->(c1:Image { id: "c3"})
+ CREATE(i)-[:HasChildren { order: 1 }]->(c2:Video { id: "c1"})
+ CREATE(i)-[:HasChildren { order: 2 }]->(c3:Video { id: "c2"})
+
+ CREATE(:Inventory {id: "i2"})
+----
+
+=== should return all elements when ordering by nested connection on an interface target
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  inventories {
+    id
+    childrenConnection(sort: {edge: {order: ASC}}) {
+      edges {
+        properties {
+          order
+        }
+        node {
+          id
+        }
+      }
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Inventory)
+CALL {
+    WITH this
+    CALL {
+        WITH this
+        MATCH (this)-[this0:HasChildren]->(this1:Image)
+        WITH { properties: { order: this0.order, __typename: "InventoryChildRelation" }, node: { __typename: "Image", __id: toString(id(this1)), id: this1.id } } AS edge
+        RETURN edge
+        UNION
+        WITH this
+        MATCH (this)-[this2:HasChildren]->(this3:Video)
+        WITH { properties: { order: this2.order, __typename: "InventoryChildRelation" }, node: { __typename: "Video", __id: toString(id(this3)), id: this3.id } } AS edge
+        RETURN edge
+    }
+    WITH collect(edge) AS edges
+    WITH edges, size(edges) AS totalCount
+    CALL {
+        WITH edges
+        UNWIND edges AS edge
+        WITH edge
+        ORDER BY edge.properties.order ASC
+        RETURN collect(edge) AS var4
+    }
+    RETURN { edges: var4, totalCount: totalCount } AS var5
+}
+RETURN this { .id, childrenConnection: var5 } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "inventories": [
+    {
+      "id": "i2",
+      "childrenConnection": {
+        "edges": []
+      }
+    },
+    {
+      "id": "i1",
+      "childrenConnection": {
+        "edges": [
+          {
+            "properties": {
+              "order": 1
+            },
+            "node": {
+              "id": "c1"
+            }
+          },
+          {
+            "properties": {
+              "order": 2
+            },
+            "node": {
+              "id": "c2"
+            }
+          },
+          {
+            "properties": {
+              "order": 3
+            },
+            "node": {
+              "id": "c3"
+            }
+          }
+        ]
+      }
+    }
+  ]
+}
+----
diff --git a/core/src/test/resources/integration-test-files/issues/4667.adoc b/core/src/test/resources/integration-test-files/issues/4667.adoc
index 1af646f0..76385d34 100644
--- a/core/src/test/resources/integration-test-files/issues/4667.adoc
+++ b/core/src/test/resources/integration-test-files/issues/4667.adoc
@@ -29,7 +29,7 @@ type MyStuff {
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   myThings(where: {stuff: null}) {
@@ -44,7 +44,7 @@ type MyStuff {
 .Expected Cypher params
 [source,json]
 ----
-{}
+{ }
 ----
 
 .Expected Cypher output
@@ -72,14 +72,9 @@ RETURN this {
 [source,json,response=true]
 ----
 {
-  "myThings": [
-    {
-      "id": "B",
-      "stuff": null
-    }
-  ]
+  "myThings" : [ {
+    "id" : "B",
+    "stuff" : null
+  } ]
 }
 ----
-
-'''
-
diff --git a/core/src/test/resources/integration-test-files/issues/4667.js.adoc b/core/src/test/resources/integration-test-files/issues/4667.js.adoc
new file mode 100644
index 00000000..7d0d3f05
--- /dev/null
+++ b/core/src/test/resources/integration-test-files/issues/4667.js.adoc
@@ -0,0 +1,78 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= https://github.com/neo4j/graphql/issues/4667
+
+== Setup
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (:MyThing {id: "A"})-[:THE_STUFF]->(b1:MyStuff {id: "C"})
+ CREATE (:MyThing {id: "B"})
+----
+
+== when passed null as an argument of a relationship filter should check that a relationship does not exist
+
+.Schema
+[source,graphql,schema=true]
+----
+type MyThing {
+  id: ID! @id
+  stuff: MyStuff @relationship(type: "THE_STUFF", direction: OUT)
+}
+
+type MyStuff {
+  id: ID! @id
+  thing: MyThing @relationship(type: "THE_STUFF", direction: IN)
+}
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  myThings(where: {stuff: null}) {
+    id
+    stuff {
+      id
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:MyThing)
+WHERE NOT (EXISTS {
+    MATCH (this)-[:THE_STUFF]->(this0:MyStuff)
+})
+CALL {
+    WITH this
+    MATCH (this)-[this1:THE_STUFF]->(this2:MyStuff)
+    WITH this2 { .id } AS this2
+    RETURN head(collect(this2)) AS var3
+}
+RETURN this { .id, stuff: var3 } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "myThings": [
+    {
+      "id": "B",
+      "stuff": null
+    }
+  ]
+}
+----
diff --git a/core/src/test/resources/integration-test-files/issues/5142.adoc b/core/src/test/resources/integration-test-files/issues/5142.adoc
index f4de7c90..ad20c3e8 100644
--- a/core/src/test/resources/integration-test-files/issues/5142.adoc
+++ b/core/src/test/resources/integration-test-files/issues/5142.adoc
@@ -16,7 +16,7 @@ type Query {
 == should allow for a matrix input
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   test(fields: [["first"], ["second"]])
@@ -27,9 +27,6 @@ type Query {
 [source,json,response=true]
 ----
 {
-  "test": "Hello World first,second"
+  "test" : "Hello World first,second"
 }
 ----
-
-'''
-
diff --git a/core/src/test/resources/integration-test-files/issues/5142.js.adoc b/core/src/test/resources/integration-test-files/issues/5142.js.adoc
new file mode 100644
index 00000000..a31f4b75
--- /dev/null
+++ b/core/src/test/resources/integration-test-files/issues/5142.js.adoc
@@ -0,0 +1,33 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= https://github.com/neo4j/graphql/issues/5142
+
+== Setup
+
+.Schema
+[source,graphql,schema=true]
+----
+type Query {
+  test(fields: [[String!]]!): String!
+}
+----
+
+== should allow for a matrix input
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  test(fields: [["first"], ["second"]])
+}
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "test": "Hello World first,second"
+}
+----
diff --git a/core/src/test/resources/integration-test-files/issues/5223-cartesian.adoc b/core/src/test/resources/integration-test-files/issues/5223-cartesian.adoc
index 90479566..e2b643b2 100644
--- a/core/src/test/resources/integration-test-files/issues/5223-cartesian.adoc
+++ b/core/src/test/resources/integration-test-files/issues/5223-cartesian.adoc
@@ -25,7 +25,7 @@ CREATE (:Location { id: "1", pointCoordinates: point({x: -14221.955504767046, y:
 == should not fail when srid is queried
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   locations {
@@ -44,7 +44,7 @@ CREATE (:Location { id: "1", pointCoordinates: point({x: -14221.955504767046, y:
 .Expected Cypher params
 [source,json]
 ----
-{}
+{ }
 ----
 
 .Expected Cypher output
@@ -67,47 +67,41 @@ RETURN this {
 [source,json,response=true,ignore-order]
 ----
 {
-  "locations": [
-    {
-      "id": "1",
-      "pointCoordinates": {
-        "x": -14221.955504767046,
-        "y": 6711533.711877272,
-        "z": null,
-        "crs": "cartesian",
-        "srid": 7203
-      }
-    },
-    {
-      "id": "2",
-      "pointCoordinates": {
-        "x": 1391088.9885668862,
-        "y": 5146427.7652232265,
-        "z": null,
-        "crs": "cartesian",
-        "srid": 7203
-      }
-    },
-    {
-      "id": "3",
-      "pointCoordinates": {
-        "x": 261848.15527273554,
-        "y": 6250566.54904563,
-        "z": 21,
-        "crs": "cartesian-3d",
-        "srid": 9157
-      }
+  "locations" : [ {
+    "id" : "2",
+    "pointCoordinates" : {
+      "x" : 1391088.9885668862,
+      "y" : 5146427.7652232265,
+      "z" : null,
+      "crs" : "cartesian",
+      "srid" : 7203
+    }
+  }, {
+    "id" : "3",
+    "pointCoordinates" : {
+      "x" : 261848.15527273554,
+      "y" : 6250566.54904563,
+      "z" : 21.0,
+      "crs" : "cartesian-3d",
+      "srid" : 9157
+    }
+  }, {
+    "id" : "1",
+    "pointCoordinates" : {
+      "x" : -14221.955504767046,
+      "y" : 6711533.711877272,
+      "z" : null,
+      "crs" : "cartesian",
+      "srid" : 7203
     }
-  ]
+  } ]
 }
 ----
 
-'''
-
 == should not fail when srid is queried, Connection
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   locationsConnection {
@@ -130,7 +124,7 @@ RETURN this {
 .Expected Cypher params
 [source,json]
 ----
-{}
+{ }
 ----
 
 .Expected Cypher output
@@ -169,55 +163,49 @@ RETURN {
 [source,json,response=true,ignore-order]
 ----
 {
-  "locationsConnection": {
-    "edges": [
-      {
-        "node": {
-          "id": "1",
-          "pointCoordinates": {
-            "x": -14221.955504767046,
-            "y": 6711533.711877272,
-            "z": null,
-            "crs": "cartesian",
-            "srid": 7203
-          }
+  "locationsConnection" : {
+    "edges" : [ {
+      "node" : {
+        "id" : "2",
+        "pointCoordinates" : {
+          "x" : 1391088.9885668862,
+          "y" : 5146427.7652232265,
+          "z" : null,
+          "crs" : "cartesian",
+          "srid" : 7203
         }
-      },
-      {
-        "node": {
-          "id": "2",
-          "pointCoordinates": {
-            "x": 1391088.9885668862,
-            "y": 5146427.7652232265,
-            "z": null,
-            "crs": "cartesian",
-            "srid": 7203
-          }
+      }
+    }, {
+      "node" : {
+        "id" : "3",
+        "pointCoordinates" : {
+          "x" : 261848.15527273554,
+          "y" : 6250566.54904563,
+          "z" : 21.0,
+          "crs" : "cartesian-3d",
+          "srid" : 9157
         }
-      },
-      {
-        "node": {
-          "id": "3",
-          "pointCoordinates": {
-            "x": 261848.15527273554,
-            "y": 6250566.54904563,
-            "z": 21,
-            "crs": "cartesian-3d",
-            "srid": 9157
-          }
+      }
+    }, {
+      "node" : {
+        "id" : "1",
+        "pointCoordinates" : {
+          "x" : -14221.955504767046,
+          "y" : 6711533.711877272,
+          "z" : null,
+          "crs" : "cartesian",
+          "srid" : 7203
         }
       }
-    ]
+    } ]
   }
 }
 ----
 
-'''
-
 == should not fail when srid is not queried
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   locations {
@@ -235,7 +223,7 @@ RETURN {
 .Expected Cypher params
 [source,json]
 ----
-{}
+{ }
 ----
 
 .Expected Cypher output
@@ -257,44 +245,38 @@ RETURN this {
 [source,json,response=true,ignore-order]
 ----
 {
-  "locations": [
-    {
-      "id": "1",
-      "pointCoordinates": {
-        "x": -14221.955504767046,
-        "y": 6711533.711877272,
-        "z": null,
-        "crs": "cartesian"
-      }
-    },
-    {
-      "id": "2",
-      "pointCoordinates": {
-        "x": 1391088.9885668862,
-        "y": 5146427.7652232265,
-        "z": null,
-        "crs": "cartesian"
-      }
-    },
-    {
-      "id": "3",
-      "pointCoordinates": {
-        "x": 261848.15527273554,
-        "y": 6250566.54904563,
-        "z": 21,
-        "crs": "cartesian-3d"
-      }
+  "locations" : [ {
+    "id" : "2",
+    "pointCoordinates" : {
+      "x" : 1391088.9885668862,
+      "y" : 5146427.7652232265,
+      "z" : null,
+      "crs" : "cartesian"
+    }
+  }, {
+    "id" : "1",
+    "pointCoordinates" : {
+      "x" : -14221.955504767046,
+      "y" : 6711533.711877272,
+      "z" : null,
+      "crs" : "cartesian"
     }
-  ]
+  }, {
+    "id" : "3",
+    "pointCoordinates" : {
+      "x" : 261848.15527273554,
+      "y" : 6250566.54904563,
+      "z" : 21.0,
+      "crs" : "cartesian-3d"
+    }
+  } ]
 }
 ----
 
-'''
-
 == should not fail when srid is not queried, Connection
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   locationsConnection {
@@ -316,7 +298,7 @@ RETURN this {
 .Expected Cypher params
 [source,json]
 ----
-{}
+{ }
 ----
 
 .Expected Cypher output
@@ -354,45 +336,38 @@ RETURN {
 [source,json,response=true,ignore-order]
 ----
 {
-  "locationsConnection": {
-    "edges": [
-      {
-        "node": {
-          "id": "1",
-          "pointCoordinates": {
-            "x": -14221.955504767046,
-            "y": 6711533.711877272,
-            "z": null,
-            "crs": "cartesian"
-          }
+  "locationsConnection" : {
+    "edges" : [ {
+      "node" : {
+        "id" : "1",
+        "pointCoordinates" : {
+          "x" : -14221.955504767046,
+          "y" : 6711533.711877272,
+          "z" : null,
+          "crs" : "cartesian"
         }
-      },
-      {
-        "node": {
-          "id": "2",
-          "pointCoordinates": {
-            "x": 1391088.9885668862,
-            "y": 5146427.7652232265,
-            "z": null,
-            "crs": "cartesian"
-          }
+      }
+    }, {
+      "node" : {
+        "id" : "2",
+        "pointCoordinates" : {
+          "x" : 1391088.9885668862,
+          "y" : 5146427.7652232265,
+          "z" : null,
+          "crs" : "cartesian"
         }
-      },
-      {
-        "node": {
-          "id": "3",
-          "pointCoordinates": {
-            "x": 261848.15527273554,
-            "y": 6250566.54904563,
-            "z": 21,
-            "crs": "cartesian-3d"
-          }
+      }
+    }, {
+      "node" : {
+        "id" : "3",
+        "pointCoordinates" : {
+          "x" : 261848.15527273554,
+          "y" : 6250566.54904563,
+          "z" : 21.0,
+          "crs" : "cartesian-3d"
         }
       }
-    ]
+    } ]
   }
 }
 ----
-
-'''
-
diff --git a/core/src/test/resources/integration-test-files/issues/5223-cartesian.js.adoc b/core/src/test/resources/integration-test-files/issues/5223-cartesian.js.adoc
new file mode 100644
index 00000000..307d3696
--- /dev/null
+++ b/core/src/test/resources/integration-test-files/issues/5223-cartesian.js.adoc
@@ -0,0 +1,352 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= https://github.com/neo4j/graphql/issues/5223, Cartesian
+
+== Setup
+
+.Schema
+[source,graphql,schema=true]
+----
+type Location @node {
+  id: ID!
+  pointCoordinates: CartesianPoint!
+}
+----
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (:Location { id: "1", pointCoordinates: point({x: -14221.955504767046, y: 6711533.711877272})})
+ CREATE (:Location { id: "2", pointCoordinates: point({x: 1391088.9885668862, y: 5146427.7652232265})})
+ CREATE (:Location { id: "3", pointCoordinates: point({x: 261848.15527273554, y: 6250566.54904563, z: 21})})
+----
+
+== should not fail when srid is queried
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  locations {
+    id
+    pointCoordinates {
+      x
+      y
+      z
+      crs
+      srid
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Location)
+RETURN this { .id, pointCoordinates: CASE
+    WHEN this.pointCoordinates IS NOT NULL THEN { point: this.pointCoordinates, crs: this.pointCoordinates.crs }
+    ELSE NULL
+END } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "locations": [
+    {
+      "id": "1",
+      "pointCoordinates": {
+        "x": -14221.955504767046,
+        "y": 6711533.711877272,
+        "z": null,
+        "crs": "cartesian",
+        "srid": 7203
+      }
+    },
+    {
+      "id": "2",
+      "pointCoordinates": {
+        "x": 1391088.9885668862,
+        "y": 5146427.7652232265,
+        "z": null,
+        "crs": "cartesian",
+        "srid": 7203
+      }
+    },
+    {
+      "id": "3",
+      "pointCoordinates": {
+        "x": 261848.15527273554,
+        "y": 6250566.54904563,
+        "z": 21,
+        "crs": "cartesian-3d",
+        "srid": 9157
+      }
+    }
+  ]
+}
+----
+
+== should not fail when srid is queried, Connection
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  locationsConnection {
+    edges {
+      node {
+        id
+        pointCoordinates {
+          x
+          y
+          z
+          crs
+          srid
+        }
+      }
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this0:Location)
+WITH collect({ node: this0 }) AS edges
+WITH edges, size(edges) AS totalCount
+CALL {
+    WITH edges
+    UNWIND edges AS edge
+    WITH edge.node AS this0
+    RETURN collect({ node: { id: this0.id, pointCoordinates: CASE
+        WHEN this0.pointCoordinates IS NOT NULL THEN { point: this0.pointCoordinates, crs: this0.pointCoordinates.crs }
+        ELSE NULL
+    END, __typename: "Location" } }) AS var1
+}
+RETURN { edges: var1, totalCount: totalCount } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "locationsConnection": {
+    "edges": [
+      {
+        "node": {
+          "id": "1",
+          "pointCoordinates": {
+            "x": -14221.955504767046,
+            "y": 6711533.711877272,
+            "z": null,
+            "crs": "cartesian",
+            "srid": 7203
+          }
+        }
+      },
+      {
+        "node": {
+          "id": "2",
+          "pointCoordinates": {
+            "x": 1391088.9885668862,
+            "y": 5146427.7652232265,
+            "z": null,
+            "crs": "cartesian",
+            "srid": 7203
+          }
+        }
+      },
+      {
+        "node": {
+          "id": "3",
+          "pointCoordinates": {
+            "x": 261848.15527273554,
+            "y": 6250566.54904563,
+            "z": 21,
+            "crs": "cartesian-3d",
+            "srid": 9157
+          }
+        }
+      }
+    ]
+  }
+}
+----
+
+== should not fail when srid is not queried
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  locations {
+    id
+    pointCoordinates {
+      x
+      y
+      z
+      crs
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Location)
+RETURN this { .id, pointCoordinates: CASE
+    WHEN this.pointCoordinates IS NOT NULL THEN { point: this.pointCoordinates, crs: this.pointCoordinates.crs }
+    ELSE NULL
+END } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "locations": [
+    {
+      "id": "1",
+      "pointCoordinates": {
+        "x": -14221.955504767046,
+        "y": 6711533.711877272,
+        "z": null,
+        "crs": "cartesian"
+      }
+    },
+    {
+      "id": "2",
+      "pointCoordinates": {
+        "x": 1391088.9885668862,
+        "y": 5146427.7652232265,
+        "z": null,
+        "crs": "cartesian"
+      }
+    },
+    {
+      "id": "3",
+      "pointCoordinates": {
+        "x": 261848.15527273554,
+        "y": 6250566.54904563,
+        "z": 21,
+        "crs": "cartesian-3d"
+      }
+    }
+  ]
+}
+----
+
+== should not fail when srid is not queried, Connection
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  locationsConnection {
+    edges {
+      node {
+        id
+        pointCoordinates {
+          x
+          y
+          z
+          crs
+        }
+      }
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this0:Location)
+WITH collect({ node: this0 }) AS edges
+WITH edges, size(edges) AS totalCount
+CALL {
+    WITH edges
+    UNWIND edges AS edge
+    WITH edge.node AS this0
+    RETURN collect({ node: { id: this0.id, pointCoordinates: CASE
+        WHEN this0.pointCoordinates IS NOT NULL THEN { point: this0.pointCoordinates, crs: this0.pointCoordinates.crs }
+        ELSE NULL
+    END, __typename: "Location" } }) AS var1
+}
+RETURN { edges: var1, totalCount: totalCount } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "locationsConnection": {
+    "edges": [
+      {
+        "node": {
+          "id": "1",
+          "pointCoordinates": {
+            "x": -14221.955504767046,
+            "y": 6711533.711877272,
+            "z": null,
+            "crs": "cartesian"
+          }
+        }
+      },
+      {
+        "node": {
+          "id": "3",
+          "pointCoordinates": {
+            "x": 261848.15527273554,
+            "y": 6250566.54904563,
+            "z": 21,
+            "crs": "cartesian-3d"
+          }
+        }
+      },
+      {
+        "node": {
+          "id": "2",
+          "pointCoordinates": {
+            "x": 1391088.9885668862,
+            "y": 5146427.7652232265,
+            "z": null,
+            "crs": "cartesian"
+          }
+        }
+      }
+    ]
+  }
+}
+----
diff --git a/core/src/test/resources/integration-test-files/issues/5223-point.adoc b/core/src/test/resources/integration-test-files/issues/5223-point.adoc
index 7ee8829a..7b2dc595 100644
--- a/core/src/test/resources/integration-test-files/issues/5223-point.adoc
+++ b/core/src/test/resources/integration-test-files/issues/5223-point.adoc
@@ -25,7 +25,7 @@ CREATE (:Location { id: "1", pointCoordinates: point({longitude: -0.127758, lati
 == should not fail when srid is queried
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   locations {
@@ -44,7 +44,7 @@ CREATE (:Location { id: "1", pointCoordinates: point({longitude: -0.127758, lati
 .Expected Cypher params
 [source,json]
 ----
-{}
+{ }
 ----
 
 .Expected Cypher output
@@ -67,47 +67,41 @@ RETURN this {
 [source,json,response=true,ignore-order]
 ----
 {
-  "locations": [
-    {
-      "id": "1",
-      "pointCoordinates": {
-        "latitude": 51.507351,
-        "longitude": -0.127758,
-        "height": null,
-        "crs": "wgs-84",
-        "srid": 4326
-      }
-    },
-    {
-      "id": "2",
-      "pointCoordinates": {
-        "latitude": 41.902782,
-        "longitude": 12.496365,
-        "height": null,
-        "crs": "wgs-84",
-        "srid": 4326
-      }
-    },
-    {
-      "id": "3",
-      "pointCoordinates": {
-        "latitude": 48.856613,
-        "longitude": 2.352222,
-        "height": 21,
-        "crs": "wgs-84-3d",
-        "srid": 4979
-      }
+  "locations" : [ {
+    "id" : "1",
+    "pointCoordinates" : {
+      "latitude" : 51.507351,
+      "longitude" : -0.127758,
+      "height" : null,
+      "crs" : "wgs-84",
+      "srid" : 4326
+    }
+  }, {
+    "id" : "2",
+    "pointCoordinates" : {
+      "latitude" : 41.902782,
+      "longitude" : 12.496365,
+      "height" : null,
+      "crs" : "wgs-84",
+      "srid" : 4326
+    }
+  }, {
+    "id" : "3",
+    "pointCoordinates" : {
+      "latitude" : 48.856613,
+      "longitude" : 2.352222,
+      "height" : 21.0,
+      "crs" : "wgs-84-3d",
+      "srid" : 4979
     }
-  ]
+  } ]
 }
 ----
 
-'''
-
 == should not fail when srid is queried, Connection
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   locationsConnection {
@@ -130,7 +124,7 @@ RETURN this {
 .Expected Cypher params
 [source,json]
 ----
-{}
+{ }
 ----
 
 .Expected Cypher output
@@ -169,55 +163,49 @@ RETURN {
 [source,json,response=true,ignore-order]
 ----
 {
-  "locationsConnection": {
-    "edges": [
-      {
-        "node": {
-          "id": "1",
-          "pointCoordinates": {
-            "latitude": 51.507351,
-            "longitude": -0.127758,
-            "height": null,
-            "crs": "wgs-84",
-            "srid": 4326
-          }
+  "locationsConnection" : {
+    "edges" : [ {
+      "node" : {
+        "id" : "1",
+        "pointCoordinates" : {
+          "latitude" : 51.507351,
+          "longitude" : -0.127758,
+          "height" : null,
+          "crs" : "wgs-84",
+          "srid" : 4326
         }
-      },
-      {
-        "node": {
-          "id": "2",
-          "pointCoordinates": {
-            "latitude": 41.902782,
-            "longitude": 12.496365,
-            "height": null,
-            "crs": "wgs-84",
-            "srid": 4326
-          }
+      }
+    }, {
+      "node" : {
+        "id" : "2",
+        "pointCoordinates" : {
+          "latitude" : 41.902782,
+          "longitude" : 12.496365,
+          "height" : null,
+          "crs" : "wgs-84",
+          "srid" : 4326
         }
-      },
-      {
-        "node": {
-          "id": "3",
-          "pointCoordinates": {
-            "latitude": 48.856613,
-            "longitude": 2.352222,
-            "height": 21,
-            "crs": "wgs-84-3d",
-            "srid": 4979
-          }
+      }
+    }, {
+      "node" : {
+        "id" : "3",
+        "pointCoordinates" : {
+          "latitude" : 48.856613,
+          "longitude" : 2.352222,
+          "height" : 21.0,
+          "crs" : "wgs-84-3d",
+          "srid" : 4979
         }
       }
-    ]
+    } ]
   }
 }
 ----
 
-'''
-
 == should not fail when srid is not queried
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   locations {
@@ -235,7 +223,7 @@ RETURN {
 .Expected Cypher params
 [source,json]
 ----
-{}
+{ }
 ----
 
 .Expected Cypher output
@@ -257,44 +245,38 @@ RETURN this {
 [source,json,response=true,ignore-order]
 ----
 {
-  "locations": [
-    {
-      "id": "1",
-      "pointCoordinates": {
-        "latitude": 51.507351,
-        "longitude": -0.127758,
-        "height": null,
-        "crs": "wgs-84"
-      }
-    },
-    {
-      "id": "2",
-      "pointCoordinates": {
-        "latitude": 41.902782,
-        "longitude": 12.496365,
-        "height": null,
-        "crs": "wgs-84"
-      }
-    },
-    {
-      "id": "3",
-      "pointCoordinates": {
-        "latitude": 48.856613,
-        "longitude": 2.352222,
-        "height": 21,
-        "crs": "wgs-84-3d"
-      }
+  "locations" : [ {
+    "id" : "1",
+    "pointCoordinates" : {
+      "latitude" : 51.507351,
+      "longitude" : -0.127758,
+      "height" : null,
+      "crs" : "wgs-84"
     }
-  ]
+  }, {
+    "id" : "2",
+    "pointCoordinates" : {
+      "latitude" : 41.902782,
+      "longitude" : 12.496365,
+      "height" : null,
+      "crs" : "wgs-84"
+    }
+  }, {
+    "id" : "3",
+    "pointCoordinates" : {
+      "latitude" : 48.856613,
+      "longitude" : 2.352222,
+      "height" : 21.0,
+      "crs" : "wgs-84-3d"
+    }
+  } ]
 }
 ----
 
-'''
-
 == should not fail when srid is not queried, Connection
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   locationsConnection {
@@ -316,7 +298,7 @@ RETURN this {
 .Expected Cypher params
 [source,json]
 ----
-{}
+{ }
 ----
 
 .Expected Cypher output
@@ -389,6 +371,3 @@ RETURN {
   }
 }
 ----
-
-'''
-
diff --git a/core/src/test/resources/integration-test-files/issues/5223-point.js.adoc b/core/src/test/resources/integration-test-files/issues/5223-point.js.adoc
new file mode 100644
index 00000000..47850e94
--- /dev/null
+++ b/core/src/test/resources/integration-test-files/issues/5223-point.js.adoc
@@ -0,0 +1,352 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= https://github.com/neo4j/graphql/issues/5223, Point
+
+== Setup
+
+.Schema
+[source,graphql,schema=true]
+----
+type Location @node {
+  id: ID!
+  pointCoordinates: Point!
+}
+----
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (:Location { id: "1", pointCoordinates: point({longitude: -0.127758, latitude: 51.507351})})
+ CREATE (:Location { id: "2", pointCoordinates: point({longitude: 12.496365, latitude: 41.902782})})
+ CREATE (:Location { id: "3", pointCoordinates: point({longitude: 2.352222, latitude: 48.856613, height: 21})})
+----
+
+== should not fail when srid is queried
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  locations {
+    id
+    pointCoordinates {
+      latitude
+      longitude
+      height
+      crs
+      srid
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Location)
+RETURN this { .id, pointCoordinates: CASE
+    WHEN this.pointCoordinates IS NOT NULL THEN { point: this.pointCoordinates, crs: this.pointCoordinates.crs }
+    ELSE NULL
+END } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "locations": [
+    {
+      "id": "1",
+      "pointCoordinates": {
+        "latitude": 51.507351,
+        "longitude": -0.127758,
+        "height": null,
+        "crs": "wgs-84",
+        "srid": 4326
+      }
+    },
+    {
+      "id": "2",
+      "pointCoordinates": {
+        "latitude": 41.902782,
+        "longitude": 12.496365,
+        "height": null,
+        "crs": "wgs-84",
+        "srid": 4326
+      }
+    },
+    {
+      "id": "3",
+      "pointCoordinates": {
+        "latitude": 48.856613,
+        "longitude": 2.352222,
+        "height": 21,
+        "crs": "wgs-84-3d",
+        "srid": 4979
+      }
+    }
+  ]
+}
+----
+
+== should not fail when srid is queried, Connection
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  locationsConnection {
+    edges {
+      node {
+        id
+        pointCoordinates {
+          latitude
+          longitude
+          height
+          crs
+          srid
+        }
+      }
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this0:Location)
+WITH collect({ node: this0 }) AS edges
+WITH edges, size(edges) AS totalCount
+CALL {
+    WITH edges
+    UNWIND edges AS edge
+    WITH edge.node AS this0
+    RETURN collect({ node: { id: this0.id, pointCoordinates: CASE
+        WHEN this0.pointCoordinates IS NOT NULL THEN { point: this0.pointCoordinates, crs: this0.pointCoordinates.crs }
+        ELSE NULL
+    END, __typename: "Location" } }) AS var1
+}
+RETURN { edges: var1, totalCount: totalCount } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "locationsConnection": {
+    "edges": [
+      {
+        "node": {
+          "id": "1",
+          "pointCoordinates": {
+            "latitude": 51.507351,
+            "longitude": -0.127758,
+            "height": null,
+            "crs": "wgs-84",
+            "srid": 4326
+          }
+        }
+      },
+      {
+        "node": {
+          "id": "2",
+          "pointCoordinates": {
+            "latitude": 41.902782,
+            "longitude": 12.496365,
+            "height": null,
+            "crs": "wgs-84",
+            "srid": 4326
+          }
+        }
+      },
+      {
+        "node": {
+          "id": "3",
+          "pointCoordinates": {
+            "latitude": 48.856613,
+            "longitude": 2.352222,
+            "height": 21,
+            "crs": "wgs-84-3d",
+            "srid": 4979
+          }
+        }
+      }
+    ]
+  }
+}
+----
+
+== should not fail when srid is not queried
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  locations {
+    id
+    pointCoordinates {
+      latitude
+      longitude
+      height
+      crs
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Location)
+RETURN this { .id, pointCoordinates: CASE
+    WHEN this.pointCoordinates IS NOT NULL THEN { point: this.pointCoordinates, crs: this.pointCoordinates.crs }
+    ELSE NULL
+END } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "locations": [
+    {
+      "id": "1",
+      "pointCoordinates": {
+        "latitude": 51.507351,
+        "longitude": -0.127758,
+        "height": null,
+        "crs": "wgs-84"
+      }
+    },
+    {
+      "id": "2",
+      "pointCoordinates": {
+        "latitude": 41.902782,
+        "longitude": 12.496365,
+        "height": null,
+        "crs": "wgs-84"
+      }
+    },
+    {
+      "id": "3",
+      "pointCoordinates": {
+        "latitude": 48.856613,
+        "longitude": 2.352222,
+        "height": 21,
+        "crs": "wgs-84-3d"
+      }
+    }
+  ]
+}
+----
+
+== should not fail when srid is not queried, Connection
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  locationsConnection {
+    edges {
+      node {
+        id
+        pointCoordinates {
+          latitude
+          longitude
+          height
+          crs
+        }
+      }
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this0:Location)
+WITH collect({ node: this0 }) AS edges
+WITH edges, size(edges) AS totalCount
+CALL {
+    WITH edges
+    UNWIND edges AS edge
+    WITH edge.node AS this0
+    RETURN collect({ node: { id: this0.id, pointCoordinates: CASE
+        WHEN this0.pointCoordinates IS NOT NULL THEN { point: this0.pointCoordinates, crs: this0.pointCoordinates.crs }
+        ELSE NULL
+    END, __typename: "Location" } }) AS var1
+}
+RETURN { edges: var1, totalCount: totalCount } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "locationsConnection": {
+    "edges": [
+      {
+        "node": {
+          "id": "3",
+          "pointCoordinates": {
+            "latitude": 48.856613,
+            "longitude": 2.352222,
+            "height": 21,
+            "crs": "wgs-84-3d"
+          }
+        }
+      },
+      {
+        "node": {
+          "id": "1",
+          "pointCoordinates": {
+            "latitude": 51.507351,
+            "longitude": -0.127758,
+            "height": null,
+            "crs": "wgs-84"
+          }
+        }
+      },
+      {
+        "node": {
+          "id": "2",
+          "pointCoordinates": {
+            "latitude": 41.902782,
+            "longitude": 12.496365,
+            "height": null,
+            "crs": "wgs-84"
+          }
+        }
+      }
+    ]
+  }
+}
+----
diff --git a/core/src/test/resources/integration-test-files/issues/560.adoc b/core/src/test/resources/integration-test-files/issues/560.adoc
index 90c7ce8a..ac024885 100644
--- a/core/src/test/resources/integration-test-files/issues/560.adoc
+++ b/core/src/test/resources/integration-test-files/issues/560.adoc
@@ -21,7 +21,7 @@ CREATE (j:Log { id: "RandomString1" })
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   logs {
@@ -40,7 +40,7 @@ CREATE (j:Log { id: "RandomString1" })
 .Expected Cypher params
 [source,json]
 ----
-{}
+{ }
 ----
 
 .Expected Cypher output
@@ -63,17 +63,13 @@ RETURN this {
 [source,json,response=true]
 ----
 {
-  "logs": [
-    {
-      "id": "RandomString1",
-      "location": null
-    }
-  ]
+  "logs" : [ {
+    "id" : "RandomString1",
+    "location" : null
+  } ]
 }
 ----
 
-'''
-
 == should not throw when CartesianPoint is null
 
 .Schema
@@ -92,7 +88,7 @@ CREATE (j:Log { id: "RandomString1" })
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   logs {
@@ -111,7 +107,7 @@ CREATE (j:Log { id: "RandomString1" })
 .Expected Cypher params
 [source,json]
 ----
-{}
+{ }
 ----
 
 .Expected Cypher output
@@ -134,14 +130,9 @@ RETURN this {
 [source,json,response=true]
 ----
 {
-  "logs": [
-    {
-      "id": "RandomString1",
-      "location": null
-    }
-  ]
+  "logs" : [ {
+    "id" : "RandomString1",
+    "location" : null
+  } ]
 }
 ----
-
-'''
-
diff --git a/core/src/test/resources/integration-test-files/issues/560.js.adoc b/core/src/test/resources/integration-test-files/issues/560.js.adoc
new file mode 100644
index 00000000..20f27a94
--- /dev/null
+++ b/core/src/test/resources/integration-test-files/issues/560.js.adoc
@@ -0,0 +1,131 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= https://github.com/neo4j/graphql/issues/560
+
+== should not throw when Point is null
+
+.Schema
+[source,graphql,schema=true]
+----
+type Log {
+  id: ID!
+  location: Point
+}
+----
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (j:Log { id: "RandomString1" })
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  logs {
+    id
+    location {
+      longitude
+      latitude
+      height
+      crs
+      srid
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Log)
+RETURN this { .id, location: CASE
+    WHEN this.location IS NOT NULL THEN { point: this.location, crs: this.location.crs }
+    ELSE NULL
+END } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "logs": [
+    {
+      "id": "RandomString1",
+      "location": null
+    }
+  ]
+}
+----
+
+== should not throw when CartesianPoint is null
+
+.Schema
+[source,graphql,schema=true]
+----
+type Log {
+  id: ID!
+  location: CartesianPoint
+}
+----
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (j:Log { id: "RandomString1" })
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  logs {
+    id
+    location {
+      x
+      y
+      z
+      crs
+      srid
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Log)
+RETURN this { .id, location: CASE
+    WHEN this.location IS NOT NULL THEN { point: this.location, crs: this.location.crs }
+    ELSE NULL
+END } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "logs": [
+    {
+      "id": "RandomString1",
+      "location": null
+    }
+  ]
+}
+----
diff --git a/core/src/test/resources/integration-test-files/issues/583.adoc b/core/src/test/resources/integration-test-files/issues/583.adoc
index 20b12d70..4f924a4b 100644
--- a/core/src/test/resources/integration-test-files/issues/583.adoc
+++ b/core/src/test/resources/integration-test-files/issues/583.adoc
@@ -54,7 +54,7 @@ CREATE (actor:Actor:Test)
 == should project all interfaces of node
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query ($actorId: ID!) {
   actors(where: {id: $actorId}) {
@@ -74,7 +74,7 @@ query ($actorId: ID!) {
 [source,json,request=true]
 ----
 {
-  "actorId": "RandomString1"
+  "actorId" : "RandomString1"
 }
 ----
 
@@ -82,7 +82,7 @@ query ($actorId: ID!) {
 [source,json]
 ----
 {
-  "param0": "RandomString1"
+  "param0" : "RandomString1"
 }
 ----
 
@@ -135,27 +135,18 @@ RETURN this {
 [source,json,response=true,ignore-order]
 ----
 {
-  "actors": [
-    {
-      "id": "RandomString1",
-      "name": "aaa",
-      "actedIn": [
-        {
-          "title": "doctor things",
-          "awardsGiven": 42
-        },
-        {
-          "title": "stranger who",
-          "awardsGiven": 2
-        },
-        {
-          "title": "all too well"
-        }
-      ]
-    }
-  ]
+  "actors" : [ {
+    "id" : "RandomString1",
+    "name" : "aaa",
+    "actedIn" : [ {
+      "title" : "doctor things",
+      "awardsGiven" : 42
+    }, {
+      "title" : "stranger who",
+      "awardsGiven" : 2
+    }, {
+      "title" : "all too well"
+    } ]
+  } ]
 }
 ----
-
-'''
-
diff --git a/core/src/test/resources/integration-test-files/issues/583.js.adoc b/core/src/test/resources/integration-test-files/issues/583.js.adoc
new file mode 100644
index 00000000..b69d8f6c
--- /dev/null
+++ b/core/src/test/resources/integration-test-files/issues/583.js.adoc
@@ -0,0 +1,143 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= https://github.com/neo4j/graphql/issues/583
+
+== Setup
+
+.Schema
+[source,graphql,schema=true]
+----
+interface Show {
+  title: String
+}
+
+interface Awardable {
+  awardsGiven: Int!
+}
+
+type Actor implements Awardable {
+  id: ID!
+  name: String
+  awardsGiven: Int!
+  actedIn: [Show!]! @relationship(type: "ACTED_IN", direction: OUT)
+}
+
+type Movie implements Show & Awardable {
+  title: String
+  awardsGiven: Int!
+}
+
+type Series implements Show & Awardable {
+  title: String
+  awardsGiven: Int!
+}
+
+type ShortFilm implements Show {
+  title: String
+}
+----
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (actor:Actor:Test)
+ SET actor = {id: "RandomString1", name: "aaa", awardsGiven: 0}
+ CREATE (actor)-[:ACTED_IN]->(series:Series:Test)
+ SET series = {title: "stranger who", awardsGiven: 2}
+ CREATE (actor)-[:ACTED_IN]->(movie:Movie:Test)
+ SET movie = {title: "doctor things", awardsGiven: 42}
+ CREATE (actor)-[:ACTED_IN]->(shortFilm:ShortFilm:Test)
+ SET shortFilm = {title: "all too well"}
+----
+
+== should project all interfaces of node
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+query ($actorId: ID!) {
+  actors(where: {id: $actorId}) {
+    id
+    name
+    actedIn {
+      title
+      ... on Awardable {
+        awardsGiven
+      }
+    }
+  }
+}
+----
+
+.GraphQL params input
+[source,json,request=true]
+----
+{
+  "actorId": "RandomString1"
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "RandomString1"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Actor)
+WHERE this.id = $param0
+CALL {
+    WITH this
+    CALL {
+        WITH *
+        MATCH (this)-[this0:ACTED_IN]->(this1:Movie)
+        WITH this1 { .title, .awardsGiven, __typename: "Movie", __id: toString(id(this1)) } AS this1
+        RETURN this1 AS var2
+        UNION
+        WITH *
+        MATCH (this)-[this3:ACTED_IN]->(this4:Series)
+        WITH this4 { .title, .awardsGiven, __typename: "Series", __id: toString(id(this4)) } AS this4
+        RETURN this4 AS var2
+        UNION
+        WITH *
+        MATCH (this)-[this5:ACTED_IN]->(this6:ShortFilm)
+        WITH this6 { .title, __typename: "ShortFilm", __id: toString(id(this6)) } AS this6
+        RETURN this6 AS var2
+    }
+    WITH var2
+    RETURN collect(var2) AS var2
+}
+RETURN this { .id, .name, actedIn: var2 } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "actors": [
+    {
+      "id": "RandomString1",
+      "name": "aaa",
+      "actedIn": [
+        {
+          "title": "doctor things",
+          "awardsGiven": 42
+        },
+        {
+          "title": "stranger who",
+          "awardsGiven": 2
+        },
+        {
+          "title": "all too well"
+        }
+      ]
+    }
+  ]
+}
+----
diff --git a/core/src/test/resources/integration-test-files/issues/620.adoc b/core/src/test/resources/integration-test-files/issues/620.adoc
index 4f5682c0..24664fe7 100644
--- a/core/src/test/resources/integration-test-files/issues/620.adoc
+++ b/core/src/test/resources/integration-test-files/issues/620.adoc
@@ -29,7 +29,7 @@ CREATE (u:User {id: "1234", name: "arthur"})
 == should return topic count
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   users(where: {id: "1234"}) {
@@ -43,43 +43,17 @@ CREATE (u:User {id: "1234", name: "arthur"})
 }
 ----
 
-.Expected Cypher params
-[source,json]
-----
-{
-  "param0": "1234"
-}
-----
-
-.Expected Cypher output
-[source,cypher]
-----
-MATCH (this:User)
-WHERE this.id = $param0
-RETURN this {
-	.id,
-	.name
-} AS this
-----
-
 .GraphQL-Response
 [source,json,response=true]
 ----
 {
-  "users": [
-    {
-      "id": "1234",
-      "name": "arthur"
-    }
-  ],
-  "businesses": [
-    {
-      "id": "1234",
-      "name": "ford"
-    }
-  ]
+  "businesses" : [ {
+    "id" : "1234",
+    "name" : "ford"
+  } ],
+  "users" : [ {
+    "id" : "1234",
+    "name" : "arthur"
+  } ]
 }
 ----
-
-'''
-
diff --git a/core/src/test/resources/integration-test-files/issues/620.js.adoc b/core/src/test/resources/integration-test-files/issues/620.js.adoc
new file mode 100644
index 00000000..08c5557e
--- /dev/null
+++ b/core/src/test/resources/integration-test-files/issues/620.js.adoc
@@ -0,0 +1,80 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= https://github.com/neo4j/graphql/issues/620
+
+== Setup
+
+.Schema
+[source,graphql,schema=true]
+----
+type User {
+  id: String
+  name: String
+}
+
+type Business {
+  id: String
+  name: String
+}
+----
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (u:User {id: "1234", name: "arthur"})
+ CREATE (b:Business {id: "1234", name: "ford"})
+----
+
+== should return topic count
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  users(where: {id: "1234"}) {
+    id
+    name
+  }
+  businesses(where: {id: "1234"}) {
+    id
+    name
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "1234"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:User)
+WHERE this.id = $param0
+RETURN this { .id, .name } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "users": [
+    {
+      "id": "1234",
+      "name": "arthur"
+    }
+  ],
+  "businesses": [
+    {
+      "id": "1234",
+      "name": "ford"
+    }
+  ]
+}
+----
diff --git a/core/src/test/resources/integration-test-files/issues/date-in-edge.adoc b/core/src/test/resources/integration-test-files/issues/date-in-edge.adoc
index edbb1812..f57e568a 100644
--- a/core/src/test/resources/integration-test-files/issues/date-in-edge.adoc
+++ b/core/src/test/resources/integration-test-files/issues/date-in-edge.adoc
@@ -36,7 +36,7 @@ CREATE (genre:Genre { id: "RandomString1" })
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   genres(where: {id: "RandomString1"}) {
@@ -57,7 +57,7 @@ CREATE (genre:Genre { id: "RandomString1" })
 [source,json]
 ----
 {
-  "param0": "RandomString1"
+  "param0" : "RandomString1"
 }
 ----
 
@@ -107,13 +107,8 @@ RETURN this {
 [source,json,response=true]
 ----
 {
-  "genres": [
-    {
-      "movies": []
-    }
-  ]
+  "genres" : [ {
+    "movies" : [ ]
+  } ]
 }
 ----
-
-'''
-
diff --git a/core/src/test/resources/integration-test-files/issues/date-in-edge.js.adoc b/core/src/test/resources/integration-test-files/issues/date-in-edge.js.adoc
new file mode 100644
index 00000000..2e336a78
--- /dev/null
+++ b/core/src/test/resources/integration-test-files/issues/date-in-edge.js.adoc
@@ -0,0 +1,102 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= 587: Dates in edges can cause wrongly generated cypher
+
+== should not throw when returning a date in an edge
+
+.Schema
+[source,graphql,schema=true]
+----
+type Genre {
+  id: ID!
+  movies: [Movie!]! @relationship(type: "MOVIE", direction: OUT)
+}
+
+type Movie {
+  title: String!
+  actors: [Actor!]! @relationship(type: "ACTOR", direction: OUT)
+}
+
+type Actor {
+  name: String!
+  birthday: DateTime!
+  movie: Movie! @relationship(type: "ACTOR", direction: IN)
+}
+----
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (genre:Genre { id: "RandomString1" })
+ CREATE (movie:Movie { title: "RandomString2" })
+ CREATE (actor:Actor { name: "RandomString3", birthday: datetime("2021-11-16T10:53:20.200000000Z")})
+ CREATE (genre)-[:Movie]->(movie)-[:Actor { role: "Name" }]->(actor)
+ RETURN actor
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  genres(where: {id: "RandomString1"}) {
+    movies {
+      actorsConnection {
+        edges {
+          node {
+            birthday
+          }
+        }
+      }
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "RandomString1"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Genre)
+WHERE this.id = $param0
+CALL {
+    WITH this
+    MATCH (this)-[this0:MOVIE]->(this1:Movie)
+    CALL {
+        WITH this1
+        MATCH (this1)-[this2:ACTOR]->(this3:Actor)
+        WITH collect({ node: this3, relationship: this2 }) AS edges
+        WITH edges, size(edges) AS totalCount
+        CALL {
+            WITH edges
+            UNWIND edges AS edge
+            WITH edge.node AS this3, edge.relationship AS this2
+            RETURN collect({ node: { birthday: apoc.date.convertFormat(toString(this3.birthday), "iso_zoned_date_time", "iso_offset_date_time"), __typename: "Actor" } }) AS var4
+        }
+        RETURN { edges: var4, totalCount: totalCount } AS var5
+    }
+    WITH this1 { actorsConnection: var5 } AS this1
+    RETURN collect(this1) AS var6
+}
+RETURN this { movies: var6 } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "genres": [
+    {
+      "movies": []
+    }
+  ]
+}
+----
diff --git a/core/src/test/resources/integration-test-files/relationship-properties/read.adoc b/core/src/test/resources/integration-test-files/relationship-properties/read.adoc
index 6b9034c0..22137f05 100644
--- a/core/src/test/resources/integration-test-files/relationship-properties/read.adoc
+++ b/core/src/test/resources/integration-test-files/relationship-properties/read.adoc
@@ -34,7 +34,7 @@ CREATE (:Actor { name: 'aRandomString2' })-[:ACTED_IN { screenTime: 105 }]->(m:M
 == Projecting node and relationship properties with no arguments
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies(where: {title: "RandomString1"}) {
@@ -61,7 +61,7 @@ CREATE (:Actor { name: 'aRandomString2' })-[:ACTED_IN { screenTime: 105 }]->(m:M
 [source,json]
 ----
 {
-  "param0": "RandomString1"
+  "param0" : "RandomString1"
 }
 ----
 
@@ -108,45 +108,36 @@ RETURN this {
 [source,json,response=true,ignore-order]
 ----
 {
-  "movies": [
-    {
-      "title": "RandomString1",
-      "actorsConnection": {
-        "totalCount": 3,
-        "edges": [
-          {
-            "properties": {
-              "screenTime": 105
-            },
-            "node": {
-              "name": "aRandomString2"
-            }
-          },
-          {
-            "properties": {
-              "screenTime": 105
-            },
-            "node": {
-              "name": "bRandomString3"
-            }
-          },
-          {
-            "properties": {
-              "screenTime": 5
-            },
-            "node": {
-              "name": "cRandomString4"
-            }
-          }
-        ],
-        "pageInfo": {
-          "hasNextPage": false
+  "movies" : [ {
+    "title" : "RandomString1",
+    "actorsConnection" : {
+      "totalCount" : 3,
+      "edges" : [ {
+        "properties" : {
+          "screenTime" : 105
+        },
+        "node" : {
+          "name" : "aRandomString2"
         }
+      }, {
+        "properties" : {
+          "screenTime" : 105
+        },
+        "node" : {
+          "name" : "bRandomString3"
+        }
+      }, {
+        "properties" : {
+          "screenTime" : 5
+        },
+        "node" : {
+          "name" : "cRandomString4"
+        }
+      } ],
+      "pageInfo" : {
+        "hasNextPage" : false
       }
     }
-  ]
+  } ]
 }
 ----
-
-'''
-
diff --git a/core/src/test/resources/integration-test-files/relationship-properties/read.js.adoc b/core/src/test/resources/integration-test-files/relationship-properties/read.js.adoc
new file mode 100644
index 00000000..2dd38dc6
--- /dev/null
+++ b/core/src/test/resources/integration-test-files/relationship-properties/read.js.adoc
@@ -0,0 +1,132 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= Relationship properties - read
+
+== Setup
+
+.Schema
+[source,graphql,schema=true]
+----
+type Movie {
+  title: String!
+  actors: [Actor!]! @relationship(type: "ACTED_IN", properties: "ActedIn", direction: IN)
+}
+
+type Actor {
+  name: String!
+  movies: [Movie!]! @relationship(type: "ACTED_IN", properties: "ActedIn", direction: OUT)
+}
+
+type ActedIn @relationshipProperties {
+  screenTime: Int!
+}
+----
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (:Actor { name: 'aRandomString2' })-[:ACTED_IN { screenTime: 105 }]->(m:Movie { title: 'RandomString1'})
+ CREATE (m)<-[:ACTED_IN { screenTime: 105 }]-(:Actor { name: 'bRandomString3' })
+ CREATE (m)<-[:ACTED_IN { screenTime: 5 }]-(:Actor { name: 'cRandomString4' })
+----
+
+== Projecting node and relationship properties with no arguments
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies(where: {title: "RandomString1"}) {
+    title
+    actorsConnection {
+      totalCount
+      edges {
+        properties {
+          screenTime
+        }
+        node {
+          name
+        }
+      }
+      pageInfo {
+        hasNextPage
+      }
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "RandomString1"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE this.title = $param0
+CALL {
+    WITH this
+    MATCH (this)<-[this0:ACTED_IN]-(this1:Actor)
+    WITH collect({ node: this1, relationship: this0 }) AS edges
+    WITH edges, size(edges) AS totalCount
+    CALL {
+        WITH edges
+        UNWIND edges AS edge
+        WITH edge.node AS this1, edge.relationship AS this0
+        RETURN collect({ properties: { screenTime: this0.screenTime, __typename: "ActedIn" }, node: { name: this1.name, __typename: "Actor" } }) AS var2
+    }
+    RETURN { edges: var2, totalCount: totalCount } AS var3
+}
+RETURN this { .title, actorsConnection: var3 } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "movies": [
+    {
+      "title": "RandomString1",
+      "actorsConnection": {
+        "totalCount": 3,
+        "edges": [
+          {
+            "properties": {
+              "screenTime": 105
+            },
+            "node": {
+              "name": "aRandomString2"
+            }
+          },
+          {
+            "properties": {
+              "screenTime": 105
+            },
+            "node": {
+              "name": "bRandomString3"
+            }
+          },
+          {
+            "properties": {
+              "screenTime": 5
+            },
+            "node": {
+              "name": "cRandomString4"
+            }
+          }
+        ],
+        "pageInfo": {
+          "hasNextPage": false
+        }
+      }
+    }
+  ]
+}
+----
diff --git a/core/src/test/resources/integration-test-files/rfcs/query-limits.adoc b/core/src/test/resources/integration-test-files/rfcs/query-limits.adoc
index 4c55e05a..b98a372f 100644
--- a/core/src/test/resources/integration-test-files/rfcs/query-limits.adoc
+++ b/core/src/test/resources/integration-test-files/rfcs/query-limits.adoc
@@ -24,7 +24,7 @@ WITH [1,2,3,4,5] AS iterate
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies {
@@ -37,7 +37,7 @@ WITH [1,2,3,4,5] AS iterate
 [source,json]
 ----
 {
-  "param0": 2
+  "param0" : 2
 }
 ----
 
@@ -55,16 +55,10 @@ RETURN this {
 [source,json,response=true,ignore-order]
 ----
 {
-  "movies": [
-    {
-      "id": "A"
-    },
-    {
-      "id": "A"
-    }
-  ]
+  "movies" : [ {
+    "id" : "A"
+  }, {
+    "id" : "A"
+  } ]
 }
 ----
-
-'''
-
diff --git a/core/src/test/resources/integration-test-files/rfcs/query-limits.js.adoc b/core/src/test/resources/integration-test-files/rfcs/query-limits.js.adoc
new file mode 100644
index 00000000..9b9d5b66
--- /dev/null
+++ b/core/src/test/resources/integration-test-files/rfcs/query-limits.js.adoc
@@ -0,0 +1,68 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= integration/rfcs/query-limits
+
+== Top Level Query Limits
+
+=== should limit the top level query
+
+.Schema
+[source,graphql,schema=true]
+----
+type Movie @limit(default: 2) {
+  id: ID!
+}
+----
+
+.Test Data
+[source,cypher,test-data=true]
+----
+WITH [1,2,3,4,5] AS iterate
+ UNWIND iterate AS i
+ CREATE (:Movie {id: "A"})
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies {
+    id
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": 2
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WITH *
+
+LIMIT $param0
+RETURN this { .id } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "movies": [
+    {
+      "id": "A"
+    },
+    {
+      "id": "A"
+    }
+  ]
+}
+----
diff --git a/core/src/test/resources/integration-test-files/scalars.adoc b/core/src/test/resources/integration-test-files/scalars.adoc
index bb79303a..b983708e 100644
--- a/core/src/test/resources/integration-test-files/scalars.adoc
+++ b/core/src/test/resources/integration-test-files/scalars.adoc
@@ -16,15 +16,15 @@ type Movie {
 .Test Data
 [source,cypher,test-data=true]
 ----
-CREATE (m:Movie {id: "986"})
+CREATE (m:Movie {id: "42"})
  RETURN m {.id} as m
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
-  movies(where: {id: 986}) {
+  movies(where: {id: 42}) {
     id
   }
 }
@@ -34,7 +34,7 @@ CREATE (m:Movie {id: "986"})
 [source,json]
 ----
 {
-  "param0": "986"
+  "param0" : "42"
 }
 ----
 
@@ -52,13 +52,8 @@ RETURN this {
 [source,json,response=true]
 ----
 {
-  "movies": [
-    {
-      "id": "986"
-    }
-  ]
+  "movies" : [ {
+    "id" : "42"
+  } ]
 }
 ----
-
-'''
-
diff --git a/core/src/test/resources/integration-test-files/scalars.js.adoc b/core/src/test/resources/integration-test-files/scalars.js.adoc
new file mode 100644
index 00000000..f40f7cd8
--- /dev/null
+++ b/core/src/test/resources/integration-test-files/scalars.js.adoc
@@ -0,0 +1,60 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= scalars
+
+== should serialize a id correctly
+
+.Schema
+[source,graphql,schema=true]
+----
+type Movie {
+  id: ID
+}
+----
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (m:Movie {id: "42"})
+ RETURN m {.id} as m
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies(where: {id: 42}) {
+    id
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "42"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE this.id = $param0
+RETURN this { .id } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "movies": [
+    {
+      "id": "42"
+    }
+  ]
+}
+----
diff --git a/core/src/test/resources/integration-test-files/types/bigint.adoc b/core/src/test/resources/integration-test-files/types/bigint.adoc
index 18007229..0bb0b03a 100644
--- a/core/src/test/resources/integration-test-files/types/bigint.adoc
+++ b/core/src/test/resources/integration-test-files/types/bigint.adoc
@@ -27,7 +27,7 @@ CREATE (f:File)
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   files(where: {name: "RandomString1"}) {
@@ -41,7 +41,7 @@ CREATE (f:File)
 [source,json]
 ----
 {
-  "param0": "RandomString1"
+  "param0" : "RandomString1"
 }
 ----
 
@@ -60,17 +60,13 @@ RETURN this {
 [source,json,response=true]
 ----
 {
-  "files": [
-    {
-      "name": "RandomString1",
-      "size": "9223372036854775807"
-    }
-  ]
+  "files" : [ {
+    "name" : "RandomString1",
+    "size" : "9223372036854775807"
+  } ]
 }
 ----
 
-'''
-
 === should successfully query an node with a BigInt property using in where
 
 .Test Data
@@ -82,7 +78,7 @@ CREATE (f:File)
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   files(where: {size: 8323372036854775807}) {
@@ -96,10 +92,7 @@ CREATE (f:File)
 [source,json]
 ----
 {
-  "param0": {
-    "low": -1239023617,
-    "high": 1937936068
-  }
+  "param0" : 8323372036854775807
 }
 ----
 
@@ -118,14 +111,9 @@ RETURN this {
 [source,json,response=true]
 ----
 {
-  "files": [
-    {
-      "name": "RandomString1",
-      "size": "8323372036854775807"
-    }
-  ]
+  "files" : [ {
+    "name" : "RandomString1",
+    "size" : "8323372036854775807"
+  } ]
 }
 ----
-
-'''
-
diff --git a/core/src/test/resources/integration-test-files/types/bigint.js.adoc b/core/src/test/resources/integration-test-files/types/bigint.js.adoc
new file mode 100644
index 00000000..adca7214
--- /dev/null
+++ b/core/src/test/resources/integration-test-files/types/bigint.js.adoc
@@ -0,0 +1,118 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= BigInt
+
+== read
+
+=== Setup
+
+.Schema
+[source,graphql,schema=true]
+----
+type File {
+  name: String!
+  size: BigInt!
+}
+----
+
+=== should successfully query an node with a BigInt property
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (f:File)
+ SET f.name = "RandomString1"
+ SET f.size = 9223372036854775807
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  files(where: {name: "RandomString1"}) {
+    name
+    size
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "RandomString1"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:File)
+WHERE this.name = $param0
+RETURN this { .name, .size } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "files": [
+    {
+      "name": "RandomString1",
+      "size": "9223372036854775807"
+    }
+  ]
+}
+----
+
+=== should successfully query an node with a BigInt property using in where
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (f:File)
+ SET f.name = "RandomString1"
+ SET f.size = 8323372036854775807
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  files(where: {size: 8323372036854775807}) {
+    name
+    size
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": 8323372036854775807
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:File)
+WHERE this.size = $param0
+RETURN this { .name, .size } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "files": [
+    {
+      "name": "RandomString1",
+      "size": "8323372036854775807"
+    }
+  ]
+}
+----
diff --git a/core/src/test/resources/integration-test-files/types/date.adoc b/core/src/test/resources/integration-test-files/types/date.adoc
index bbe630d5..83eb6380 100644
--- a/core/src/test/resources/integration-test-files/types/date.adoc
+++ b/core/src/test/resources/integration-test-files/types/date.adoc
@@ -19,14 +19,14 @@ type Movie {
 [source,cypher,test-data=true]
 ----
 CREATE (m:Movie)
- SET m.date = date("2024-12-01")
+ SET m.date = date("2024-12-24")
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
-  movies(where: {date: "2024-12-01T15:46:32.522Z"}) {
+  movies(where: {date: "2024-12-24T18:00:00.000Z"}) {
     date
   }
 }
@@ -36,7 +36,7 @@ CREATE (m:Movie)
 [source,json]
 ----
 {
-  "param0": "2024-12-01"
+  "param0" : "2024-12-24"
 }
 ----
 
@@ -54,13 +54,8 @@ RETURN this {
 [source,json,response=true]
 ----
 {
-  "movies": [
-    {
-      "date": "2024-12-01"
-    }
-  ]
+  "movies" : [ {
+    "date" : "2024-12-24"
+  } ]
 }
 ----
-
-'''
-
diff --git a/core/src/test/resources/integration-test-files/types/date.js.adoc b/core/src/test/resources/integration-test-files/types/date.js.adoc
new file mode 100644
index 00000000..2f99155f
--- /dev/null
+++ b/core/src/test/resources/integration-test-files/types/date.js.adoc
@@ -0,0 +1,62 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= Date
+
+== find
+
+=== should find a movie (with a Date)
+
+.Schema
+[source,graphql,schema=true]
+----
+type Movie {
+  date: Date
+}
+----
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (m:Movie)
+ SET m.date = date("2024-12-24")
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies(where: {date: "2024-12-24T18:00:00.000Z"}) {
+    date
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "2024-12-24"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE this.date = $param0
+RETURN this { .date } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "movies": [
+    {
+      "date": "2024-12-24"
+    }
+  ]
+}
+----
diff --git a/core/src/test/resources/integration-test-files/types/datetime.adoc b/core/src/test/resources/integration-test-files/types/datetime.adoc
index 501fc235..df3abb35 100644
--- a/core/src/test/resources/integration-test-files/types/datetime.adoc
+++ b/core/src/test/resources/integration-test-files/types/datetime.adoc
@@ -19,14 +19,14 @@ type Movie {
 [source,cypher,test-data=true]
 ----
 CREATE (m:Movie)
- SET m.datetime = datetime("2024-12-01T15:46:12.637000000Z")
+ SET m.datetime = datetime("2024-12-24T18:42:24.123000000Z")
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
-  movies(where: {datetime: "2024-12-01T15:46:12.637Z"}) {
+  movies(where: {datetime: "2024-12-24T18:42:24.123Z"}) {
     datetime
   }
 }
@@ -36,7 +36,7 @@ CREATE (m:Movie)
 [source,json]
 ----
 {
-  "param0" : "2024-12-01T15:46:12.637Z"
+  "param0" : "2024-12-24T18:42:24.123Z"
 }
 ----
 
@@ -54,16 +54,12 @@ RETURN this {
 [source,json,response=true]
 ----
 {
-  "movies": [
-    {
-      "datetime": "2024-12-01T15:46:12.637Z"
-    }
-  ]
+  "movies" : [ {
+    "datetime" : "2024-12-24T18:42:24.123Z"
+  } ]
 }
 ----
 
-'''
-
 === should find a movie (with a DateTime created with a timezone)
 
 .Schema
@@ -80,11 +76,11 @@ type Movie {
 ----
 CREATE (m:Movie)
  SET m.name = "Movie"
- SET m.datetime = datetime("2024-12-01T15:46:12.702[Etc/UTC]")
+ SET m.datetime = datetime("2024-12-24T18:42:24.123[Etc/UTC]")
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies(where: {name: "Movie"}) {
@@ -97,7 +93,7 @@ CREATE (m:Movie)
 [source,json]
 ----
 {
-  "param0": "Movie"
+  "param0" : "Movie"
 }
 ----
 
@@ -115,13 +111,8 @@ RETURN this {
 [source,json,response=true]
 ----
 {
-  "movies": [
-    {
-      "datetime": "2024-12-01T15:46:12.702Z"
-    }
-  ]
+  "movies" : [ {
+    "datetime" : "2024-12-24T18:42:24.123Z"
+  } ]
 }
 ----
-
-'''
-
diff --git a/core/src/test/resources/integration-test-files/types/datetime.js.adoc b/core/src/test/resources/integration-test-files/types/datetime.js.adoc
new file mode 100644
index 00000000..1a5444d1
--- /dev/null
+++ b/core/src/test/resources/integration-test-files/types/datetime.js.adoc
@@ -0,0 +1,119 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= DateTime
+
+== find
+
+=== should find a movie (with a DateTime)
+
+.Schema
+[source,graphql,schema=true]
+----
+type Movie {
+  datetime: DateTime
+}
+----
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (m:Movie)
+ SET m.datetime = datetime("2024-12-24T18:42:24.123000000Z")
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies(where: {datetime: "2024-12-24T18:42:24.123Z"}) {
+    datetime
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "2024-12-24T18:42:24.123000000Z"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE this.datetime = $param0
+RETURN this { datetime: apoc.date.convertFormat(toString(this.datetime), "iso_zoned_date_time", "iso_offset_date_time") } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "movies": [
+    {
+      "datetime": "2024-12-24T18:42:24.123Z"
+    }
+  ]
+}
+----
+
+=== should find a movie (with a DateTime created with a timezone)
+
+.Schema
+[source,graphql,schema=true]
+----
+type Movie {
+  name: String
+  datetime: DateTime
+}
+----
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (m:Movie)
+ SET m.name = "Movie"
+ SET m.datetime = datetime("2024-12-24T18:42:24.123[Etc/UTC]")
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies(where: {name: "Movie"}) {
+    datetime
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "Movie"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE this.name = $param0
+RETURN this { datetime: apoc.date.convertFormat(toString(this.datetime), "iso_zoned_date_time", "iso_offset_date_time") } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "movies": [
+    {
+      "datetime": "2024-12-24T18:42:24.123Z"
+    }
+  ]
+}
+----
diff --git a/core/src/test/resources/integration-test-files/types/duration.adoc b/core/src/test/resources/integration-test-files/types/duration.adoc
index 57e7ecbb..4b7d2dd8 100644
--- a/core/src/test/resources/integration-test-files/types/duration.adoc
+++ b/core/src/test/resources/integration-test-files/types/duration.adoc
@@ -26,7 +26,7 @@ CREATE (movie:Movie)
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query ($id: ID!, $duration: Duration!) {
   movies(where: {id: $id, duration: $duration}) {
@@ -40,8 +40,8 @@ query ($id: ID!, $duration: Duration!) {
 [source,json,request=true]
 ----
 {
-  "id": "RandomString1",
-  "duration": "P4D"
+  "duration" : "P4D",
+  "id" : "RandomString1"
 }
 ----
 
@@ -70,17 +70,13 @@ RETURN this {
 [source,json,response=true]
 ----
 {
-  "movies": [
-    {
-      "id": "RandomString1",
-      "duration": "P0M4DT0S"
-    }
-  ]
+  "movies" : [ {
+    "id" : "RandomString1",
+    "duration" : "P0M4DT0S"
+  } ]
 }
 ----
 
-'''
-
 === should filter based on duration comparison, for filter: LT
 
 .Test Data
@@ -95,7 +91,7 @@ CREATE (long:Movie)
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query ($where: MovieWhere!) {
   movies(where: $where, options: {sort: [{duration: ASC}]}) {
@@ -109,13 +105,9 @@ query ($where: MovieWhere!) {
 [source,json,request=true]
 ----
 {
-  "where": {
-    "id_IN": [
-      "RandomString1",
-      "RandomString2",
-      "RandomString3"
-    ],
-    "duration_LT": "P2M"
+  "where" : {
+    "id_IN" : [ "RandomString1", "RandomString2", "RandomString3" ],
+    "duration_LT" : "P2M"
   }
 }
 ----
@@ -146,17 +138,13 @@ RETURN this {
 [source,json,response=true]
 ----
 {
-  "movies": [
-    {
-      "id": "RandomString3",
-      "duration": "P0M2DT0S"
-    }
-  ]
+  "movies" : [ {
+    "id" : "RandomString3",
+    "duration" : "P0M2DT0S"
+  } ]
 }
 ----
 
-'''
-
 === should filter based on duration comparison, for filter: LTE
 
 .Test Data
@@ -171,7 +159,7 @@ CREATE (long:Movie)
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query ($where: MovieWhere!) {
   movies(where: $where, options: {sort: [{duration: ASC}]}) {
@@ -185,13 +173,9 @@ query ($where: MovieWhere!) {
 [source,json,request=true]
 ----
 {
-  "where": {
-    "id_IN": [
-      "RandomString1",
-      "RandomString2",
-      "RandomString3"
-    ],
-    "duration_LTE": "P2M"
+  "where" : {
+    "id_IN" : [ "RandomString1", "RandomString2", "RandomString3" ],
+    "duration_LTE" : "P2M"
   }
 }
 ----
@@ -222,21 +206,16 @@ RETURN this {
 [source,json,response=true]
 ----
 {
-  "movies": [
-    {
-      "id": "RandomString3",
-      "duration": "P0M2DT0S"
-    },
-    {
-      "id": "RandomString2",
-      "duration": "P2M0DT0S"
-    }
-  ]
+  "movies" : [ {
+    "id" : "RandomString3",
+    "duration" : "P0M2DT0S"
+  }, {
+    "id" : "RandomString2",
+    "duration" : "P2M0DT0S"
+  } ]
 }
 ----
 
-'''
-
 === should filter based on duration comparison, for filter: GT
 
 .Test Data
@@ -251,7 +230,7 @@ CREATE (long:Movie)
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query ($where: MovieWhere!) {
   movies(where: $where, options: {sort: [{duration: ASC}]}) {
@@ -265,13 +244,9 @@ query ($where: MovieWhere!) {
 [source,json,request=true]
 ----
 {
-  "where": {
-    "id_IN": [
-      "RandomString1",
-      "RandomString2",
-      "RandomString3"
-    ],
-    "duration_GT": "P2M"
+  "where" : {
+    "id_IN" : [ "RandomString1", "RandomString2", "RandomString3" ],
+    "duration_GT" : "P2M"
   }
 }
 ----
@@ -302,17 +277,13 @@ RETURN this {
 [source,json,response=true]
 ----
 {
-  "movies": [
-    {
-      "id": "RandomString1",
-      "duration": "P24M0DT0S"
-    }
-  ]
+  "movies" : [ {
+    "id" : "RandomString1",
+    "duration" : "P24M0DT0S"
+  } ]
 }
 ----
 
-'''
-
 === should filter based on duration comparison, for filter: GTE
 
 .Test Data
@@ -327,7 +298,7 @@ CREATE (long:Movie)
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query ($where: MovieWhere!) {
   movies(where: $where, options: {sort: [{duration: ASC}]}) {
@@ -341,13 +312,9 @@ query ($where: MovieWhere!) {
 [source,json,request=true]
 ----
 {
-  "where": {
-    "id_IN": [
-      "RandomString1",
-      "RandomString2",
-      "RandomString3"
-    ],
-    "duration_GTE": "P2M"
+  "where" : {
+    "id_IN" : [ "RandomString1", "RandomString2", "RandomString3" ],
+    "duration_GTE" : "P2M"
   }
 }
 ----
@@ -378,18 +345,12 @@ RETURN this {
 [source,json,response=true]
 ----
 {
-  "movies": [
-    {
-      "id": "RandomString2",
-      "duration": "P2M0DT0S"
-    },
-    {
-      "id": "RandomString1",
-      "duration": "P24M0DT0S"
-    }
-  ]
+  "movies" : [ {
+    "id" : "RandomString2",
+    "duration" : "P2M0DT0S"
+  }, {
+    "id" : "RandomString1",
+    "duration" : "P24M0DT0S"
+  } ]
 }
 ----
-
-'''
-
diff --git a/core/src/test/resources/integration-test-files/types/duration.js.adoc b/core/src/test/resources/integration-test-files/types/duration.js.adoc
new file mode 100644
index 00000000..dd7c8e46
--- /dev/null
+++ b/core/src/test/resources/integration-test-files/types/duration.js.adoc
@@ -0,0 +1,385 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= Duration
+
+== filter
+
+=== Setup
+
+.Schema
+[source,graphql,schema=true]
+----
+type Movie {
+  id: ID!
+  duration: Duration!
+}
+----
+
+=== should filter based on duration equality
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (movie:Movie)
+ SET movie = {id: "RandomString1", duration: duration("P0M4DT0S")}
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+query ($id: ID!, $duration: Duration!) {
+  movies(where: {id: $id, duration: $duration}) {
+    id
+    duration
+  }
+}
+----
+
+.GraphQL params input
+[source,json,request=true]
+----
+{
+  "id": "RandomString1",
+  "duration": "P4D"
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "RandomString1",
+  "param1": "P0M4DT0S"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE (this.id = $param0 AND this.duration = $param1)
+RETURN this { .id, .duration } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "movies": [
+    {
+      "id": "RandomString1",
+      "duration": "P0M4DT0S"
+    }
+  ]
+}
+----
+
+=== should filter based on duration comparison, for filter: LT
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (long:Movie)
+ SET long = {id: "RandomString1", duration: duration("P24M0DT0S")}
+ CREATE (medium:Movie)
+ SET medium = {id: "RandomString2", duration: duration("P2M0DT0S")}
+ CREATE (short:Movie)
+ SET short = {id: "RandomString3", duration: duration("P0M2DT0S")}
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+query ($where: MovieWhere!) {
+  movies(where: $where, options: {sort: [{duration: ASC}]}) {
+    id
+    duration
+  }
+}
+----
+
+.GraphQL params input
+[source,json,request=true]
+----
+{
+  "where": {
+    "id_IN": [
+      "RandomString1",
+      "RandomString2",
+      "RandomString3"
+    ],
+    "duration_LT": "P2M"
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": [
+    "RandomString1",
+    "RandomString2",
+    "RandomString3"
+  ],
+  "param1": "P2M0DT0S"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE (this.id IN $param0 AND (datetime() + this.duration) < (datetime() + $param1))
+WITH *
+ORDER BY this.duration ASC
+RETURN this { .id, .duration } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "movies": [
+    {
+      "id": "RandomString3",
+      "duration": "P0M2DT0S"
+    }
+  ]
+}
+----
+
+=== should filter based on duration comparison, for filter: LTE
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (long:Movie)
+ SET long = {id: "RandomString1", duration: duration("P24M0DT0S")}
+ CREATE (medium:Movie)
+ SET medium = {id: "RandomString2", duration: duration("P2M0DT0S")}
+ CREATE (short:Movie)
+ SET short = {id: "RandomString3", duration: duration("P0M2DT0S")}
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+query ($where: MovieWhere!) {
+  movies(where: $where, options: {sort: [{duration: ASC}]}) {
+    id
+    duration
+  }
+}
+----
+
+.GraphQL params input
+[source,json,request=true]
+----
+{
+  "where": {
+    "id_IN": [
+      "RandomString1",
+      "RandomString2",
+      "RandomString3"
+    ],
+    "duration_LTE": "P2M"
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": [
+    "RandomString1",
+    "RandomString2",
+    "RandomString3"
+  ],
+  "param1": "P2M0DT0S"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE (this.id IN $param0 AND (datetime() + this.duration) <= (datetime() + $param1))
+WITH *
+ORDER BY this.duration ASC
+RETURN this { .id, .duration } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "movies": [
+    {
+      "id": "RandomString3",
+      "duration": "P0M2DT0S"
+    },
+    {
+      "id": "RandomString2",
+      "duration": "P2M0DT0S"
+    }
+  ]
+}
+----
+
+=== should filter based on duration comparison, for filter: GT
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (long:Movie)
+ SET long = {id: "RandomString1", duration: duration("P24M0DT0S")}
+ CREATE (medium:Movie)
+ SET medium = {id: "RandomString2", duration: duration("P2M0DT0S")}
+ CREATE (short:Movie)
+ SET short = {id: "RandomString3", duration: duration("P0M2DT0S")}
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+query ($where: MovieWhere!) {
+  movies(where: $where, options: {sort: [{duration: ASC}]}) {
+    id
+    duration
+  }
+}
+----
+
+.GraphQL params input
+[source,json,request=true]
+----
+{
+  "where": {
+    "id_IN": [
+      "RandomString1",
+      "RandomString2",
+      "RandomString3"
+    ],
+    "duration_GT": "P2M"
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": [
+    "RandomString1",
+    "RandomString2",
+    "RandomString3"
+  ],
+  "param1": "P2M0DT0S"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE (this.id IN $param0 AND (datetime() + this.duration) > (datetime() + $param1))
+WITH *
+ORDER BY this.duration ASC
+RETURN this { .id, .duration } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "movies": [
+    {
+      "id": "RandomString1",
+      "duration": "P24M0DT0S"
+    }
+  ]
+}
+----
+
+=== should filter based on duration comparison, for filter: GTE
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (long:Movie)
+ SET long = {id: "RandomString1", duration: duration("P24M0DT0S")}
+ CREATE (medium:Movie)
+ SET medium = {id: "RandomString2", duration: duration("P2M0DT0S")}
+ CREATE (short:Movie)
+ SET short = {id: "RandomString3", duration: duration("P0M2DT0S")}
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+query ($where: MovieWhere!) {
+  movies(where: $where, options: {sort: [{duration: ASC}]}) {
+    id
+    duration
+  }
+}
+----
+
+.GraphQL params input
+[source,json,request=true]
+----
+{
+  "where": {
+    "id_IN": [
+      "RandomString1",
+      "RandomString2",
+      "RandomString3"
+    ],
+    "duration_GTE": "P2M"
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": [
+    "RandomString1",
+    "RandomString2",
+    "RandomString3"
+  ],
+  "param1": "P2M0DT0S"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE (this.id IN $param0 AND (datetime() + this.duration) >= (datetime() + $param1))
+WITH *
+ORDER BY this.duration ASC
+RETURN this { .id, .duration } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "movies": [
+    {
+      "id": "RandomString2",
+      "duration": "P2M0DT0S"
+    },
+    {
+      "id": "RandomString1",
+      "duration": "P24M0DT0S"
+    }
+  ]
+}
+----
diff --git a/core/src/test/resources/integration-test-files/types/localdatetime.adoc b/core/src/test/resources/integration-test-files/types/localdatetime.adoc
index 23d5b103..1668ab22 100644
--- a/core/src/test/resources/integration-test-files/types/localdatetime.adoc
+++ b/core/src/test/resources/integration-test-files/types/localdatetime.adoc
@@ -27,7 +27,7 @@ CREATE (movie:Movie)
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query ($localDT: LocalDateTime!) {
   movies(where: {localDT: $localDT}) {
@@ -41,7 +41,7 @@ query ($localDT: LocalDateTime!) {
 [source,json,request=true]
 ----
 {
-  "localDT": "2024-09-17T11:49:48.322"
+  "localDT" : "2024-09-17T11:49:48.322"
 }
 ----
 
@@ -75,8 +75,6 @@ RETURN this {
 }
 ----
 
-'''
-
 === should filter based on localDT comparison, for filter LT
 
 .Test Data
@@ -85,13 +83,13 @@ RETURN this {
 CREATE (future:Movie)
  SET future = {id: "RandomString1", localDT: localdatetime("2025-02-18T18:10:55.462000000")}
  CREATE (present:Movie)
- SET present = {id: "RandomString2", localDT: localdatetime("2024-12-01T15:45:34.296000000")}
+ SET present = {id: "RandomString2", localDT: localdatetime("2024-12-24T18:42:24.123000000")}
  CREATE (past:Movie)
  SET past = {id: "RandomString3", localDT: localdatetime("2022-08-29T10:21:43.108000000")}
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query ($where: MovieWhere!) {
   movies(where: $where, options: {sort: [{localDT: ASC}]}) {
@@ -105,13 +103,9 @@ query ($where: MovieWhere!) {
 [source,json,request=true]
 ----
 {
-  "where": {
-    "id_IN": [
-      "RandomString1",
-      "RandomString2",
-      "RandomString3"
-    ],
-    "localDT_LT": "2024-12-01T15:45:34.296"
+  "where" : {
+    "id_IN" : [ "RandomString1", "RandomString2", "RandomString3" ],
+    "localDT_LT" : "2024-12-24T18:42:24.123"
   }
 }
 ----
@@ -121,7 +115,7 @@ query ($where: MovieWhere!) {
 ----
 {
   "param0" : [ "RandomString1", "RandomString2", "RandomString3" ],
-  "param1" : "2024-12-01T15:45:34.296"
+  "param1" : "2024-12-24T18:42:24.123000000"
 }
 ----
 
@@ -149,8 +143,6 @@ RETURN this {
 }
 ----
 
-'''
-
 === should filter based on localDT comparison, for filter LTE
 
 .Test Data
@@ -159,13 +151,13 @@ RETURN this {
 CREATE (future:Movie)
  SET future = {id: "RandomString1", localDT: localdatetime("2025-02-18T18:10:55.462000000")}
  CREATE (present:Movie)
- SET present = {id: "RandomString2", localDT: localdatetime("2024-12-01T15:45:34.404000000")}
+ SET present = {id: "RandomString2", localDT: localdatetime("2024-12-24T18:42:24.123000000")}
  CREATE (past:Movie)
  SET past = {id: "RandomString3", localDT: localdatetime("2022-08-29T10:21:43.108000000")}
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query ($where: MovieWhere!) {
   movies(where: $where, options: {sort: [{localDT: ASC}]}) {
@@ -179,13 +171,9 @@ query ($where: MovieWhere!) {
 [source,json,request=true]
 ----
 {
-  "where": {
-    "id_IN": [
-      "RandomString1",
-      "RandomString2",
-      "RandomString3"
-    ],
-    "localDT_LTE": "2024-12-01T15:45:34.404"
+  "where" : {
+    "id_IN" : [ "RandomString1", "RandomString2", "RandomString3" ],
+    "localDT_LTE" : "2024-12-24T18:42:24.123"
   }
 }
 ----
@@ -195,7 +183,7 @@ query ($where: MovieWhere!) {
 ----
 {
   "param0" : [ "RandomString1", "RandomString2", "RandomString3" ],
-  "param1" : "2024-12-01T15:45:34.404"
+  "param1" : "2024-12-24T18:42:24.123"
 }
 ----
 
@@ -221,13 +209,11 @@ RETURN this {
     "localDT" : "2022-08-29T10:21:43.108"
   }, {
     "id" : "RandomString2",
-    "localDT" : "2024-12-01T15:45:34.404"
+    "localDT" : "2024-12-24T18:42:24.123"
   } ]
 }
 ----
 
-'''
-
 === should filter based on localDT comparison, for filter GT
 
 .Test Data
@@ -236,13 +222,13 @@ RETURN this {
 CREATE (future:Movie)
  SET future = {id: "RandomString1", localDT: localdatetime("2025-02-18T18:10:55.462000000")}
  CREATE (present:Movie)
- SET present = {id: "RandomString2", localDT: localdatetime("2024-12-01T15:45:34.459000000")}
+ SET present = {id: "RandomString2", localDT: localdatetime("2024-12-24T18:42:24.123000000")}
  CREATE (past:Movie)
  SET past = {id: "RandomString3", localDT: localdatetime("2022-08-29T10:21:43.108000000")}
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query ($where: MovieWhere!) {
   movies(where: $where, options: {sort: [{localDT: ASC}]}) {
@@ -256,13 +242,9 @@ query ($where: MovieWhere!) {
 [source,json,request=true]
 ----
 {
-  "where": {
-    "id_IN": [
-      "RandomString1",
-      "RandomString2",
-      "RandomString3"
-    ],
-    "localDT_GT": "2024-12-01T15:45:34.459"
+  "where" : {
+    "id_IN" : [ "RandomString1", "RandomString2", "RandomString3" ],
+    "localDT_GT" : "2024-12-24T18:42:24.123"
   }
 }
 ----
@@ -272,7 +254,7 @@ query ($where: MovieWhere!) {
 ----
 {
   "param0" : [ "RandomString1", "RandomString2", "RandomString3" ],
-  "param1" : "2024-12-01T15:45:34.459"
+  "param1" : "2024-12-24T18:42:24.123"
 }
 ----
 
@@ -300,8 +282,6 @@ RETURN this {
 }
 ----
 
-'''
-
 === should filter based on localDT comparison, for filter GTE
 
 .Test Data
@@ -310,13 +290,13 @@ RETURN this {
 CREATE (future:Movie)
  SET future = {id: "RandomString1", localDT: localdatetime("2025-02-18T18:10:55.462000000")}
  CREATE (present:Movie)
- SET present = {id: "RandomString2", localDT: localdatetime("2024-12-01T15:45:34.514000000")}
+ SET present = {id: "RandomString2", localDT: localdatetime("2024-12-24T18:42:24.123000000")}
  CREATE (past:Movie)
  SET past = {id: "RandomString3", localDT: localdatetime("2022-08-29T10:21:43.108000000")}
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query ($where: MovieWhere!) {
   movies(where: $where, options: {sort: [{localDT: ASC}]}) {
@@ -330,13 +310,9 @@ query ($where: MovieWhere!) {
 [source,json,request=true]
 ----
 {
-  "where": {
-    "id_IN": [
-      "RandomString1",
-      "RandomString2",
-      "RandomString3"
-    ],
-    "localDT_GTE": "2024-12-01T15:45:34.514"
+  "where" : {
+    "id_IN" : [ "RandomString1", "RandomString2", "RandomString3" ],
+    "localDT_GTE" : "2024-12-24T18:42:24.123"
   }
 }
 ----
@@ -346,7 +322,7 @@ query ($where: MovieWhere!) {
 ----
 {
   "param0" : [ "RandomString1", "RandomString2", "RandomString3" ],
-  "param1" : "2024-12-01T15:45:34.514"
+  "param1" : "2024-12-24T18:42:24.123"
 }
 ----
 
@@ -369,7 +345,7 @@ RETURN this {
 {
   "movies" : [ {
     "id" : "RandomString2",
-    "localDT" : "2024-12-01T15:45:34.514"
+    "localDT" : "2024-12-24T18:42:24.123"
   }, {
     "id" : "RandomString1",
     "localDT" : "2025-02-18T18:10:55.462"
@@ -377,8 +353,6 @@ RETURN this {
 }
 ----
 
-'''
-
 == sorting
 
 === should sort based on localDT, sorting by ASC
@@ -389,13 +363,13 @@ RETURN this {
 CREATE (future:Movie)
  SET future = {id: "RandomString1", localDT: localdatetime("2025-08-10T05:25:26.654000000")}
  CREATE (present:Movie)
- SET present = {id: "RandomString2", localDT: localdatetime("2024-12-01T15:45:34.595000000")}
+ SET present = {id: "RandomString2", localDT: localdatetime("2024-12-24T18:42:24.123000000")}
  CREATE (past:Movie)
  SET past = {id: "RandomString3", localDT: localdatetime("2023-10-05T14:58:45.170000000")}
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query ($futureId: ID!, $presentId: ID!, $pastId: ID!, $sort: SortDirection!) {
   movies(
@@ -412,10 +386,10 @@ query ($futureId: ID!, $presentId: ID!, $pastId: ID!, $sort: SortDirection!) {
 [source,json,request=true]
 ----
 {
-  "futureId": "RandomString1",
-  "presentId": "RandomString2",
-  "pastId": "RandomString3",
-  "sort": "ASC"
+  "futureId" : "RandomString1",
+  "pastId" : "RandomString3",
+  "presentId" : "RandomString2",
+  "sort" : "ASC"
 }
 ----
 
@@ -423,11 +397,7 @@ query ($futureId: ID!, $presentId: ID!, $pastId: ID!, $sort: SortDirection!) {
 [source,json]
 ----
 {
-  "param0": [
-    "RandomString1",
-    "RandomString2",
-    "RandomString3"
-  ]
+  "param0" : [ "RandomString1", "RandomString2", "RandomString3" ]
 }
 ----
 
@@ -452,7 +422,7 @@ RETURN this {
     "localDT" : "2023-10-05T14:58:45.170"
   }, {
     "id" : "RandomString2",
-    "localDT" : "2024-12-01T15:45:34.595"
+    "localDT" : "2024-12-24T18:42:24.123"
   }, {
     "id" : "RandomString1",
     "localDT" : "2025-08-10T05:25:26.654"
@@ -460,8 +430,6 @@ RETURN this {
 }
 ----
 
-'''
-
 === should sort based on localDT, sorting by DESC
 
 .Test Data
@@ -470,13 +438,13 @@ RETURN this {
 CREATE (future:Movie)
  SET future = {id: "RandomString1", localDT: localdatetime("2025-08-10T05:25:26.654000000")}
  CREATE (present:Movie)
- SET present = {id: "RandomString2", localDT: localdatetime("2024-12-01T15:45:34.695000000")}
+ SET present = {id: "RandomString2", localDT: localdatetime("2024-12-24T18:42:24.123000000")}
  CREATE (past:Movie)
  SET past = {id: "RandomString3", localDT: localdatetime("2023-10-05T14:58:45.170000000")}
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query ($futureId: ID!, $presentId: ID!, $pastId: ID!, $sort: SortDirection!) {
   movies(
@@ -493,10 +461,10 @@ query ($futureId: ID!, $presentId: ID!, $pastId: ID!, $sort: SortDirection!) {
 [source,json,request=true]
 ----
 {
-  "futureId": "RandomString1",
-  "presentId": "RandomString2",
-  "pastId": "RandomString3",
-  "sort": "DESC"
+  "futureId" : "RandomString1",
+  "pastId" : "RandomString3",
+  "presentId" : "RandomString2",
+  "sort" : "DESC"
 }
 ----
 
@@ -504,11 +472,7 @@ query ($futureId: ID!, $presentId: ID!, $pastId: ID!, $sort: SortDirection!) {
 [source,json]
 ----
 {
-  "param0": [
-    "RandomString1",
-    "RandomString2",
-    "RandomString3"
-  ]
+  "param0" : [ "RandomString1", "RandomString2", "RandomString3" ]
 }
 ----
 
@@ -533,13 +497,10 @@ RETURN this {
     "localDT" : "2025-08-10T05:25:26.654"
   }, {
     "id" : "RandomString2",
-    "localDT" : "2024-12-01T15:45:34.695"
+    "localDT" : "2024-12-24T18:42:24.123"
   }, {
     "id" : "RandomString3",
     "localDT" : "2023-10-05T14:58:45.170"
   } ]
 }
 ----
-
-'''
-
diff --git a/core/src/test/resources/integration-test-files/types/localdatetime.js.adoc b/core/src/test/resources/integration-test-files/types/localdatetime.js.adoc
new file mode 100644
index 00000000..0ac0987a
--- /dev/null
+++ b/core/src/test/resources/integration-test-files/types/localdatetime.js.adoc
@@ -0,0 +1,548 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= LocalDateTime
+
+== Setup
+
+.Schema
+[source,graphql,schema=true]
+----
+type Movie {
+  id: ID!
+  localDT: LocalDateTime
+  localDTs: [LocalDateTime!]
+}
+----
+
+== filter
+
+=== should filter based on localDT equality
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (movie:Movie)
+ SET movie = {id: "RandomString1", localDT: localdatetime("2024-09-17T11:49:48.322000000")}
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+query ($localDT: LocalDateTime!) {
+  movies(where: {localDT: $localDT}) {
+    id
+    localDT
+  }
+}
+----
+
+.GraphQL params input
+[source,json,request=true]
+----
+{
+  "localDT": "2024-09-17T11:49:48.322"
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "2024-09-17T11:49:48.322000000"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE this.localDT = $param0
+RETURN this { .id, .localDT } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "movies": [
+    {
+      "id": "RandomString1",
+      "localDT": "2024-09-17T11:49:48.322000000"
+    }
+  ]
+}
+----
+
+=== should filter based on localDT comparison, for filter LT
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (future:Movie)
+ SET future = {id: "RandomString1", localDT: localdatetime("2025-02-18T18:10:55.462000000")}
+ CREATE (present:Movie)
+ SET present = {id: "RandomString2", localDT: localdatetime("2024-12-24T18:42:24.123000000")}
+ CREATE (past:Movie)
+ SET past = {id: "RandomString3", localDT: localdatetime("2022-08-29T10:21:43.108000000")}
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+query ($where: MovieWhere!) {
+  movies(where: $where, options: {sort: [{localDT: ASC}]}) {
+    id
+    localDT
+  }
+}
+----
+
+.GraphQL params input
+[source,json,request=true]
+----
+{
+  "where": {
+    "id_IN": [
+      "RandomString1",
+      "RandomString2",
+      "RandomString3"
+    ],
+    "localDT_LT": "2024-12-24T18:42:24.123"
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": [
+    "RandomString1",
+    "RandomString2",
+    "RandomString3"
+  ],
+  "param1": "2024-12-24T18:42:24.123000000"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE (this.id IN $param0 AND this.localDT < $param1)
+WITH *
+ORDER BY this.localDT ASC
+RETURN this { .id, .localDT } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "movies": [
+    {
+      "id": "RandomString3",
+      "localDT": "2022-08-29T10:21:43.108000000"
+    }
+  ]
+}
+----
+
+=== should filter based on localDT comparison, for filter LTE
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (future:Movie)
+ SET future = {id: "RandomString1", localDT: localdatetime("2025-02-18T18:10:55.462000000")}
+ CREATE (present:Movie)
+ SET present = {id: "RandomString2", localDT: localdatetime("2024-12-24T18:42:24.123000000")}
+ CREATE (past:Movie)
+ SET past = {id: "RandomString3", localDT: localdatetime("2022-08-29T10:21:43.108000000")}
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+query ($where: MovieWhere!) {
+  movies(where: $where, options: {sort: [{localDT: ASC}]}) {
+    id
+    localDT
+  }
+}
+----
+
+.GraphQL params input
+[source,json,request=true]
+----
+{
+  "where": {
+    "id_IN": [
+      "RandomString1",
+      "RandomString2",
+      "RandomString3"
+    ],
+    "localDT_LTE": "2024-12-24T18:42:24.123"
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": [
+    "RandomString1",
+    "RandomString2",
+    "RandomString3"
+  ],
+  "param1": "2024-12-24T18:42:24.123000000"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE (this.id IN $param0 AND this.localDT <= $param1)
+WITH *
+ORDER BY this.localDT ASC
+RETURN this { .id, .localDT } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "movies": [
+    {
+      "id": "RandomString3",
+      "localDT": "2022-08-29T10:21:43.108000000"
+    },
+    {
+      "id": "RandomString2",
+      "localDT": "2024-12-24T18:42:24.123000000"
+    }
+  ]
+}
+----
+
+=== should filter based on localDT comparison, for filter GT
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (future:Movie)
+ SET future = {id: "RandomString1", localDT: localdatetime("2025-02-18T18:10:55.462000000")}
+ CREATE (present:Movie)
+ SET present = {id: "RandomString2", localDT: localdatetime("2024-12-24T18:42:24.123000000")}
+ CREATE (past:Movie)
+ SET past = {id: "RandomString3", localDT: localdatetime("2022-08-29T10:21:43.108000000")}
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+query ($where: MovieWhere!) {
+  movies(where: $where, options: {sort: [{localDT: ASC}]}) {
+    id
+    localDT
+  }
+}
+----
+
+.GraphQL params input
+[source,json,request=true]
+----
+{
+  "where": {
+    "id_IN": [
+      "RandomString1",
+      "RandomString2",
+      "RandomString3"
+    ],
+    "localDT_GT": "2024-12-24T18:42:24.123"
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": [
+    "RandomString1",
+    "RandomString2",
+    "RandomString3"
+  ],
+  "param1": "2024-12-24T18:42:24.123000000"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE (this.id IN $param0 AND this.localDT > $param1)
+WITH *
+ORDER BY this.localDT ASC
+RETURN this { .id, .localDT } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "movies": [
+    {
+      "id": "RandomString1",
+      "localDT": "2025-02-18T18:10:55.462000000"
+    }
+  ]
+}
+----
+
+=== should filter based on localDT comparison, for filter GTE
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (future:Movie)
+ SET future = {id: "RandomString1", localDT: localdatetime("2025-02-18T18:10:55.462000000")}
+ CREATE (present:Movie)
+ SET present = {id: "RandomString2", localDT: localdatetime("2024-12-24T18:42:24.123000000")}
+ CREATE (past:Movie)
+ SET past = {id: "RandomString3", localDT: localdatetime("2022-08-29T10:21:43.108000000")}
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+query ($where: MovieWhere!) {
+  movies(where: $where, options: {sort: [{localDT: ASC}]}) {
+    id
+    localDT
+  }
+}
+----
+
+.GraphQL params input
+[source,json,request=true]
+----
+{
+  "where": {
+    "id_IN": [
+      "RandomString1",
+      "RandomString2",
+      "RandomString3"
+    ],
+    "localDT_GTE": "2024-12-24T18:42:24.123"
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": [
+    "RandomString1",
+    "RandomString2",
+    "RandomString3"
+  ],
+  "param1": "2024-12-24T18:42:24.123000000"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE (this.id IN $param0 AND this.localDT >= $param1)
+WITH *
+ORDER BY this.localDT ASC
+RETURN this { .id, .localDT } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "movies": [
+    {
+      "id": "RandomString2",
+      "localDT": "2024-12-24T18:42:24.123000000"
+    },
+    {
+      "id": "RandomString1",
+      "localDT": "2025-02-18T18:10:55.462000000"
+    }
+  ]
+}
+----
+
+== sorting
+
+=== should sort based on localDT, sorting by ASC
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (future:Movie)
+ SET future = {id: "RandomString1", localDT: localdatetime("2025-08-10T05:25:26.654000000")}
+ CREATE (present:Movie)
+ SET present = {id: "RandomString2", localDT: localdatetime("2024-12-24T18:42:24.123000000")}
+ CREATE (past:Movie)
+ SET past = {id: "RandomString3", localDT: localdatetime("2023-10-05T14:58:45.170000000")}
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+query ($futureId: ID!, $presentId: ID!, $pastId: ID!, $sort: SortDirection!) {
+  movies(
+    where: {id_IN: [$futureId, $presentId, $pastId]}
+    options: {sort: [{localDT: $sort}]}
+  ) {
+    id
+    localDT
+  }
+}
+----
+
+.GraphQL params input
+[source,json,request=true]
+----
+{
+  "futureId": "RandomString1",
+  "presentId": "RandomString2",
+  "pastId": "RandomString3",
+  "sort": "ASC"
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": [
+    "RandomString1",
+    "RandomString2",
+    "RandomString3"
+  ]
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE this.id IN $param0
+WITH *
+ORDER BY this.localDT ASC
+RETURN this { .id, .localDT } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "movies": [
+    {
+      "id": "RandomString3",
+      "localDT": "2023-10-05T14:58:45.170000000"
+    },
+    {
+      "id": "RandomString2",
+      "localDT": "2024-12-24T18:42:24.123000000"
+    },
+    {
+      "id": "RandomString1",
+      "localDT": "2025-08-10T05:25:26.654000000"
+    }
+  ]
+}
+----
+
+=== should sort based on localDT, sorting by DESC
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (future:Movie)
+ SET future = {id: "RandomString1", localDT: localdatetime("2025-08-10T05:25:26.654000000")}
+ CREATE (present:Movie)
+ SET present = {id: "RandomString2", localDT: localdatetime("2024-12-24T18:42:24.123000000")}
+ CREATE (past:Movie)
+ SET past = {id: "RandomString3", localDT: localdatetime("2023-10-05T14:58:45.170000000")}
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+query ($futureId: ID!, $presentId: ID!, $pastId: ID!, $sort: SortDirection!) {
+  movies(
+    where: {id_IN: [$futureId, $presentId, $pastId]}
+    options: {sort: [{localDT: $sort}]}
+  ) {
+    id
+    localDT
+  }
+}
+----
+
+.GraphQL params input
+[source,json,request=true]
+----
+{
+  "futureId": "RandomString1",
+  "presentId": "RandomString2",
+  "pastId": "RandomString3",
+  "sort": "DESC"
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": [
+    "RandomString1",
+    "RandomString2",
+    "RandomString3"
+  ]
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE this.id IN $param0
+WITH *
+ORDER BY this.localDT DESC
+RETURN this { .id, .localDT } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "movies": [
+    {
+      "id": "RandomString1",
+      "localDT": "2025-08-10T05:25:26.654000000"
+    },
+    {
+      "id": "RandomString2",
+      "localDT": "2024-12-24T18:42:24.123000000"
+    },
+    {
+      "id": "RandomString3",
+      "localDT": "2023-10-05T14:58:45.170000000"
+    }
+  ]
+}
+----
diff --git a/core/src/test/resources/integration-test-files/types/localtime.adoc b/core/src/test/resources/integration-test-files/types/localtime.adoc
index d4eec91f..184e7a69 100644
--- a/core/src/test/resources/integration-test-files/types/localtime.adoc
+++ b/core/src/test/resources/integration-test-files/types/localtime.adoc
@@ -27,7 +27,7 @@ CREATE (movie:Movie)
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query ($time: LocalTime!) {
   movies(where: {time: $time}) {
@@ -41,8 +41,8 @@ query ($time: LocalTime!) {
 [source,json,request=true]
 ----
 {
-  "id": "RandomString1",
-  "time": "11:49:48.322"
+  "id" : "RandomString1",
+  "time" : "11:49:48.322"
 }
 ----
 
@@ -76,8 +76,6 @@ RETURN this {
 }
 ----
 
-'''
-
 === should filter based on time comparison, for filter LT
 
 .Test Data
@@ -92,7 +90,7 @@ CREATE (future:Movie)
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query ($where: MovieWhere!) {
   movies(where: $where, options: {sort: [{time: ASC}]}) {
@@ -106,13 +104,9 @@ query ($where: MovieWhere!) {
 [source,json,request=true]
 ----
 {
-  "where": {
-    "id_IN": [
-      "RandomString1",
-      "RandomString2",
-      "RandomString3"
-    ],
-    "time_LT": "12:00:00"
+  "where" : {
+    "id_IN" : [ "RandomString1", "RandomString2", "RandomString3" ],
+    "time_LT" : "12:00:00"
   }
 }
 ----
@@ -121,12 +115,8 @@ query ($where: MovieWhere!) {
 [source,json]
 ----
 {
-  "param0": [
-    "RandomString1",
-    "RandomString2",
-    "RandomString3"
-  ],
-  "param1": "12:00:00"
+  "param0" : [ "RandomString1", "RandomString2", "RandomString3" ],
+  "param1" : "12:00:00"
 }
 ----
 
@@ -154,8 +144,6 @@ RETURN this {
 }
 ----
 
-'''
-
 === should filter based on time comparison, for filter LTE
 
 .Test Data
@@ -170,7 +158,7 @@ CREATE (future:Movie)
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query ($where: MovieWhere!) {
   movies(where: $where, options: {sort: [{time: ASC}]}) {
@@ -184,13 +172,9 @@ query ($where: MovieWhere!) {
 [source,json,request=true]
 ----
 {
-  "where": {
-    "id_IN": [
-      "RandomString1",
-      "RandomString2",
-      "RandomString3"
-    ],
-    "time_LTE": "12:00:00"
+  "where" : {
+    "id_IN" : [ "RandomString1", "RandomString2", "RandomString3" ],
+    "time_LTE" : "12:00:00"
   }
 }
 ----
@@ -199,12 +183,8 @@ query ($where: MovieWhere!) {
 [source,json]
 ----
 {
-  "param0": [
-    "RandomString1",
-    "RandomString2",
-    "RandomString3"
-  ],
-  "param1": "12:00:00"
+  "param0" : [ "RandomString1", "RandomString2", "RandomString3" ],
+  "param1" : "12:00:00"
 }
 ----
 
@@ -235,8 +215,6 @@ RETURN this {
 }
 ----
 
-'''
-
 === should filter based on time comparison, for filter GT
 
 .Test Data
@@ -251,7 +229,7 @@ CREATE (future:Movie)
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query ($where: MovieWhere!) {
   movies(where: $where, options: {sort: [{time: ASC}]}) {
@@ -265,13 +243,9 @@ query ($where: MovieWhere!) {
 [source,json,request=true]
 ----
 {
-  "where": {
-    "id_IN": [
-      "RandomString1",
-      "RandomString2",
-      "RandomString3"
-    ],
-    "time_GT": "12:00:00"
+  "where" : {
+    "id_IN" : [ "RandomString1", "RandomString2", "RandomString3" ],
+    "time_GT" : "12:00:00"
   }
 }
 ----
@@ -280,12 +254,8 @@ query ($where: MovieWhere!) {
 [source,json]
 ----
 {
-  "param0": [
-    "RandomString1",
-    "RandomString2",
-    "RandomString3"
-  ],
-  "param1": "12:00:00"
+  "param0" : [ "RandomString1", "RandomString2", "RandomString3" ],
+  "param1" : "12:00:00"
 }
 ----
 
@@ -313,8 +283,6 @@ RETURN this {
 }
 ----
 
-'''
-
 === should filter based on time comparison, for filter GTE
 
 .Test Data
@@ -329,7 +297,7 @@ CREATE (future:Movie)
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query ($where: MovieWhere!) {
   movies(where: $where, options: {sort: [{time: ASC}]}) {
@@ -343,13 +311,9 @@ query ($where: MovieWhere!) {
 [source,json,request=true]
 ----
 {
-  "where": {
-    "id_IN": [
-      "RandomString1",
-      "RandomString2",
-      "RandomString3"
-    ],
-    "time_GTE": "12:00:00"
+  "where" : {
+    "id_IN" : [ "RandomString1", "RandomString2", "RandomString3" ],
+    "time_GTE" : "12:00:00"
   }
 }
 ----
@@ -358,12 +322,8 @@ query ($where: MovieWhere!) {
 [source,json]
 ----
 {
-  "param0": [
-    "RandomString1",
-    "RandomString2",
-    "RandomString3"
-  ],
-  "param1": "12:00:00"
+  "param0" : [ "RandomString1", "RandomString2", "RandomString3" ],
+  "param1" : "12:00:00"
 }
 ----
 
@@ -394,8 +354,6 @@ RETURN this {
 }
 ----
 
-'''
-
 == sorting
 
 === should sort based on time, sorting by ASC
@@ -412,7 +370,7 @@ CREATE (future:Movie)
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query ($futureId: ID!, $presentId: ID!, $pastId: ID!, $sort: SortDirection!) {
   movies(
@@ -429,10 +387,10 @@ query ($futureId: ID!, $presentId: ID!, $pastId: ID!, $sort: SortDirection!) {
 [source,json,request=true]
 ----
 {
-  "futureId": "RandomString1",
-  "presentId": "RandomString2",
-  "pastId": "RandomString3",
-  "sort": "ASC"
+  "futureId" : "RandomString1",
+  "pastId" : "RandomString3",
+  "presentId" : "RandomString2",
+  "sort" : "ASC"
 }
 ----
 
@@ -440,11 +398,7 @@ query ($futureId: ID!, $presentId: ID!, $pastId: ID!, $sort: SortDirection!) {
 [source,json]
 ----
 {
-  "param0": [
-    "RandomString1",
-    "RandomString2",
-    "RandomString3"
-  ]
+  "param0" : [ "RandomString1", "RandomString2", "RandomString3" ]
 }
 ----
 
@@ -477,8 +431,6 @@ RETURN this {
 }
 ----
 
-'''
-
 === should sort based on time, sorting by DESC
 
 .Test Data
@@ -493,7 +445,7 @@ CREATE (future:Movie)
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query ($futureId: ID!, $presentId: ID!, $pastId: ID!, $sort: SortDirection!) {
   movies(
@@ -510,10 +462,10 @@ query ($futureId: ID!, $presentId: ID!, $pastId: ID!, $sort: SortDirection!) {
 [source,json,request=true]
 ----
 {
-  "futureId": "RandomString1",
-  "presentId": "RandomString2",
-  "pastId": "RandomString3",
-  "sort": "DESC"
+  "futureId" : "RandomString1",
+  "pastId" : "RandomString3",
+  "presentId" : "RandomString2",
+  "sort" : "DESC"
 }
 ----
 
@@ -521,11 +473,7 @@ query ($futureId: ID!, $presentId: ID!, $pastId: ID!, $sort: SortDirection!) {
 [source,json]
 ----
 {
-  "param0": [
-    "RandomString1",
-    "RandomString2",
-    "RandomString3"
-  ]
+  "param0" : [ "RandomString1", "RandomString2", "RandomString3" ]
 }
 ----
 
@@ -557,6 +505,3 @@ RETURN this {
   } ]
 }
 ----
-
-'''
-
diff --git a/core/src/test/resources/integration-test-files/types/localtime.js.adoc b/core/src/test/resources/integration-test-files/types/localtime.js.adoc
new file mode 100644
index 00000000..d37f00a9
--- /dev/null
+++ b/core/src/test/resources/integration-test-files/types/localtime.js.adoc
@@ -0,0 +1,549 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= LocalTime
+
+== Setup
+
+.Schema
+[source,graphql,schema=true]
+----
+type Movie {
+  id: ID!
+  time: LocalTime
+  times: [LocalTime!]
+}
+----
+
+== filter
+
+=== should filter based on time equality
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (movie:Movie)
+ SET movie = {id: "RandomString1", time: localtime("11:49:48.322000000")}
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+query ($time: LocalTime!) {
+  movies(where: {time: $time}) {
+    id
+    time
+  }
+}
+----
+
+.GraphQL params input
+[source,json,request=true]
+----
+{
+  "id": "RandomString1",
+  "time": "11:49:48.322"
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "11:49:48.322000000"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE this.time = $param0
+RETURN this { .id, .time } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "movies": [
+    {
+      "id": "RandomString1",
+      "time": "11:49:48.322000000"
+    }
+  ]
+}
+----
+
+=== should filter based on time comparison, for filter LT
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (future:Movie)
+ SET future = {id: "RandomString1", time: localtime("13:00:00")}
+ CREATE (present:Movie)
+ SET present = {id: "RandomString2", time: localtime("12:00:00")}
+ CREATE (past:Movie)
+ SET past = {id: "RandomString3", time: localtime("11:00:00")}
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+query ($where: MovieWhere!) {
+  movies(where: $where, options: {sort: [{time: ASC}]}) {
+    id
+    time
+  }
+}
+----
+
+.GraphQL params input
+[source,json,request=true]
+----
+{
+  "where": {
+    "id_IN": [
+      "RandomString1",
+      "RandomString2",
+      "RandomString3"
+    ],
+    "time_LT": "12:00:00"
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": [
+    "RandomString1",
+    "RandomString2",
+    "RandomString3"
+  ],
+  "param1": "12:00:00"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE (this.id IN $param0 AND this.time < $param1)
+WITH *
+ORDER BY this.time ASC
+RETURN this { .id, .time } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "movies": [
+    {
+      "id": "RandomString3",
+      "time": "11:00:00"
+    }
+  ]
+}
+----
+
+=== should filter based on time comparison, for filter LTE
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (future:Movie)
+ SET future = {id: "RandomString1", time: localtime("13:00:00")}
+ CREATE (present:Movie)
+ SET present = {id: "RandomString2", time: localtime("12:00:00")}
+ CREATE (past:Movie)
+ SET past = {id: "RandomString3", time: localtime("11:00:00")}
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+query ($where: MovieWhere!) {
+  movies(where: $where, options: {sort: [{time: ASC}]}) {
+    id
+    time
+  }
+}
+----
+
+.GraphQL params input
+[source,json,request=true]
+----
+{
+  "where": {
+    "id_IN": [
+      "RandomString1",
+      "RandomString2",
+      "RandomString3"
+    ],
+    "time_LTE": "12:00:00"
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": [
+    "RandomString1",
+    "RandomString2",
+    "RandomString3"
+  ],
+  "param1": "12:00:00"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE (this.id IN $param0 AND this.time <= $param1)
+WITH *
+ORDER BY this.time ASC
+RETURN this { .id, .time } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "movies": [
+    {
+      "id": "RandomString3",
+      "time": "11:00:00"
+    },
+    {
+      "id": "RandomString2",
+      "time": "12:00:00"
+    }
+  ]
+}
+----
+
+=== should filter based on time comparison, for filter GT
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (future:Movie)
+ SET future = {id: "RandomString1", time: localtime("13:00:00")}
+ CREATE (present:Movie)
+ SET present = {id: "RandomString2", time: localtime("12:00:00")}
+ CREATE (past:Movie)
+ SET past = {id: "RandomString3", time: localtime("11:00:00")}
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+query ($where: MovieWhere!) {
+  movies(where: $where, options: {sort: [{time: ASC}]}) {
+    id
+    time
+  }
+}
+----
+
+.GraphQL params input
+[source,json,request=true]
+----
+{
+  "where": {
+    "id_IN": [
+      "RandomString1",
+      "RandomString2",
+      "RandomString3"
+    ],
+    "time_GT": "12:00:00"
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": [
+    "RandomString1",
+    "RandomString2",
+    "RandomString3"
+  ],
+  "param1": "12:00:00"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE (this.id IN $param0 AND this.time > $param1)
+WITH *
+ORDER BY this.time ASC
+RETURN this { .id, .time } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "movies": [
+    {
+      "id": "RandomString1",
+      "time": "13:00:00"
+    }
+  ]
+}
+----
+
+=== should filter based on time comparison, for filter GTE
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (future:Movie)
+ SET future = {id: "RandomString1", time: localtime("13:00:00")}
+ CREATE (present:Movie)
+ SET present = {id: "RandomString2", time: localtime("12:00:00")}
+ CREATE (past:Movie)
+ SET past = {id: "RandomString3", time: localtime("11:00:00")}
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+query ($where: MovieWhere!) {
+  movies(where: $where, options: {sort: [{time: ASC}]}) {
+    id
+    time
+  }
+}
+----
+
+.GraphQL params input
+[source,json,request=true]
+----
+{
+  "where": {
+    "id_IN": [
+      "RandomString1",
+      "RandomString2",
+      "RandomString3"
+    ],
+    "time_GTE": "12:00:00"
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": [
+    "RandomString1",
+    "RandomString2",
+    "RandomString3"
+  ],
+  "param1": "12:00:00"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE (this.id IN $param0 AND this.time >= $param1)
+WITH *
+ORDER BY this.time ASC
+RETURN this { .id, .time } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "movies": [
+    {
+      "id": "RandomString2",
+      "time": "12:00:00"
+    },
+    {
+      "id": "RandomString1",
+      "time": "13:00:00"
+    }
+  ]
+}
+----
+
+== sorting
+
+=== should sort based on time, sorting by ASC
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (future:Movie)
+ SET future = {id: "RandomString1", time: localtime("13:00:00")}
+ CREATE (present:Movie)
+ SET present = {id: "RandomString2", time: localtime("12:00:00")}
+ CREATE (past:Movie)
+ SET past = {id: "RandomString3", time: localtime("11:00:00")}
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+query ($futureId: ID!, $presentId: ID!, $pastId: ID!, $sort: SortDirection!) {
+  movies(
+    where: {id_IN: [$futureId, $presentId, $pastId]}
+    options: {sort: [{time: $sort}]}
+  ) {
+    id
+    time
+  }
+}
+----
+
+.GraphQL params input
+[source,json,request=true]
+----
+{
+  "futureId": "RandomString1",
+  "presentId": "RandomString2",
+  "pastId": "RandomString3",
+  "sort": "ASC"
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": [
+    "RandomString1",
+    "RandomString2",
+    "RandomString3"
+  ]
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE this.id IN $param0
+WITH *
+ORDER BY this.time ASC
+RETURN this { .id, .time } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "movies": [
+    {
+      "id": "RandomString3",
+      "time": "11:00:00"
+    },
+    {
+      "id": "RandomString2",
+      "time": "12:00:00"
+    },
+    {
+      "id": "RandomString1",
+      "time": "13:00:00"
+    }
+  ]
+}
+----
+
+=== should sort based on time, sorting by DESC
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (future:Movie)
+ SET future = {id: "RandomString1", time: localtime("13:00:00")}
+ CREATE (present:Movie)
+ SET present = {id: "RandomString2", time: localtime("12:00:00")}
+ CREATE (past:Movie)
+ SET past = {id: "RandomString3", time: localtime("11:00:00")}
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+query ($futureId: ID!, $presentId: ID!, $pastId: ID!, $sort: SortDirection!) {
+  movies(
+    where: {id_IN: [$futureId, $presentId, $pastId]}
+    options: {sort: [{time: $sort}]}
+  ) {
+    id
+    time
+  }
+}
+----
+
+.GraphQL params input
+[source,json,request=true]
+----
+{
+  "futureId": "RandomString1",
+  "presentId": "RandomString2",
+  "pastId": "RandomString3",
+  "sort": "DESC"
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": [
+    "RandomString1",
+    "RandomString2",
+    "RandomString3"
+  ]
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE this.id IN $param0
+WITH *
+ORDER BY this.time DESC
+RETURN this { .id, .time } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "movies": [
+    {
+      "id": "RandomString1",
+      "time": "13:00:00"
+    },
+    {
+      "id": "RandomString2",
+      "time": "12:00:00"
+    },
+    {
+      "id": "RandomString3",
+      "time": "11:00:00"
+    }
+  ]
+}
+----
diff --git a/core/src/test/resources/integration-test-files/types/point-cartesian.adoc b/core/src/test/resources/integration-test-files/types/point-cartesian.adoc
index 54546fe2..e7198922 100644
--- a/core/src/test/resources/integration-test-files/types/point-cartesian.adoc
+++ b/core/src/test/resources/integration-test-files/types/point-cartesian.adoc
@@ -30,7 +30,7 @@ CALL {
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query Parts($serial: String!) {
   parts(where: {serial: $serial}) {
@@ -49,7 +49,7 @@ query Parts($serial: String!) {
 [source,json,request=true]
 ----
 {
-  "serial": "bf92efbc-6c15-40ac-9cd5-8ab95fa4da90"
+  "serial" : "bf92efbc-6c15-40ac-9cd5-8ab95fa4da90"
 }
 ----
 
@@ -57,7 +57,7 @@ query Parts($serial: String!) {
 [source,json]
 ----
 {
-  "param0": "bf92efbc-6c15-40ac-9cd5-8ab95fa4da90"
+  "param0" : "bf92efbc-6c15-40ac-9cd5-8ab95fa4da90"
 }
 ----
 
@@ -81,22 +81,18 @@ RETURN this {
 [source,json,response=true]
 ----
 {
-  "parts": [
-    {
-      "serial": "bf92efbc-6c15-40ac-9cd5-8ab95fa4da90",
-      "location": {
-        "x": 0.2800768264569342,
-        "y": 0.6105434170458466,
-        "z": null,
-        "crs": "cartesian"
-      }
+  "parts" : [ {
+    "serial" : "bf92efbc-6c15-40ac-9cd5-8ab95fa4da90",
+    "location" : {
+      "x" : 0.2800768264569342,
+      "y" : 0.6105434170458466,
+      "z" : null,
+      "crs" : "cartesian"
     }
-  ]
+  } ]
 }
 ----
 
-'''
-
 == enables query of a node with a cartesian-3d point
 
 .Test Data
@@ -113,7 +109,7 @@ CALL {
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query Parts($serial: String!) {
   parts(where: {serial: $serial}) {
@@ -132,7 +128,7 @@ query Parts($serial: String!) {
 [source,json,request=true]
 ----
 {
-  "serial": "c7715adc-9c9c-45ff-b4ed-6cb20bb044ad"
+  "serial" : "c7715adc-9c9c-45ff-b4ed-6cb20bb044ad"
 }
 ----
 
@@ -140,7 +136,7 @@ query Parts($serial: String!) {
 [source,json]
 ----
 {
-  "param0": "c7715adc-9c9c-45ff-b4ed-6cb20bb044ad"
+  "param0" : "c7715adc-9c9c-45ff-b4ed-6cb20bb044ad"
 }
 ----
 
@@ -164,19 +160,14 @@ RETURN this {
 [source,json,response=true]
 ----
 {
-  "parts": [
-    {
-      "serial": "c7715adc-9c9c-45ff-b4ed-6cb20bb044ad",
-      "location": {
-        "x": 0.9446345162577927,
-        "y": 0.7858678111806512,
-        "z": 0.4248296618461609,
-        "crs": "cartesian-3d"
-      }
+  "parts" : [ {
+    "serial" : "c7715adc-9c9c-45ff-b4ed-6cb20bb044ad",
+    "location" : {
+      "x" : 0.9446345162577927,
+      "y" : 0.7858678111806512,
+      "z" : 0.4248296618461609,
+      "crs" : "cartesian-3d"
     }
-  ]
+  } ]
 }
 ----
-
-'''
-
diff --git a/core/src/test/resources/integration-test-files/types/point-cartesian.js.adoc b/core/src/test/resources/integration-test-files/types/point-cartesian.js.adoc
new file mode 100644
index 00000000..1049f9f9
--- /dev/null
+++ b/core/src/test/resources/integration-test-files/types/point-cartesian.js.adoc
@@ -0,0 +1,168 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= CartesianPoint
+
+== Setup
+
+.Schema
+[source,graphql,schema=true]
+----
+type Part {
+  serial: String!
+  location: CartesianPoint!
+}
+----
+
+== enables query of a node with a cartesian point
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CALL {
+ CREATE (p:Part)
+ SET p.serial = "bf92efbc-6c15-40ac-9cd5-8ab95fa4da90"
+ SET p.location = point({x: 0.2800768264569342, y: 0.6105434170458466})
+ RETURN p
+ }
+
+ RETURN p { .id, .location } AS p
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+query Parts($serial: String!) {
+  parts(where: {serial: $serial}) {
+    serial
+    location {
+      x
+      y
+      z
+      crs
+    }
+  }
+}
+----
+
+.GraphQL params input
+[source,json,request=true]
+----
+{
+  "serial": "bf92efbc-6c15-40ac-9cd5-8ab95fa4da90"
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "bf92efbc-6c15-40ac-9cd5-8ab95fa4da90"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Part)
+WHERE this.serial = $param0
+RETURN this { .serial, location: CASE
+    WHEN this.location IS NOT NULL THEN { point: this.location, crs: this.location.crs }
+    ELSE NULL
+END } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "parts": [
+    {
+      "serial": "bf92efbc-6c15-40ac-9cd5-8ab95fa4da90",
+      "location": {
+        "x": 0.2800768264569342,
+        "y": 0.6105434170458466,
+        "z": null,
+        "crs": "cartesian"
+      }
+    }
+  ]
+}
+----
+
+== enables query of a node with a cartesian-3d point
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CALL {
+ CREATE (p:Part)
+ SET p.serial = "c7715adc-9c9c-45ff-b4ed-6cb20bb044ad"
+ SET p.location = point({x: 0.9446345162577927, y: 0.7858678111806512, z: 0.4248296618461609})
+ RETURN p
+ }
+
+ RETURN p { .id, .location } AS p
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+query Parts($serial: String!) {
+  parts(where: {serial: $serial}) {
+    serial
+    location {
+      x
+      y
+      z
+      crs
+    }
+  }
+}
+----
+
+.GraphQL params input
+[source,json,request=true]
+----
+{
+  "serial": "c7715adc-9c9c-45ff-b4ed-6cb20bb044ad"
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "c7715adc-9c9c-45ff-b4ed-6cb20bb044ad"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Part)
+WHERE this.serial = $param0
+RETURN this { .serial, location: CASE
+    WHEN this.location IS NOT NULL THEN { point: this.location, crs: this.location.crs }
+    ELSE NULL
+END } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "parts": [
+    {
+      "serial": "c7715adc-9c9c-45ff-b4ed-6cb20bb044ad",
+      "location": {
+        "x": 0.9446345162577927,
+        "y": 0.7858678111806512,
+        "z": 0.4248296618461609,
+        "crs": "cartesian-3d"
+      }
+    }
+  ]
+}
+----
diff --git a/core/src/test/resources/integration-test-files/types/point.adoc b/core/src/test/resources/integration-test-files/types/point.adoc
index 28f6ed7f..14bcc27f 100644
--- a/core/src/test/resources/integration-test-files/types/point.adoc
+++ b/core/src/test/resources/integration-test-files/types/point.adoc
@@ -36,7 +36,7 @@ CALL {
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query Photographs($longitude: Float!, $latitude: Float!, $height: Float) {
   photographs(
@@ -58,9 +58,9 @@ query Photographs($longitude: Float!, $latitude: Float!, $height: Float) {
 [source,json,request=true]
 ----
 {
-  "longitude": 125.6358,
-  "latitude": -7.2045,
-  "height": 0.6950517320074141
+  "height" : 0.6950517320074141,
+  "latitude" : -7.2045,
+  "longitude" : 125.6358
 }
 ----
 
@@ -68,10 +68,10 @@ query Photographs($longitude: Float!, $latitude: Float!, $height: Float) {
 [source,json]
 ----
 {
-  "param0": {
-    "longitude": 125.6358,
-    "latitude": -7.2045,
-    "height": 0.6950517320074141
+  "param0" : {
+    "longitude" : 125.6358,
+    "latitude" : -7.2045,
+    "height" : 0.6950517320074141
   }
 }
 ----
@@ -97,20 +97,15 @@ RETURN this {
 [source,json,response=true]
 ----
 {
-  "photographs": [
-    {
-      "id": "3019fe82-5231-4103-8662-39c1fcc7d50c",
-      "size": 99119,
-      "location": {
-        "latitude": -7.2045,
-        "longitude": 125.6358,
-        "height": 0.6950517320074141,
-        "crs": "wgs-84-3d"
-      }
+  "photographs" : [ {
+    "id" : "3019fe82-5231-4103-8662-39c1fcc7d50c",
+    "size" : 99119,
+    "location" : {
+      "latitude" : -7.2045,
+      "longitude" : 125.6358,
+      "height" : 0.6950517320074141,
+      "crs" : "wgs-84-3d"
     }
-  ]
+  } ]
 }
 ----
-
-'''
-
diff --git a/core/src/test/resources/integration-test-files/types/point.js.adoc b/core/src/test/resources/integration-test-files/types/point.js.adoc
new file mode 100644
index 00000000..881ad68d
--- /dev/null
+++ b/core/src/test/resources/integration-test-files/types/point.js.adoc
@@ -0,0 +1,108 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= Point
+
+== Setup
+
+.Schema
+[source,graphql,schema=true]
+----
+type Photograph {
+  id: String!
+  size: Int!
+  location: Point!
+}
+
+type Query {
+  custom: String!
+}
+----
+
+== enables query for equality of a node with a wgs-84-3d point
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CALL {
+ CREATE (p:Photograph)
+ SET p.id = "3019fe82-5231-4103-8662-39c1fcc7d50c"
+ SET p.size = 99119
+ SET p.location = point({longitude: 125.6358, latitude: -7.2045, height: 0.6950517320074141})
+ RETURN p
+ }
+
+ RETURN p { .id, .size, .location } AS p
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+query Photographs($longitude: Float!, $latitude: Float!, $height: Float) {
+  photographs(
+    where: {location: {longitude: $longitude, latitude: $latitude, height: $height}}
+  ) {
+    id
+    size
+    location {
+      latitude
+      longitude
+      height
+      crs
+    }
+  }
+}
+----
+
+.GraphQL params input
+[source,json,request=true]
+----
+{
+  "longitude": 125.6358,
+  "latitude": -7.2045,
+  "height": 0.6950517320074141
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": {
+    "longitude": 125.6358,
+    "latitude": -7.2045,
+    "height": 0.6950517320074141
+  }
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Photograph)
+WHERE this.location = point($param0)
+RETURN this { .id, .size, location: CASE
+    WHEN this.location IS NOT NULL THEN { point: this.location, crs: this.location.crs }
+    ELSE NULL
+END } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "photographs": [
+    {
+      "id": "3019fe82-5231-4103-8662-39c1fcc7d50c",
+      "size": 99119,
+      "location": {
+        "latitude": -7.2045,
+        "longitude": 125.6358,
+        "height": 0.6950517320074141,
+        "crs": "wgs-84-3d"
+      }
+    }
+  ]
+}
+----
diff --git a/core/src/test/resources/integration-test-files/types/points-cartesian.adoc b/core/src/test/resources/integration-test-files/types/points-cartesian.adoc
index f9d2540b..852b4e8e 100644
--- a/core/src/test/resources/integration-test-files/types/points-cartesian.adoc
+++ b/core/src/test/resources/integration-test-files/types/points-cartesian.adoc
@@ -30,7 +30,7 @@ CALL {
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query Parts($id: String!) {
   parts(where: {id: $id}) {
@@ -49,7 +49,7 @@ query Parts($id: String!) {
 [source,json,request=true]
 ----
 {
-  "id": "5ba92bc4-95e7-4361-857c-60edcd771391"
+  "id" : "5ba92bc4-95e7-4361-857c-60edcd771391"
 }
 ----
 
@@ -57,7 +57,7 @@ query Parts($id: String!) {
 [source,json]
 ----
 {
-  "param0": "5ba92bc4-95e7-4361-857c-60edcd771391"
+  "param0" : "5ba92bc4-95e7-4361-857c-60edcd771391"
 }
 ----
 
@@ -81,66 +81,53 @@ RETURN this {
 [source,json,response=true,ignore-order]
 ----
 {
-  "parts": [
-    {
-      "id": "5ba92bc4-95e7-4361-857c-60edcd771391",
-      "locations": [
-        {
-          "y": 0.07264417805708945,
-          "x": 0.02772025833837688,
-          "z": null,
-          "crs": "cartesian"
-        },
-        {
-          "y": 0.07264417805708945,
-          "x": 0.02772025833837688,
-          "z": null,
-          "crs": "cartesian"
-        },
-        {
-          "y": 0.07264417805708945,
-          "x": 0.02772025833837688,
-          "z": null,
-          "crs": "cartesian"
-        },
-        {
-          "y": 0.07264417805708945,
-          "x": 0.02772025833837688,
-          "z": null,
-          "crs": "cartesian"
-        },
-        {
-          "y": 0.07264417805708945,
-          "x": 0.02772025833837688,
-          "z": null,
-          "crs": "cartesian"
-        },
-        {
-          "y": 0.07264417805708945,
-          "x": 0.02772025833837688,
-          "z": null,
-          "crs": "cartesian"
-        },
-        {
-          "y": 0.07264417805708945,
-          "x": 0.02772025833837688,
-          "z": null,
-          "crs": "cartesian"
-        },
-        {
-          "y": 0.07264417805708945,
-          "x": 0.02772025833837688,
-          "z": null,
-          "crs": "cartesian"
-        }
-      ]
-    }
-  ]
+  "parts" : [ {
+    "id" : "5ba92bc4-95e7-4361-857c-60edcd771391",
+    "locations" : [ {
+      "y" : 0.07264417805708945,
+      "x" : 0.02772025833837688,
+      "z" : null,
+      "crs" : "cartesian"
+    }, {
+      "y" : 0.07264417805708945,
+      "x" : 0.02772025833837688,
+      "z" : null,
+      "crs" : "cartesian"
+    }, {
+      "y" : 0.07264417805708945,
+      "x" : 0.02772025833837688,
+      "z" : null,
+      "crs" : "cartesian"
+    }, {
+      "y" : 0.07264417805708945,
+      "x" : 0.02772025833837688,
+      "z" : null,
+      "crs" : "cartesian"
+    }, {
+      "y" : 0.07264417805708945,
+      "x" : 0.02772025833837688,
+      "z" : null,
+      "crs" : "cartesian"
+    }, {
+      "y" : 0.07264417805708945,
+      "x" : 0.02772025833837688,
+      "z" : null,
+      "crs" : "cartesian"
+    }, {
+      "y" : 0.07264417805708945,
+      "x" : 0.02772025833837688,
+      "z" : null,
+      "crs" : "cartesian"
+    }, {
+      "y" : 0.07264417805708945,
+      "x" : 0.02772025833837688,
+      "z" : null,
+      "crs" : "cartesian"
+    } ]
+  } ]
 }
 ----
 
-'''
-
 == enables query of a node with multiple cartesian-3d points
 
 .Test Data
@@ -157,7 +144,7 @@ CALL {
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query Parts($id: String!) {
   parts(where: {id: $id}) {
@@ -176,7 +163,7 @@ query Parts($id: String!) {
 [source,json,request=true]
 ----
 {
-  "id": "052322ec-95e5-4b88-8a90-9f0c1df17ee3"
+  "id" : "052322ec-95e5-4b88-8a90-9f0c1df17ee3"
 }
 ----
 
@@ -184,7 +171,7 @@ query Parts($id: String!) {
 [source,json]
 ----
 {
-  "param0": "052322ec-95e5-4b88-8a90-9f0c1df17ee3"
+  "param0" : "052322ec-95e5-4b88-8a90-9f0c1df17ee3"
 }
 ----
 
@@ -208,63 +195,49 @@ RETURN this {
 [source,json,response=true,ignore-order]
 ----
 {
-  "parts": [
-    {
-      "id": "052322ec-95e5-4b88-8a90-9f0c1df17ee3",
-      "locations": [
-        {
-          "y": 0.7110547178890556,
-          "x": 0.8367510938551277,
-          "z": 0.9648887133225799,
-          "crs": "cartesian-3d"
-        },
-        {
-          "y": 0.7110547178890556,
-          "x": 0.8367510938551277,
-          "z": 0.9648887133225799,
-          "crs": "cartesian-3d"
-        },
-        {
-          "y": 0.7110547178890556,
-          "x": 0.8367510938551277,
-          "z": 0.9648887133225799,
-          "crs": "cartesian-3d"
-        },
-        {
-          "y": 0.7110547178890556,
-          "x": 0.8367510938551277,
-          "z": 0.9648887133225799,
-          "crs": "cartesian-3d"
-        },
-        {
-          "y": 0.7110547178890556,
-          "x": 0.8367510938551277,
-          "z": 0.9648887133225799,
-          "crs": "cartesian-3d"
-        },
-        {
-          "y": 0.7110547178890556,
-          "x": 0.8367510938551277,
-          "z": 0.9648887133225799,
-          "crs": "cartesian-3d"
-        },
-        {
-          "y": 0.7110547178890556,
-          "x": 0.8367510938551277,
-          "z": 0.9648887133225799,
-          "crs": "cartesian-3d"
-        },
-        {
-          "y": 0.7110547178890556,
-          "x": 0.8367510938551277,
-          "z": 0.9648887133225799,
-          "crs": "cartesian-3d"
-        }
-      ]
-    }
-  ]
+  "parts" : [ {
+    "id" : "052322ec-95e5-4b88-8a90-9f0c1df17ee3",
+    "locations" : [ {
+      "y" : 0.7110547178890556,
+      "x" : 0.8367510938551277,
+      "z" : 0.9648887133225799,
+      "crs" : "cartesian-3d"
+    }, {
+      "y" : 0.7110547178890556,
+      "x" : 0.8367510938551277,
+      "z" : 0.9648887133225799,
+      "crs" : "cartesian-3d"
+    }, {
+      "y" : 0.7110547178890556,
+      "x" : 0.8367510938551277,
+      "z" : 0.9648887133225799,
+      "crs" : "cartesian-3d"
+    }, {
+      "y" : 0.7110547178890556,
+      "x" : 0.8367510938551277,
+      "z" : 0.9648887133225799,
+      "crs" : "cartesian-3d"
+    }, {
+      "y" : 0.7110547178890556,
+      "x" : 0.8367510938551277,
+      "z" : 0.9648887133225799,
+      "crs" : "cartesian-3d"
+    }, {
+      "y" : 0.7110547178890556,
+      "x" : 0.8367510938551277,
+      "z" : 0.9648887133225799,
+      "crs" : "cartesian-3d"
+    }, {
+      "y" : 0.7110547178890556,
+      "x" : 0.8367510938551277,
+      "z" : 0.9648887133225799,
+      "crs" : "cartesian-3d"
+    }, {
+      "y" : 0.7110547178890556,
+      "x" : 0.8367510938551277,
+      "z" : 0.9648887133225799,
+      "crs" : "cartesian-3d"
+    } ]
+  } ]
 }
 ----
-
-'''
-
diff --git a/core/src/test/resources/integration-test-files/types/points-cartesian.js.adoc b/core/src/test/resources/integration-test-files/types/points-cartesian.js.adoc
new file mode 100644
index 00000000..8121c85e
--- /dev/null
+++ b/core/src/test/resources/integration-test-files/types/points-cartesian.js.adoc
@@ -0,0 +1,256 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= [CartesianPoint]
+
+== Setup
+
+.Schema
+[source,graphql,schema=true]
+----
+type Part {
+  id: String!
+  locations: [CartesianPoint!]!
+}
+----
+
+== enables query of a node with multiple cartesian points
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CALL {
+ CREATE (r:Part)
+ SET r.id = "5ba92bc4-95e7-4361-857c-60edcd771391"
+ SET r.locations = [p in [{x: 0.02772025833837688, y: 0.07264417805708945}, {x: 0.02772025833837688, y: 0.07264417805708945}, {x: 0.02772025833837688, y: 0.07264417805708945}, {x: 0.02772025833837688, y: 0.07264417805708945}, {x: 0.02772025833837688, y: 0.07264417805708945}, {x: 0.02772025833837688, y: 0.07264417805708945}, {x: 0.02772025833837688, y: 0.07264417805708945}, {x: 0.02772025833837688, y: 0.07264417805708945}] | point(p)]
+ RETURN r
+ }
+
+ RETURN r { .id, .locations } AS r
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+query Parts($id: String!) {
+  parts(where: {id: $id}) {
+    id
+    locations {
+      y
+      x
+      z
+      crs
+    }
+  }
+}
+----
+
+.GraphQL params input
+[source,json,request=true]
+----
+{
+  "id": "5ba92bc4-95e7-4361-857c-60edcd771391"
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "5ba92bc4-95e7-4361-857c-60edcd771391"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Part)
+WHERE this.id = $param0
+RETURN this { .id, locations: CASE
+    WHEN this.locations IS NOT NULL THEN [var0 IN this.locations | { point: var0, crs: var0.crs }]
+    ELSE NULL
+END } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "parts": [
+    {
+      "id": "5ba92bc4-95e7-4361-857c-60edcd771391",
+      "locations": [
+        {
+          "y": 0.07264417805708945,
+          "x": 0.02772025833837688,
+          "z": null,
+          "crs": "cartesian"
+        },
+        {
+          "y": 0.07264417805708945,
+          "x": 0.02772025833837688,
+          "z": null,
+          "crs": "cartesian"
+        },
+        {
+          "y": 0.07264417805708945,
+          "x": 0.02772025833837688,
+          "z": null,
+          "crs": "cartesian"
+        },
+        {
+          "y": 0.07264417805708945,
+          "x": 0.02772025833837688,
+          "z": null,
+          "crs": "cartesian"
+        },
+        {
+          "y": 0.07264417805708945,
+          "x": 0.02772025833837688,
+          "z": null,
+          "crs": "cartesian"
+        },
+        {
+          "y": 0.07264417805708945,
+          "x": 0.02772025833837688,
+          "z": null,
+          "crs": "cartesian"
+        },
+        {
+          "y": 0.07264417805708945,
+          "x": 0.02772025833837688,
+          "z": null,
+          "crs": "cartesian"
+        },
+        {
+          "y": 0.07264417805708945,
+          "x": 0.02772025833837688,
+          "z": null,
+          "crs": "cartesian"
+        }
+      ]
+    }
+  ]
+}
+----
+
+== enables query of a node with multiple cartesian-3d points
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CALL {
+ CREATE (r:Part)
+ SET r.id = "052322ec-95e5-4b88-8a90-9f0c1df17ee3"
+ SET r.locations = [p in [{x: 0.8367510938551277, y: 0.7110547178890556, z: 0.9648887133225799}, {x: 0.8367510938551277, y: 0.7110547178890556, z: 0.9648887133225799}, {x: 0.8367510938551277, y: 0.7110547178890556, z: 0.9648887133225799}, {x: 0.8367510938551277, y: 0.7110547178890556, z: 0.9648887133225799}, {x: 0.8367510938551277, y: 0.7110547178890556, z: 0.9648887133225799}, {x: 0.8367510938551277, y: 0.7110547178890556, z: 0.9648887133225799}, {x: 0.8367510938551277, y: 0.7110547178890556, z: 0.9648887133225799}, {x: 0.8367510938551277, y: 0.7110547178890556, z: 0.9648887133225799}] | point(p)]
+ RETURN r
+ }
+
+ RETURN r { .id, .locations } AS r
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+query Parts($id: String!) {
+  parts(where: {id: $id}) {
+    id
+    locations {
+      y
+      x
+      z
+      crs
+    }
+  }
+}
+----
+
+.GraphQL params input
+[source,json,request=true]
+----
+{
+  "id": "052322ec-95e5-4b88-8a90-9f0c1df17ee3"
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "052322ec-95e5-4b88-8a90-9f0c1df17ee3"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Part)
+WHERE this.id = $param0
+RETURN this { .id, locations: CASE
+    WHEN this.locations IS NOT NULL THEN [var0 IN this.locations | { point: var0, crs: var0.crs }]
+    ELSE NULL
+END } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "parts": [
+    {
+      "id": "052322ec-95e5-4b88-8a90-9f0c1df17ee3",
+      "locations": [
+        {
+          "y": 0.7110547178890556,
+          "x": 0.8367510938551277,
+          "z": 0.9648887133225799,
+          "crs": "cartesian-3d"
+        },
+        {
+          "y": 0.7110547178890556,
+          "x": 0.8367510938551277,
+          "z": 0.9648887133225799,
+          "crs": "cartesian-3d"
+        },
+        {
+          "y": 0.7110547178890556,
+          "x": 0.8367510938551277,
+          "z": 0.9648887133225799,
+          "crs": "cartesian-3d"
+        },
+        {
+          "y": 0.7110547178890556,
+          "x": 0.8367510938551277,
+          "z": 0.9648887133225799,
+          "crs": "cartesian-3d"
+        },
+        {
+          "y": 0.7110547178890556,
+          "x": 0.8367510938551277,
+          "z": 0.9648887133225799,
+          "crs": "cartesian-3d"
+        },
+        {
+          "y": 0.7110547178890556,
+          "x": 0.8367510938551277,
+          "z": 0.9648887133225799,
+          "crs": "cartesian-3d"
+        },
+        {
+          "y": 0.7110547178890556,
+          "x": 0.8367510938551277,
+          "z": 0.9648887133225799,
+          "crs": "cartesian-3d"
+        },
+        {
+          "y": 0.7110547178890556,
+          "x": 0.8367510938551277,
+          "z": 0.9648887133225799,
+          "crs": "cartesian-3d"
+        }
+      ]
+    }
+  ]
+}
+----
diff --git a/core/src/test/resources/integration-test-files/types/points.adoc b/core/src/test/resources/integration-test-files/types/points.adoc
index a64d7594..0cae9cf6 100644
--- a/core/src/test/resources/integration-test-files/types/points.adoc
+++ b/core/src/test/resources/integration-test-files/types/points.adoc
@@ -30,7 +30,7 @@ CALL {
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query Routes($id: String!) {
   routes(where: {id: $id}) {
@@ -49,7 +49,7 @@ query Routes($id: String!) {
 [source,json,request=true]
 ----
 {
-  "id": "dd320626-cc23-4938-9f33-ba624a3a3e8d"
+  "id" : "dd320626-cc23-4938-9f33-ba624a3a3e8d"
 }
 ----
 
@@ -57,7 +57,7 @@ query Routes($id: String!) {
 [source,json]
 ----
 {
-  "param0": "dd320626-cc23-4938-9f33-ba624a3a3e8d"
+  "param0" : "dd320626-cc23-4938-9f33-ba624a3a3e8d"
 }
 ----
 
@@ -81,57 +81,44 @@ RETURN this {
 [source,json,response=true,ignore-order]
 ----
 {
-  "routes": [
-    {
-      "id": "dd320626-cc23-4938-9f33-ba624a3a3e8d",
-      "waypoints": [
-        {
-          "latitude": -54.6132,
-          "longitude": 146.1568,
-          "height": 0.03157347836531699,
-          "crs": "wgs-84-3d"
-        },
-        {
-          "latitude": -54.6132,
-          "longitude": 146.1568,
-          "height": 0.03157347836531699,
-          "crs": "wgs-84-3d"
-        },
-        {
-          "latitude": -54.6132,
-          "longitude": 146.1568,
-          "height": 0.03157347836531699,
-          "crs": "wgs-84-3d"
-        },
-        {
-          "latitude": -54.6132,
-          "longitude": 146.1568,
-          "height": 0.03157347836531699,
-          "crs": "wgs-84-3d"
-        },
-        {
-          "latitude": -54.6132,
-          "longitude": 146.1568,
-          "height": 0.03157347836531699,
-          "crs": "wgs-84-3d"
-        },
-        {
-          "latitude": -54.6132,
-          "longitude": 146.1568,
-          "height": 0.03157347836531699,
-          "crs": "wgs-84-3d"
-        },
-        {
-          "latitude": -54.6132,
-          "longitude": 146.1568,
-          "height": 0.03157347836531699,
-          "crs": "wgs-84-3d"
-        }
-      ]
-    }
-  ]
+  "routes" : [ {
+    "id" : "dd320626-cc23-4938-9f33-ba624a3a3e8d",
+    "waypoints" : [ {
+      "latitude" : -54.6132,
+      "longitude" : 146.1568,
+      "height" : 0.03157347836531699,
+      "crs" : "wgs-84-3d"
+    }, {
+      "latitude" : -54.6132,
+      "longitude" : 146.1568,
+      "height" : 0.03157347836531699,
+      "crs" : "wgs-84-3d"
+    }, {
+      "latitude" : -54.6132,
+      "longitude" : 146.1568,
+      "height" : 0.03157347836531699,
+      "crs" : "wgs-84-3d"
+    }, {
+      "latitude" : -54.6132,
+      "longitude" : 146.1568,
+      "height" : 0.03157347836531699,
+      "crs" : "wgs-84-3d"
+    }, {
+      "latitude" : -54.6132,
+      "longitude" : 146.1568,
+      "height" : 0.03157347836531699,
+      "crs" : "wgs-84-3d"
+    }, {
+      "latitude" : -54.6132,
+      "longitude" : 146.1568,
+      "height" : 0.03157347836531699,
+      "crs" : "wgs-84-3d"
+    }, {
+      "latitude" : -54.6132,
+      "longitude" : 146.1568,
+      "height" : 0.03157347836531699,
+      "crs" : "wgs-84-3d"
+    } ]
+  } ]
 }
 ----
-
-'''
-
diff --git a/core/src/test/resources/integration-test-files/types/points.js.adoc b/core/src/test/resources/integration-test-files/types/points.js.adoc
new file mode 100644
index 00000000..4e5b26a5
--- /dev/null
+++ b/core/src/test/resources/integration-test-files/types/points.js.adoc
@@ -0,0 +1,130 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= [Point]
+
+== Setup
+
+.Schema
+[source,graphql,schema=true]
+----
+type Route {
+  id: String!
+  waypoints: [Point!]!
+}
+----
+
+== enables query of a node with multiple wgs-84-3d points
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CALL {
+ CREATE (r:Route)
+ SET r.id = "dd320626-cc23-4938-9f33-ba624a3a3e8d"
+ SET r.waypoints = [p in [{longitude: 146.1568, latitude: -54.6132, height: 0.03157347836531699}, {longitude: 146.1568, latitude: -54.6132, height: 0.03157347836531699}, {longitude: 146.1568, latitude: -54.6132, height: 0.03157347836531699}, {longitude: 146.1568, latitude: -54.6132, height: 0.03157347836531699}, {longitude: 146.1568, latitude: -54.6132, height: 0.03157347836531699}, {longitude: 146.1568, latitude: -54.6132, height: 0.03157347836531699}, {longitude: 146.1568, latitude: -54.6132, height: 0.03157347836531699}] | point(p)]
+ RETURN r
+ }
+
+ RETURN r { .id, .waypoints } AS r
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+query Routes($id: String!) {
+  routes(where: {id: $id}) {
+    id
+    waypoints {
+      latitude
+      longitude
+      height
+      crs
+    }
+  }
+}
+----
+
+.GraphQL params input
+[source,json,request=true]
+----
+{
+  "id": "dd320626-cc23-4938-9f33-ba624a3a3e8d"
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "dd320626-cc23-4938-9f33-ba624a3a3e8d"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Route)
+WHERE this.id = $param0
+RETURN this { .id, waypoints: CASE
+    WHEN this.waypoints IS NOT NULL THEN [var0 IN this.waypoints | { point: var0, crs: var0.crs }]
+    ELSE NULL
+END } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "routes": [
+    {
+      "id": "dd320626-cc23-4938-9f33-ba624a3a3e8d",
+      "waypoints": [
+        {
+          "latitude": -54.6132,
+          "longitude": 146.1568,
+          "height": 0.03157347836531699,
+          "crs": "wgs-84-3d"
+        },
+        {
+          "latitude": -54.6132,
+          "longitude": 146.1568,
+          "height": 0.03157347836531699,
+          "crs": "wgs-84-3d"
+        },
+        {
+          "latitude": -54.6132,
+          "longitude": 146.1568,
+          "height": 0.03157347836531699,
+          "crs": "wgs-84-3d"
+        },
+        {
+          "latitude": -54.6132,
+          "longitude": 146.1568,
+          "height": 0.03157347836531699,
+          "crs": "wgs-84-3d"
+        },
+        {
+          "latitude": -54.6132,
+          "longitude": 146.1568,
+          "height": 0.03157347836531699,
+          "crs": "wgs-84-3d"
+        },
+        {
+          "latitude": -54.6132,
+          "longitude": 146.1568,
+          "height": 0.03157347836531699,
+          "crs": "wgs-84-3d"
+        },
+        {
+          "latitude": -54.6132,
+          "longitude": 146.1568,
+          "height": 0.03157347836531699,
+          "crs": "wgs-84-3d"
+        }
+      ]
+    }
+  ]
+}
+----
diff --git a/core/src/test/resources/integration-test-files/types/time.adoc b/core/src/test/resources/integration-test-files/types/time.adoc
index b0b14804..1c727237 100644
--- a/core/src/test/resources/integration-test-files/types/time.adoc
+++ b/core/src/test/resources/integration-test-files/types/time.adoc
@@ -26,7 +26,7 @@ CREATE (movie:Movie)
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query ($time: Time!) {
   movies(where: {time: $time}) {
@@ -40,7 +40,7 @@ query ($time: Time!) {
 [source,json,request=true]
 ----
 {
-  "time": "11:49:48.322Z"
+  "time" : "11:49:48.322Z"
 }
 ----
 
@@ -74,8 +74,6 @@ RETURN this {
 }
 ----
 
-'''
-
 === should filter based on time comparison for filter: LT
 
 .Test Data
@@ -90,7 +88,7 @@ CREATE (future:Movie)
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query ($where: MovieWhere!) {
   movies(where: $where, options: {sort: [{time: ASC}]}) {
@@ -104,13 +102,9 @@ query ($where: MovieWhere!) {
 [source,json,request=true]
 ----
 {
-  "where": {
-    "id_IN": [
-      "RandomString1",
-      "RandomString2",
-      "RandomString3"
-    ],
-    "time_LT": "12:00:00"
+  "where" : {
+    "id_IN" : [ "RandomString1", "RandomString2", "RandomString3" ],
+    "time_LT" : "12:00:00"
   }
 }
 ----
@@ -148,8 +142,6 @@ RETURN this {
 }
 ----
 
-'''
-
 === should filter based on time comparison for filter: LTE
 
 .Test Data
@@ -164,7 +156,7 @@ CREATE (future:Movie)
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query ($where: MovieWhere!) {
   movies(where: $where, options: {sort: [{time: ASC}]}) {
@@ -178,13 +170,9 @@ query ($where: MovieWhere!) {
 [source,json,request=true]
 ----
 {
-  "where": {
-    "id_IN": [
-      "RandomString1",
-      "RandomString2",
-      "RandomString3"
-    ],
-    "time_LTE": "12:00:00"
+  "where" : {
+    "id_IN" : [ "RandomString1", "RandomString2", "RandomString3" ],
+    "time_LTE" : "12:00:00"
   }
 }
 ----
@@ -225,8 +213,6 @@ RETURN this {
 }
 ----
 
-'''
-
 === should filter based on time comparison for filter: GT
 
 .Test Data
@@ -241,7 +227,7 @@ CREATE (future:Movie)
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query ($where: MovieWhere!) {
   movies(where: $where, options: {sort: [{time: ASC}]}) {
@@ -255,13 +241,9 @@ query ($where: MovieWhere!) {
 [source,json,request=true]
 ----
 {
-  "where": {
-    "id_IN": [
-      "RandomString1",
-      "RandomString2",
-      "RandomString3"
-    ],
-    "time_GT": "12:00:00"
+  "where" : {
+    "id_IN" : [ "RandomString1", "RandomString2", "RandomString3" ],
+    "time_GT" : "12:00:00"
   }
 }
 ----
@@ -299,8 +281,6 @@ RETURN this {
 }
 ----
 
-'''
-
 === should filter based on time comparison for filter: GTE
 
 .Test Data
@@ -315,7 +295,7 @@ CREATE (future:Movie)
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query ($where: MovieWhere!) {
   movies(where: $where, options: {sort: [{time: ASC}]}) {
@@ -329,13 +309,9 @@ query ($where: MovieWhere!) {
 [source,json,request=true]
 ----
 {
-  "where": {
-    "id_IN": [
-      "RandomString1",
-      "RandomString2",
-      "RandomString3"
-    ],
-    "time_GTE": "12:00:00"
+  "where" : {
+    "id_IN" : [ "RandomString1", "RandomString2", "RandomString3" ],
+    "time_GTE" : "12:00:00"
   }
 }
 ----
@@ -376,8 +352,6 @@ RETURN this {
 }
 ----
 
-'''
-
 == sorting
 
 === Setup
@@ -405,7 +379,7 @@ CREATE (future:Movie)
 === should sort based on time, sorted by: ASC
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query ($futureId: ID!, $presentId: ID!, $pastId: ID!, $sort: SortDirection!) {
   movies(
@@ -422,10 +396,10 @@ query ($futureId: ID!, $presentId: ID!, $pastId: ID!, $sort: SortDirection!) {
 [source,json,request=true]
 ----
 {
-  "futureId": "RandomString1",
-  "presentId": "RandomString2",
-  "pastId": "RandomString3",
-  "sort": "ASC"
+  "futureId" : "RandomString1",
+  "pastId" : "RandomString3",
+  "presentId" : "RandomString2",
+  "sort" : "ASC"
 }
 ----
 
@@ -433,11 +407,7 @@ query ($futureId: ID!, $presentId: ID!, $pastId: ID!, $sort: SortDirection!) {
 [source,json]
 ----
 {
-  "param0": [
-    "RandomString1",
-    "RandomString2",
-    "RandomString3"
-  ]
+  "param0" : [ "RandomString1", "RandomString2", "RandomString3" ]
 }
 ----
 
@@ -470,12 +440,10 @@ RETURN this {
 }
 ----
 
-'''
-
 === should sort based on time, sorted by: DESC
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query ($futureId: ID!, $presentId: ID!, $pastId: ID!, $sort: SortDirection!) {
   movies(
@@ -492,10 +460,10 @@ query ($futureId: ID!, $presentId: ID!, $pastId: ID!, $sort: SortDirection!) {
 [source,json,request=true]
 ----
 {
-  "futureId": "RandomString1",
-  "presentId": "RandomString2",
-  "pastId": "RandomString3",
-  "sort": "DESC"
+  "futureId" : "RandomString1",
+  "pastId" : "RandomString3",
+  "presentId" : "RandomString2",
+  "sort" : "DESC"
 }
 ----
 
@@ -503,11 +471,7 @@ query ($futureId: ID!, $presentId: ID!, $pastId: ID!, $sort: SortDirection!) {
 [source,json]
 ----
 {
-  "param0": [
-    "RandomString1",
-    "RandomString2",
-    "RandomString3"
-  ]
+  "param0" : [ "RandomString1", "RandomString2", "RandomString3" ]
 }
 ----
 
@@ -539,6 +503,3 @@ RETURN this {
   } ]
 }
 ----
-
-'''
-
diff --git a/core/src/test/resources/integration-test-files/types/time.js.adoc b/core/src/test/resources/integration-test-files/types/time.js.adoc
new file mode 100644
index 00000000..bdbfe01f
--- /dev/null
+++ b/core/src/test/resources/integration-test-files/types/time.js.adoc
@@ -0,0 +1,547 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= Time
+
+== filter
+
+=== Setup
+
+.Schema
+[source,graphql,schema=true]
+----
+type Movie {
+  id: ID!
+  time: Time!
+}
+----
+
+=== should filter based on time equality
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (movie:Movie)
+ SET movie = {id: "RandomString1", time: time("11:49:48.322000000Z")}
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+query ($time: Time!) {
+  movies(where: {time: $time}) {
+    id
+    time
+  }
+}
+----
+
+.GraphQL params input
+[source,json,request=true]
+----
+{
+  "time": "11:49:48.322Z"
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "11:49:48.322000000Z"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE this.time = $param0
+RETURN this { .id, .time } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "movies": [
+    {
+      "id": "RandomString1",
+      "time": "11:49:48.322000000Z"
+    }
+  ]
+}
+----
+
+=== should filter based on time comparison for filter: LT
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (future:Movie)
+ SET future = {id: "RandomString1", time: time("13:00:00Z")}
+ CREATE (present:Movie)
+ SET present = {id: "RandomString2", time: time("12:00:00Z")}
+ CREATE (past:Movie)
+ SET past = {id: "RandomString3", time: time("11:00:00Z")}
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+query ($where: MovieWhere!) {
+  movies(where: $where, options: {sort: [{time: ASC}]}) {
+    id
+    time
+  }
+}
+----
+
+.GraphQL params input
+[source,json,request=true]
+----
+{
+  "where": {
+    "id_IN": [
+      "RandomString1",
+      "RandomString2",
+      "RandomString3"
+    ],
+    "time_LT": "12:00:00"
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": [
+    "RandomString1",
+    "RandomString2",
+    "RandomString3"
+  ],
+  "param1": "12:00:00Z"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE (this.id IN $param0 AND this.time < $param1)
+WITH *
+ORDER BY this.time ASC
+RETURN this { .id, .time } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "movies": [
+    {
+      "id": "RandomString3",
+      "time": "11:00:00Z"
+    }
+  ]
+}
+----
+
+=== should filter based on time comparison for filter: LTE
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (future:Movie)
+ SET future = {id: "RandomString1", time: time("13:00:00Z")}
+ CREATE (present:Movie)
+ SET present = {id: "RandomString2", time: time("12:00:00Z")}
+ CREATE (past:Movie)
+ SET past = {id: "RandomString3", time: time("11:00:00Z")}
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+query ($where: MovieWhere!) {
+  movies(where: $where, options: {sort: [{time: ASC}]}) {
+    id
+    time
+  }
+}
+----
+
+.GraphQL params input
+[source,json,request=true]
+----
+{
+  "where": {
+    "id_IN": [
+      "RandomString1",
+      "RandomString2",
+      "RandomString3"
+    ],
+    "time_LTE": "12:00:00"
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": [
+    "RandomString1",
+    "RandomString2",
+    "RandomString3"
+  ],
+  "param1": "12:00:00Z"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE (this.id IN $param0 AND this.time <= $param1)
+WITH *
+ORDER BY this.time ASC
+RETURN this { .id, .time } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "movies": [
+    {
+      "id": "RandomString3",
+      "time": "11:00:00Z"
+    },
+    {
+      "id": "RandomString2",
+      "time": "12:00:00Z"
+    }
+  ]
+}
+----
+
+=== should filter based on time comparison for filter: GT
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (future:Movie)
+ SET future = {id: "RandomString1", time: time("13:00:00Z")}
+ CREATE (present:Movie)
+ SET present = {id: "RandomString2", time: time("12:00:00Z")}
+ CREATE (past:Movie)
+ SET past = {id: "RandomString3", time: time("11:00:00Z")}
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+query ($where: MovieWhere!) {
+  movies(where: $where, options: {sort: [{time: ASC}]}) {
+    id
+    time
+  }
+}
+----
+
+.GraphQL params input
+[source,json,request=true]
+----
+{
+  "where": {
+    "id_IN": [
+      "RandomString1",
+      "RandomString2",
+      "RandomString3"
+    ],
+    "time_GT": "12:00:00"
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": [
+    "RandomString1",
+    "RandomString2",
+    "RandomString3"
+  ],
+  "param1": "12:00:00Z"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE (this.id IN $param0 AND this.time > $param1)
+WITH *
+ORDER BY this.time ASC
+RETURN this { .id, .time } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "movies": [
+    {
+      "id": "RandomString1",
+      "time": "13:00:00Z"
+    }
+  ]
+}
+----
+
+=== should filter based on time comparison for filter: GTE
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (future:Movie)
+ SET future = {id: "RandomString1", time: time("13:00:00Z")}
+ CREATE (present:Movie)
+ SET present = {id: "RandomString2", time: time("12:00:00Z")}
+ CREATE (past:Movie)
+ SET past = {id: "RandomString3", time: time("11:00:00Z")}
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+query ($where: MovieWhere!) {
+  movies(where: $where, options: {sort: [{time: ASC}]}) {
+    id
+    time
+  }
+}
+----
+
+.GraphQL params input
+[source,json,request=true]
+----
+{
+  "where": {
+    "id_IN": [
+      "RandomString1",
+      "RandomString2",
+      "RandomString3"
+    ],
+    "time_GTE": "12:00:00"
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": [
+    "RandomString1",
+    "RandomString2",
+    "RandomString3"
+  ],
+  "param1": "12:00:00Z"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE (this.id IN $param0 AND this.time >= $param1)
+WITH *
+ORDER BY this.time ASC
+RETURN this { .id, .time } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "movies": [
+    {
+      "id": "RandomString2",
+      "time": "12:00:00Z"
+    },
+    {
+      "id": "RandomString1",
+      "time": "13:00:00Z"
+    }
+  ]
+}
+----
+
+== sorting
+
+=== Setup
+
+.Schema
+[source,graphql,schema=true]
+----
+type Movie {
+  id: ID!
+  time: Time!
+}
+----
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (future:Movie)
+ SET future = {id: "RandomString1", time: time("13:00:00Z")}
+ CREATE (present:Movie)
+ SET present = {id: "RandomString2", time: time("12:00:00Z")}
+ CREATE (past:Movie)
+ SET past = {id: "RandomString3", time: time("11:00:00Z")}
+----
+
+=== should sort based on time, sorted by: ASC
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+query ($futureId: ID!, $presentId: ID!, $pastId: ID!, $sort: SortDirection!) {
+  movies(
+    where: {id_IN: [$futureId, $presentId, $pastId]}
+    options: {sort: [{time: $sort}]}
+  ) {
+    id
+    time
+  }
+}
+----
+
+.GraphQL params input
+[source,json,request=true]
+----
+{
+  "futureId": "RandomString1",
+  "presentId": "RandomString2",
+  "pastId": "RandomString3",
+  "sort": "ASC"
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": [
+    "RandomString1",
+    "RandomString2",
+    "RandomString3"
+  ]
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE this.id IN $param0
+WITH *
+ORDER BY this.time ASC
+RETURN this { .id, .time } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "movies": [
+    {
+      "id": "RandomString3",
+      "time": "11:00:00Z"
+    },
+    {
+      "id": "RandomString2",
+      "time": "12:00:00Z"
+    },
+    {
+      "id": "RandomString1",
+      "time": "13:00:00Z"
+    }
+  ]
+}
+----
+
+=== should sort based on time, sorted by: DESC
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+query ($futureId: ID!, $presentId: ID!, $pastId: ID!, $sort: SortDirection!) {
+  movies(
+    where: {id_IN: [$futureId, $presentId, $pastId]}
+    options: {sort: [{time: $sort}]}
+  ) {
+    id
+    time
+  }
+}
+----
+
+.GraphQL params input
+[source,json,request=true]
+----
+{
+  "futureId": "RandomString1",
+  "presentId": "RandomString2",
+  "pastId": "RandomString3",
+  "sort": "DESC"
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": [
+    "RandomString1",
+    "RandomString2",
+    "RandomString3"
+  ]
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE this.id IN $param0
+WITH *
+ORDER BY this.time DESC
+RETURN this { .id, .time } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "movies": [
+    {
+      "id": "RandomString1",
+      "time": "13:00:00Z"
+    },
+    {
+      "id": "RandomString2",
+      "time": "12:00:00Z"
+    },
+    {
+      "id": "RandomString3",
+      "time": "11:00:00Z"
+    }
+  ]
+}
+----
diff --git a/core/src/test/resources/integration-test-files/home/andreas/projects/neo4j-graphql/packages/graphql/tests/integration/undirected-relationships.test.ts.adoc b/core/src/test/resources/integration-test-files/undirected-relationships.adoc
similarity index 85%
rename from core/src/test/resources/integration-test-files/home/andreas/projects/neo4j-graphql/packages/graphql/tests/integration/undirected-relationships.test.ts.adoc
rename to core/src/test/resources/integration-test-files/undirected-relationships.adoc
index 98fca6b2..3a411e93 100644
--- a/core/src/test/resources/integration-test-files/home/andreas/projects/neo4j-graphql/packages/graphql/tests/integration/undirected-relationships.test.ts.adoc
+++ b/core/src/test/resources/integration-test-files/undirected-relationships.adoc
@@ -23,7 +23,7 @@ CREATE (a:User {name: "Arthur"})
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   users(where: {name: "Ford"}) {
@@ -42,7 +42,7 @@ CREATE (a:User {name: "Arthur"})
 [source,json]
 ----
 {
-  "param0": "Ford"
+  "param0" : "Ford"
 }
 ----
 
@@ -78,19 +78,12 @@ RETURN this {
 [source,json,response=true]
 ----
 {
-  "users": [
-    {
-      "name": "Ford",
-      "friends": [
-        {
-          "name": "Arthur"
-        }
-      ],
-      "directedFriends": []
-    }
-  ]
+  "users" : [ {
+    "name" : "Ford",
+    "friends" : [ {
+      "name" : "Arthur"
+    } ],
+    "directedFriends" : [ ]
+  } ]
 }
 ----
-
-'''
-
diff --git a/core/src/test/resources/integration-test-files/undirected-relationships.js.adoc b/core/src/test/resources/integration-test-files/undirected-relationships.js.adoc
new file mode 100644
index 00000000..817a5426
--- /dev/null
+++ b/core/src/test/resources/integration-test-files/undirected-relationships.js.adoc
@@ -0,0 +1,86 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= undirected relationships
+
+== query for an undirected relationship
+
+.Schema
+[source,graphql,schema=true]
+----
+type User {
+  name: String!
+  friends: [User!]! @relationship(type: "FRIENDS_WITH", direction: OUT)
+}
+----
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (a:User {name: "Arthur"})
+ CREATE (b:User {name: "Ford"})
+ CREATE (a)-[:FRIENDS_WITH]->(b)
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  users(where: {name: "Ford"}) {
+    name
+    friends: friends(directed: false) {
+      name
+    }
+    directedFriends: friends(directed: true) {
+      name
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "Ford"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:User)
+WHERE this.name = $param0
+CALL {
+    WITH this
+    MATCH (this)-[this0:FRIENDS_WITH]-(this1:User)
+    WITH this1 { .name } AS this1
+    RETURN collect(this1) AS var2
+}
+CALL {
+    WITH this
+    MATCH (this)-[this3:FRIENDS_WITH]->(this4:User)
+    WITH this4 { .name } AS this4
+    RETURN collect(this4) AS var5
+}
+RETURN this { .name, friends: var2, directedFriends: var5 } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "users": [
+    {
+      "name": "Ford",
+      "friends": [
+        {
+          "name": "Arthur"
+        }
+      ],
+      "directedFriends": []
+    }
+  ]
+}
+----
diff --git a/core/src/test/resources/integration-test-files/unions/union-relationship-filtering.adoc b/core/src/test/resources/integration-test-files/unions/union-relationship-filtering.adoc
index 77df3428..a89e0200 100644
--- a/core/src/test/resources/integration-test-files/unions/union-relationship-filtering.adoc
+++ b/core/src/test/resources/integration-test-files/unions/union-relationship-filtering.adoc
@@ -53,7 +53,7 @@ CREATE(m1:Movie { title: "The Office" })
 == allow for filtering on top-level union relationships
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   productions(
@@ -73,8 +73,8 @@ CREATE(m1:Movie { title: "The Office" })
 [source,json]
 ----
 {
-  "param0": "The Office",
-  "param1": "The Office 2"
+  "param0" : "The Office",
+  "param1" : "The Office 2"
 }
 ----
 
@@ -107,23 +107,18 @@ RETURN this AS this
 [source,json,response=true,ignore-order]
 ----
 {
-  "productions": [
-    {
-      "title": "The Office"
-    },
-    {
-      "title": "The Office 2"
-    }
-  ]
+  "productions" : [ {
+    "title" : "The Office"
+  }, {
+    "title" : "The Office 2"
+  } ]
 }
 ----
 
-'''
-
 == allow for filtering on nested-level relationship unions
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   actors(where: {actedIn_SOME: {Movie: {title_CONTAINS: "Office"}}}) {
@@ -136,7 +131,7 @@ RETURN this AS this
 [source,json]
 ----
 {
-  "param0": "Office"
+  "param0" : "Office"
 }
 ----
 
@@ -157,16 +152,10 @@ RETURN this {
 [source,json,response=true,ignore-order]
 ----
 {
-  "actors": [
-    {
-      "name": "Michael"
-    },
-    {
-      "name": "Keanu"
-    }
-  ]
+  "actors" : [ {
+    "name" : "Michael"
+  }, {
+    "name" : "Keanu"
+  } ]
 }
 ----
-
-'''
-
diff --git a/core/src/test/resources/integration-test-files/unions/union-relationship-filtering.js.adoc b/core/src/test/resources/integration-test-files/unions/union-relationship-filtering.js.adoc
new file mode 100644
index 00000000..dc78e4a0
--- /dev/null
+++ b/core/src/test/resources/integration-test-files/unions/union-relationship-filtering.js.adoc
@@ -0,0 +1,159 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= Union filtering
+
+== Setup
+
+.Schema
+[source,graphql,schema=true]
+----
+union Production = Movie | Series
+
+type Movie {
+  title: String!
+  actors: [Actor!]! @relationship(type: "ACTED_IN", direction: IN, properties: "ActedIn")
+}
+
+type Series {
+  title: String!
+  actors: [Actor!]! @relationship(type: "ACTED_IN", direction: IN, properties: "ActedIn")
+}
+
+type Actor {
+  name: String!
+  actedIn: [Production!]! @relationship(type: "ACTED_IN", direction: OUT, properties: "ActedIn")
+}
+
+type ActedIn @relationshipProperties {
+  screenTime: Int!
+}
+----
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE(m1:Movie { title: "The Office" })
+ CREATE(m2:Movie { title: "The Office 2" })
+ CREATE(m3:Movie { title: "NOT The Office 2" })
+ CREATE(s1:Series { title: "The Office 2" })
+ CREATE(s2:Series { title: "NOT The Office" })
+ CREATE(a1:Actor {name: "Keanu"})
+ CREATE(a2:Actor {name: "Michael"})
+ CREATE(a3:Actor {name: "John"})
+ MERGE(a1)-[:ACTED_IN]->(m1)
+ MERGE(a1)-[:ACTED_IN]->(s2)
+ MERGE(a2)-[:ACTED_IN]->(m2)
+ MERGE(a2)-[:ACTED_IN]->(m3)
+ MERGE(a2)-[:ACTED_IN]->(s1)
+ MERGE(a3)-[:ACTED_IN]->(s1)
+ MERGE(a3)-[:ACTED_IN]->(s2)
+----
+
+== allow for filtering on top-level union relationships
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  productions(
+    where: {Movie: {title: "The Office"}, Series: {title: "The Office 2"}}
+  ) {
+    ... on Movie {
+      title
+    }
+    ... on Series {
+      title
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "The Office",
+  "param1": "The Office 2"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+CALL {
+    MATCH (this0:Movie)
+    WHERE this0.title = $param0
+    WITH this0 { .title, __typename: "Movie", __id: toString(id(this0)) } AS this0
+    RETURN this0 AS this
+    UNION
+    MATCH (this1:Series)
+    WHERE this1.title = $param1
+    WITH this1 { .title, __typename: "Series", __id: toString(id(this1)) } AS this1
+    RETURN this1 AS this
+}
+WITH this
+RETURN this AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "productions": [
+    {
+      "title": "The Office"
+    },
+    {
+      "title": "The Office 2"
+    }
+  ]
+}
+----
+
+== allow for filtering on nested-level relationship unions
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  actors(where: {actedIn_SOME: {Movie: {title_CONTAINS: "Office"}}}) {
+    name
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "Office"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Actor)
+WHERE EXISTS {
+    MATCH (this)-[:ACTED_IN]->(this0:Movie)
+    WHERE this0.title CONTAINS $param0
+}
+RETURN this { .name } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "actors": [
+    {
+      "name": "Keanu"
+    },
+    {
+      "name": "Michael"
+    }
+  ]
+}
+----
diff --git a/core/src/test/resources/integration-test-files/unions/unions-top-level.adoc b/core/src/test/resources/integration-test-files/unions/unions-top-level.adoc
index baa6749b..84fb5fb6 100644
--- a/core/src/test/resources/integration-test-files/unions/unions-top-level.adoc
+++ b/core/src/test/resources/integration-test-files/unions/unions-top-level.adoc
@@ -1,9 +1,9 @@
 :toc:
 :toclevels: 42
 
-== Top-level union query fields
+= Top-level union query fields
 
-=== Setup
+== Setup
 
 .Schema
 [source,graphql,schema=true]
@@ -29,10 +29,10 @@ CREATE (m:Movie {title: "The Matrix"})
  MERGE (m)-[:SEARCH]->(g)
 ----
 
-=== should read top-level simple query on union
+== should read top-level simple query on union
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   searches {
@@ -54,7 +54,7 @@ CREATE (m:Movie {title: "The Matrix"})
 .Expected Cypher params
 [source,json]
 ----
-{}
+{ }
 ----
 
 .Expected Cypher output
@@ -107,29 +107,21 @@ RETURN this AS this
 [source,json,response=true,ignore-order]
 ----
 {
-  "searches": [
-    {
-      "name": "Action"
-    },
-    {
-      "title": "The Matrix",
-      "search": [
-        {
-          "name": "Action"
-        },
-        {}
-      ]
-    }
-  ]
+  "searches" : [ {
+    "name" : "Action"
+  }, {
+    "title" : "The Matrix",
+    "search" : [ {
+      "name" : "Action"
+    }, { } ]
+  } ]
 }
 ----
 
-'''
-
-=== should read top-level simple query on union sorted
+== should read top-level simple query on union sorted
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   searches(options: {limit: 1, offset: 1}) {
@@ -152,8 +144,8 @@ RETURN this AS this
 [source,json]
 ----
 {
-  "param0": 1,
-  "param1": 1
+  "param0" : 1,
+  "param1" : 1
 }
 ----
 
@@ -207,19 +199,11 @@ RETURN this AS this
 [source,json,response=true,ignore-order]
 ----
 {
-  "searches": [
-    {
-      "title": "The Matrix",
-      "search": [
-        {
-          "name": "Action"
-        },
-        {}
-      ]
-    }
-  ]
+  "searches" : [ {
+    "title" : "The Matrix",
+    "search" : [ {
+      "name" : "Action"
+    }, { } ]
+  } ]
 }
 ----
-
-'''
-
diff --git a/core/src/test/resources/integration-test-files/unions/unions-top-level.js.adoc b/core/src/test/resources/integration-test-files/unions/unions-top-level.js.adoc
new file mode 100644
index 00000000..59b42bb6
--- /dev/null
+++ b/core/src/test/resources/integration-test-files/unions/unions-top-level.js.adoc
@@ -0,0 +1,196 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= Top-level union query fields
+
+== Setup
+
+.Schema
+[source,graphql,schema=true]
+----
+union Search = Genre | Movie
+
+type Genre {
+  name: String
+}
+
+type Movie {
+  title: String
+  search: [Search!]! @relationship(type: "SEARCH", direction: OUT)
+}
+----
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (m:Movie {title: "The Matrix"})
+ CREATE (g:Genre {name: "Action"})
+ MERGE (m)-[:SEARCH]->(m)
+ MERGE (m)-[:SEARCH]->(g)
+----
+
+== should read top-level simple query on union
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  searches {
+    ... on Genre {
+      name
+    }
+    ... on Movie {
+      title
+      search {
+        ... on Genre {
+          name
+        }
+      }
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+CALL {
+    MATCH (this0:Genre)
+    WITH this0 { .name, __typename: "Genre", __id: toString(id(this0)) } AS this0
+    RETURN this0 AS this
+    UNION
+    MATCH (this1:Movie)
+    CALL {
+        WITH this1
+        CALL {
+            WITH *
+            MATCH (this1)-[this2:SEARCH]->(this3:Genre)
+            WITH this3 { .name, __typename: "Genre", __id: toString(id(this3)) } AS this3
+            RETURN this3 AS var4
+            UNION
+            WITH *
+            MATCH (this1)-[this5:SEARCH]->(this6:Movie)
+            WITH this6 { __typename: "Movie", __id: toString(id(this6)) } AS this6
+            RETURN this6 AS var4
+        }
+        WITH var4
+        RETURN collect(var4) AS var4
+    }
+    WITH this1 { .title, search: var4, __typename: "Movie", __id: toString(id(this1)) } AS this1
+    RETURN this1 AS this
+}
+WITH this
+RETURN this AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "searches": [
+    {
+      "name": "Action"
+    },
+    {
+      "title": "The Matrix",
+      "search": [
+        {
+          "name": "Action"
+        },
+        {}
+      ]
+    }
+  ]
+}
+----
+
+== should read top-level simple query on union sorted
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  searches(options: {limit: 1, offset: 1}) {
+    ... on Genre {
+      name
+    }
+    ... on Movie {
+      title
+      search {
+        ... on Genre {
+          name
+        }
+      }
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": 1,
+  "param1": 1
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+CALL {
+    MATCH (this0:Genre)
+    WITH this0 { .name, __typename: "Genre", __id: toString(id(this0)) } AS this0
+    RETURN this0 AS this
+    UNION
+    MATCH (this1:Movie)
+    CALL {
+        WITH this1
+        CALL {
+            WITH *
+            MATCH (this1)-[this2:SEARCH]->(this3:Genre)
+            WITH this3 { .name, __typename: "Genre", __id: toString(id(this3)) } AS this3
+            RETURN this3 AS var4
+            UNION
+            WITH *
+            MATCH (this1)-[this5:SEARCH]->(this6:Movie)
+            WITH this6 { __typename: "Movie", __id: toString(id(this6)) } AS this6
+            RETURN this6 AS var4
+        }
+        WITH var4
+        RETURN collect(var4) AS var4
+    }
+    WITH this1 { .title, search: var4, __typename: "Movie", __id: toString(id(this1)) } AS this1
+    RETURN this1 AS this
+}
+WITH this
+
+SKIP $param0
+LIMIT $param1
+RETURN this AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "searches": [
+    {
+      "title": "The Matrix",
+      "search": [
+        {
+          "name": "Action"
+        },
+        {}
+      ]
+    }
+  ]
+}
+----
diff --git a/core/src/test/resources/integration-test-files/unions/unions.adoc b/core/src/test/resources/integration-test-files/unions/unions.adoc
index 056b785c..ae20f0b5 100644
--- a/core/src/test/resources/integration-test-files/unions/unions.adoc
+++ b/core/src/test/resources/integration-test-files/unions/unions.adoc
@@ -30,7 +30,7 @@ CREATE (m:Movie {title: "RandomString1"})
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies {
@@ -46,7 +46,7 @@ CREATE (m:Movie {title: "RandomString1"})
 .Expected Cypher params
 [source,json]
 ----
-{}
+{ }
 ----
 
 .Expected Cypher output
@@ -84,21 +84,14 @@ RETURN this {
 [source,json,response=true,ignore-order]
 ----
 {
-  "movies": [
-    {
-      "search": [
-        {
-          "name": "RandomString2"
-        },
-        {}
-      ]
-    }
-  ]
+  "movies" : [ {
+    "search" : [ {
+      "name" : "RandomString2"
+    }, { } ]
+  } ]
 }
 ----
 
-'''
-
 == should read and return unions
 
 .Schema
@@ -126,7 +119,7 @@ CREATE (m:Movie {title: "RandomString1"})
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies(where: {title: "RandomString1"}) {
@@ -147,7 +140,7 @@ CREATE (m:Movie {title: "RandomString1"})
 [source,json]
 ----
 {
-  "param0": "RandomString1"
+  "param0" : "RandomString1"
 }
 ----
 
@@ -188,25 +181,18 @@ RETURN this {
 [source,json,response=true,ignore-order]
 ----
 {
-  "movies": [
-    {
-      "search": [
-        {
-          "__typename": "Genre",
-          "name": "RandomString2"
-        },
-        {
-          "__typename": "Movie",
-          "title": "RandomString1"
-        }
-      ]
-    }
-  ]
+  "movies" : [ {
+    "search" : [ {
+      "__typename" : "Genre",
+      "name" : "RandomString2"
+    }, {
+      "__typename" : "Movie",
+      "title" : "RandomString1"
+    } ]
+  } ]
 }
 ----
 
-'''
-
 == should read and return correct union members with where argument
 
 .Schema
@@ -236,7 +222,7 @@ CREATE (m:Movie {title: "RandomString1"})
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies(where: {title: "RandomString1"}) {
@@ -257,8 +243,8 @@ CREATE (m:Movie {title: "RandomString1"})
 [source,json]
 ----
 {
-  "param0": "RandomString1",
-  "param1": "RandomString2"
+  "param0" : "RandomString1",
+  "param1" : "RandomString2"
 }
 ----
 
@@ -268,39 +254,39 @@ CREATE (m:Movie {title: "RandomString1"})
 MATCH (this:Movie)
 WHERE this.title = $param0
 CALL {
-    WITH this
-    CALL {
-        WITH *
-        MATCH (this)-[this0:SEARCH]->(this1:Genre)
-        WHERE this1.name = $param1
-        WITH this1 { .name, __typename: "Genre", __id: toString(id(this1)) } AS this1
-        RETURN this1 AS var2
-    }
-    WITH var2
-    RETURN collect(var2) AS var2
+	WITH this
+	CALL {
+		WITH *
+		MATCH (this)-[this0:SEARCH]->(this1:Genre)
+		WHERE this1.name = $param1
+		WITH this1 {
+			.name,
+			__typename: 'Genre',
+			__id: toString(id(this1))
+		} AS this1
+		RETURN this1 AS var2
+	}
+	WITH var2
+	RETURN collect(var2) AS var2
 }
-RETURN this { search: var2 } AS this
+RETURN this {
+	search: var2
+} AS this
 ----
 
 .GraphQL-Response
 [source,json,response=true]
 ----
 {
-  "movies": [
-    {
-      "search": [
-        {
-          "__typename": "Genre",
-          "name": "RandomString2"
-        }
-      ]
-    }
-  ]
+  "movies" : [ {
+    "search" : [ {
+      "__typename" : "Genre",
+      "name" : "RandomString2"
+    } ]
+  } ]
 }
 ----
 
-'''
-
 == should read and return unions with sort and limit
 
 .Schema
@@ -333,7 +319,7 @@ CREATE (m:Movie {title: "originalMovie"})
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies(where: {title: "originalMovie"}) {
@@ -353,9 +339,9 @@ CREATE (m:Movie {title: "originalMovie"})
 [source,json]
 ----
 {
-  "param0": "originalMovie",
-  "param1": 1,
-  "param2": 3
+  "param0" : "originalMovie",
+  "param1" : 1,
+  "param2" : 3
 }
 ----
 
@@ -392,27 +378,12 @@ RETURN this {
 } AS this
 ----
 
-.GraphQL-Response
-[source,json,response=true,ignore-order]
-----
-{
-  "movies": [
-    {
-      "search": [
-        {
-          "name": "genre1"
-        },
-        {
-          "title": "movie1"
-        },
-        {
-          "title": "movie2"
-        }
-      ]
-    }
-  ]
-}
-----
-
-'''
-
+.GraphQL-Response Assertions
+[%header,format=csv,response=true]
+|===
+Path,Condition,Expected Value
+movies.size(),==,1
+movies[0].search.size(),==,3
+length($.movies[0].search[?(@.name)]),>=,1
+length($.movies[0].search[?(@.title)]),>=,1
+|===
diff --git a/core/src/test/resources/integration-test-files/unions/unions.js.adoc b/core/src/test/resources/integration-test-files/unions/unions.js.adoc
new file mode 100644
index 00000000..8694a121
--- /dev/null
+++ b/core/src/test/resources/integration-test-files/unions/unions.js.adoc
@@ -0,0 +1,387 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= unions
+
+== read Unions with missing types
+
+.Schema
+[source,graphql,schema=true]
+----
+union Search = Genre | Movie
+
+type Genre {
+  name: String
+}
+
+type Movie {
+  title: String
+  search: [Search!]! @relationship(type: "SEARCH", direction: OUT)
+}
+----
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (m:Movie {title: "RandomString1"})
+ CREATE (g:Genre {name: "RandomString2"})
+ MERGE (m)-[:SEARCH]->(m)
+ MERGE (m)-[:SEARCH]->(g)
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies {
+    search {
+      ... on Genre {
+        name
+      }
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+CALL {
+    WITH this
+    CALL {
+        WITH *
+        MATCH (this)-[this0:SEARCH]->(this1:Genre)
+        WITH this1 { .name, __typename: "Genre", __id: toString(id(this1)) } AS this1
+        RETURN this1 AS var2
+        UNION
+        WITH *
+        MATCH (this)-[this3:SEARCH]->(this4:Movie)
+        WITH this4 { __typename: "Movie", __id: toString(id(this4)) } AS this4
+        RETURN this4 AS var2
+    }
+    WITH var2
+    RETURN collect(var2) AS var2
+}
+RETURN this { search: var2 } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "movies": [
+    {
+      "search": [
+        {
+          "name": "RandomString2"
+        },
+        {}
+      ]
+    }
+  ]
+}
+----
+
+== should read and return unions
+
+.Schema
+[source,graphql,schema=true]
+----
+union Search = Genre | Movie
+
+type Genre {
+  name: String
+}
+
+type Movie {
+  title: String
+  search: [Search!]! @relationship(type: "SEARCH", direction: OUT)
+}
+----
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (m:Movie {title: "RandomString1"})
+ CREATE (g:Genre {name: "RandomString2"})
+ MERGE (m)-[:SEARCH]->(m)
+ MERGE (m)-[:SEARCH]->(g)
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies(where: {title: "RandomString1"}) {
+    search {
+      __typename
+      ... on Movie {
+        title
+      }
+      ... on Genre {
+        name
+      }
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "RandomString1"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE this.title = $param0
+CALL {
+    WITH this
+    CALL {
+        WITH *
+        MATCH (this)-[this0:SEARCH]->(this1:Genre)
+        WITH this1 { .name, __typename: "Genre", __id: toString(id(this1)) } AS this1
+        RETURN this1 AS var2
+        UNION
+        WITH *
+        MATCH (this)-[this3:SEARCH]->(this4:Movie)
+        WITH this4 { .title, __typename: "Movie", __id: toString(id(this4)) } AS this4
+        RETURN this4 AS var2
+    }
+    WITH var2
+    RETURN collect(var2) AS var2
+}
+RETURN this { search: var2 } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "movies": [
+    {
+      "search": [
+        {
+          "__typename": "Genre",
+          "name": "RandomString2"
+        },
+        {
+          "__typename": "Movie",
+          "title": "RandomString1"
+        }
+      ]
+    }
+  ]
+}
+----
+
+== should read and return correct union members with where argument
+
+.Schema
+[source,graphql,schema=true]
+----
+union Search = Movie | Genre
+
+type Genre {
+  name: String
+}
+
+type Movie {
+  title: String
+  search: [Search!]! @relationship(type: "SEARCH", direction: OUT)
+}
+----
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (m:Movie {title: "RandomString1"})
+ CREATE (g1:Genre {name: "RandomString2"})
+ CREATE (g2:Genre {name: "RandomString3"})
+ MERGE (m)-[:SEARCH]->(m)
+ MERGE (m)-[:SEARCH]->(g1)
+ MERGE (m)-[:SEARCH]->(g2)
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies(where: {title: "RandomString1"}) {
+    search(where: {Genre: {name: "RandomString2"}}) {
+      __typename
+      ... on Movie {
+        title
+      }
+      ... on Genre {
+        name
+      }
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "RandomString1",
+  "param1": "RandomString2"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE this.title = $param0
+CALL {
+    WITH this
+    CALL {
+        WITH *
+        MATCH (this)-[this0:SEARCH]->(this1:Genre)
+        WHERE this1.name = $param1
+        WITH this1 { .name, __typename: "Genre", __id: toString(id(this1)) } AS this1
+        RETURN this1 AS var2
+    }
+    WITH var2
+    RETURN collect(var2) AS var2
+}
+RETURN this { search: var2 } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "movies": [
+    {
+      "search": [
+        {
+          "__typename": "Genre",
+          "name": "RandomString2"
+        }
+      ]
+    }
+  ]
+}
+----
+
+== should read and return unions with sort and limit
+
+.Schema
+[source,graphql,schema=true]
+----
+union Search = Movie | Genre
+
+type Genre {
+  name: String
+}
+
+type Movie {
+  title: String
+  search: [Search!]! @relationship(type: "SEARCH", direction: OUT)
+}
+----
+
+.Test Data
+[source,cypher,test-data=true]
+----
+CREATE (m:Movie {title: "originalMovie"})
+ CREATE (m1:Movie {title: "movie1"})
+ CREATE (m2:Movie {title: "movie2"})
+ CREATE (g1:Genre {name: "genre1"})
+ CREATE (g2:Genre {name: "genre2"})
+ MERGE (m)-[:SEARCH]->(m1)
+ MERGE (m)-[:SEARCH]->(m2)
+ MERGE (m)-[:SEARCH]->(g1)
+ MERGE (m)-[:SEARCH]->(g2)
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies(where: {title: "originalMovie"}) {
+    search(options: {offset: 1, limit: 3}) {
+      ... on Movie {
+        title
+      }
+      ... on Genre {
+        name
+      }
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "originalMovie",
+  "param1": 1,
+  "param2": 3
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE this.title = $param0
+CALL {
+    WITH this
+    CALL {
+        WITH *
+        MATCH (this)-[this0:SEARCH]->(this1:Genre)
+        WITH this1 { .name, __typename: "Genre", __id: toString(id(this1)) } AS this1
+        RETURN this1 AS var2
+        UNION
+        WITH *
+        MATCH (this)-[this3:SEARCH]->(this4:Movie)
+        WITH this4 { .title, __typename: "Movie", __id: toString(id(this4)) } AS this4
+        RETURN this4 AS var2
+    }
+    WITH var2
+    
+    SKIP $param1
+    LIMIT $param2
+    RETURN collect(var2) AS var2
+}
+RETURN this { search: var2 } AS this
+----
+
+.GraphQL-Response
+[source,json,response=true]
+----
+{
+  "movies": [
+    {
+      "search": [
+        {
+          "name": "genre2"
+        },
+        {
+          "title": "movie2"
+        },
+        {
+          "title": "movie1"
+        }
+      ]
+    }
+  ]
+}
+----
diff --git a/core/src/test/resources/issues/gh-112.adoc b/core/src/test/resources/issues/gh-112.adoc
index 2bf81149..aace86b7 100644
--- a/core/src/test/resources/issues/gh-112.adoc
+++ b/core/src/test/resources/issues/gh-112.adoc
@@ -29,7 +29,7 @@ CREATE
 == Query
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query user( $uuid: ID ){
   user(uuid: $uuid) {
@@ -99,7 +99,7 @@ RETURN user {
 == Delete relation no matter of direction
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 mutation {
   deleteUserAssociates(uuid: "2", associates: ["1", "3"]) {
diff --git a/core/src/test/resources/issues/gh-147.adoc b/core/src/test/resources/issues/gh-147.adoc
index 448bfea9..7e430573 100644
--- a/core/src/test/resources/issues/gh-147.adoc
+++ b/core/src/test/resources/issues/gh-147.adoc
@@ -54,7 +54,7 @@ CREATE
 == Mutation
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query {
     person(name: "Kevin Bacon") {
diff --git a/core/src/test/resources/issues/gh-149.adoc b/core/src/test/resources/issues/gh-149.adoc
index befa0c96..a1c3b3ba 100644
--- a/core/src/test/resources/issues/gh-149.adoc
+++ b/core/src/test/resources/issues/gh-149.adoc
@@ -21,7 +21,7 @@ type Person {
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query {
   person(first:10) {
diff --git a/core/src/test/resources/issues/gh-160.adoc b/core/src/test/resources/issues/gh-160.adoc
index 1faf1602..ca6a75df 100644
--- a/core/src/test/resources/issues/gh-160.adoc
+++ b/core/src/test/resources/issues/gh-160.adoc
@@ -16,7 +16,7 @@ type User {
 == Issue
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query {
   user(filter: {uuid:"test-uuid"}) {
diff --git a/core/src/test/resources/issues/gh-163.adoc b/core/src/test/resources/issues/gh-163.adoc
index bccb86b6..6edffcba 100644
--- a/core/src/test/resources/issues/gh-163.adoc
+++ b/core/src/test/resources/issues/gh-163.adoc
@@ -27,7 +27,7 @@ type Movie {
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query {
   person(name:"test") {
@@ -65,7 +65,7 @@ RETURN person {
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query {
   person(name:"test", filter: { born_gt: 1970, actedIn_none: { title: "Unforgiven" }}) {
diff --git a/core/src/test/resources/issues/gh-169.adoc b/core/src/test/resources/issues/gh-169.adoc
index 3339f7d0..0d0b7abf 100644
--- a/core/src/test/resources/issues/gh-169.adoc
+++ b/core/src/test/resources/issues/gh-169.adoc
@@ -27,7 +27,7 @@ enum _ActorOrdering {
 == Test default values on relation field
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movie {
@@ -69,7 +69,7 @@ RETURN movie {
 == Test customized values on relation field
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movie {
@@ -111,7 +111,7 @@ RETURN movie {
 == Test default values on root field
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   test {
@@ -143,7 +143,7 @@ RETURN test {
 == Test customized values on root field
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   test(first: 5, offset: 2, orderBy: [name_desc]) {
diff --git a/core/src/test/resources/issues/gh-170.adoc b/core/src/test/resources/issues/gh-170.adoc
index f58c9de5..5d1af74a 100644
--- a/core/src/test/resources/issues/gh-170.adoc
+++ b/core/src/test/resources/issues/gh-170.adoc
@@ -41,7 +41,7 @@ CREATE
 == Query
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query {
     r: rated( filter: {rating_gte : 3}) {
diff --git a/core/src/test/resources/issues/gh-190-cypher-directive-with-passThrough.adoc b/core/src/test/resources/issues/gh-190-cypher-directive-with-passThrough.adoc
index 0e4f0ec2..5cb5d901 100644
--- a/core/src/test/resources/issues/gh-190-cypher-directive-with-passThrough.adoc
+++ b/core/src/test/resources/issues/gh-190-cypher-directive-with-passThrough.adoc
@@ -43,7 +43,7 @@ CREATE
 === Query projected data
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query getUser {
   user: getUser(userId: "u1") {
diff --git a/core/src/test/resources/issues/gh-210.adoc b/core/src/test/resources/issues/gh-210.adoc
index 11415d23..0bb94398 100644
--- a/core/src/test/resources/issues/gh-210.adoc
+++ b/core/src/test/resources/issues/gh-210.adoc
@@ -31,7 +31,7 @@ type Week implements Period {
 == Test
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
    Week(
diff --git a/core/src/test/resources/issues/gh-245-cypher-directive-on-relationship.adoc b/core/src/test/resources/issues/gh-245-cypher-directive-on-relationship.adoc
index 11b98943..2dd4f3b3 100644
--- a/core/src/test/resources/issues/gh-245-cypher-directive-on-relationship.adoc
+++ b/core/src/test/resources/issues/gh-245-cypher-directive-on-relationship.adoc
@@ -33,7 +33,7 @@ type Movie {
 === Simple Cypher Directive on Field
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query {
   person {
diff --git a/core/src/test/resources/issues/gh-265-querying-multiple-root-fields.adoc b/core/src/test/resources/issues/gh-265-querying-multiple-root-fields.adoc
index f88d765f..bdcca255 100644
--- a/core/src/test/resources/issues/gh-265-querying-multiple-root-fields.adoc
+++ b/core/src/test/resources/issues/gh-265-querying-multiple-root-fields.adoc
@@ -28,7 +28,7 @@ CREATE
 == Queries
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query {
   movie {
diff --git a/core/src/test/resources/issues/gh-267-field-aliasing-does-not-work-if-using-datafetchinginterceptor.adoc b/core/src/test/resources/issues/gh-267-field-aliasing-does-not-work-if-using-datafetchinginterceptor.adoc
index 9994f9fc..3ef352c9 100644
--- a/core/src/test/resources/issues/gh-267-field-aliasing-does-not-work-if-using-datafetchinginterceptor.adoc
+++ b/core/src/test/resources/issues/gh-267-field-aliasing-does-not-work-if-using-datafetchinginterceptor.adoc
@@ -32,7 +32,7 @@ CREATE (m:Movie{ title: 'movie 1' }),
 == Queries
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query {
   movieAlias: movie {
diff --git a/core/src/test/resources/issues/gh-27.adoc b/core/src/test/resources/issues/gh-27.adoc
index 6c5eef92..ac5cccfa 100644
--- a/core/src/test/resources/issues/gh-27.adoc
+++ b/core/src/test/resources/issues/gh-27.adoc
@@ -21,7 +21,7 @@ type Pet {
 == query friends name not null
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   person (filter: { friends: { name_not: null } }) {
@@ -52,7 +52,7 @@ RETURN person {
 == query friends not null
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   person (filter: { friends_not: null }) {
@@ -84,7 +84,7 @@ RETURN person {
 == query friends null
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   person (filter: { friends: null }) {
@@ -116,7 +116,7 @@ RETURN person {
 == query friends name not null
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   person (filter: { friends: { name_not: null } }) {
diff --git a/core/src/test/resources/issues/gh-295-wrong-target-node-alias.adoc b/core/src/test/resources/issues/gh-295-wrong-target-node-alias.adoc
index 8aea45f7..ee1b9d8c 100644
--- a/core/src/test/resources/issues/gh-295-wrong-target-node-alias.adoc
+++ b/core/src/test/resources/issues/gh-295-wrong-target-node-alias.adoc
@@ -37,7 +37,7 @@ type Person_HAS_Target_Book @relation(name: "HAS", from: "source", to: "target",
 == Query
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query{
   person{
diff --git a/core/src/test/resources/issues/gh-299-incorrect-mutation-translation-for-IDs-with-property-aliases.adoc b/core/src/test/resources/issues/gh-299-incorrect-mutation-translation-for-IDs-with-property-aliases.adoc
index ae7c197c..5ae6659f 100644
--- a/core/src/test/resources/issues/gh-299-incorrect-mutation-translation-for-IDs-with-property-aliases.adoc
+++ b/core/src/test/resources/issues/gh-299-incorrect-mutation-translation-for-IDs-with-property-aliases.adoc
@@ -21,7 +21,7 @@ type Movie {
 == Merge Mutation
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 mutation {
   mergePerson(id: "test-id", name: "test-name") {
@@ -59,7 +59,7 @@ RETURN mergePerson {
 == Update Mutation
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 mutation {
   updatePerson(id: "test-id", name: "other-test-name") {
@@ -97,7 +97,7 @@ RETURN updatePerson {
 == Delete Mutation
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 mutation {
   deletePerson(id: "test-id") {
@@ -131,7 +131,7 @@ RETURN deletePerson AS deletePerson
 == Add Relationship Mutation
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 mutation {
   addPersonActedIn(id: "test-id", actedIn: "test-movie") {
@@ -170,7 +170,7 @@ RETURN addPersonActedIn {
 == Delete Relationship Mutation
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 mutation {
   deletePersonActedIn(id: "test-id", actedIn: "test-movie") {
diff --git a/core/src/test/resources/issues/gh-45.adoc b/core/src/test/resources/issues/gh-45.adoc
index 5ea1f04a..5928e2ab 100644
--- a/core/src/test/resources/issues/gh-45.adoc
+++ b/core/src/test/resources/issues/gh-45.adoc
@@ -18,7 +18,7 @@ type Category {
 == Add Parent
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 mutation {
   addCategoryParentCategory(id: "1", parentCategory: "2") {
@@ -57,7 +57,7 @@ RETURN addCategoryParentCategory {
 == Add sub categories
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 mutation {
   addCategorySubCategories(id: "2", subCategories: ["3", "4"]) {
diff --git a/core/src/test/resources/issues/gh-47.adoc b/core/src/test/resources/issues/gh-47.adoc
index cae81524..7f6492b5 100644
--- a/core/src/test/resources/issues/gh-47.adoc
+++ b/core/src/test/resources/issues/gh-47.adoc
@@ -15,7 +15,7 @@ type Company {
 == Filter null
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   company (name: null) {
@@ -45,7 +45,7 @@ RETURN company {
 == Filter not null
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   company (name_not: null) {
@@ -75,7 +75,7 @@ RETURN company {
 == Filter null via variable
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query filter($name: String) {
   company (name: $name) {
@@ -111,7 +111,7 @@ RETURN company {
 == Filter not null via variable
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query filter($name: String) {
   company (name_not: $name) {
diff --git a/core/src/test/resources/issues/gh-65.adoc b/core/src/test/resources/issues/gh-65.adoc
index 42705b48..46da0581 100644
--- a/core/src/test/resources/issues/gh-65.adoc
+++ b/core/src/test/resources/issues/gh-65.adoc
@@ -35,7 +35,7 @@ CREATE (tB)-[:SURVEY_RESPONSE]->(rX);
 == Issue
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   surveyResponse(filter: {surveyTemplate: {uid: "a"}}){
diff --git a/core/src/test/resources/issues/gh-85.adoc b/core/src/test/resources/issues/gh-85.adoc
index f8af45f1..b8b243b5 100644
--- a/core/src/test/resources/issues/gh-85.adoc
+++ b/core/src/test/resources/issues/gh-85.adoc
@@ -39,7 +39,7 @@ CREATE (:Movie{ title: 'Forrest Gump' });
 == Mutation
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 mutation {
     r: rateMovie(movie:"Forrest Gump", user:"Andreas", rating: 5)
diff --git a/core/src/test/resources/movie-tests.adoc b/core/src/test/resources/movie-tests.adoc
index 7c3a78d7..8b1d2b83 100644
--- a/core/src/test/resources/movie-tests.adoc
+++ b/core/src/test/resources/movie-tests.adoc
@@ -117,7 +117,7 @@ type Mutation {
 === Top Level Query
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query {
   Movie {
@@ -146,7 +146,7 @@ RETURN movie {
 === Query Single Object
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   MovieById(movieId: "18") {
@@ -178,7 +178,7 @@ RETURN movieById {
 === Basic Query with Parameter
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {  Movie(title: "River Runs Through It, A")  {  title }  }
 ----
@@ -206,7 +206,7 @@ RETURN movie {
 === Paging
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   Movie(title: "River Runs Through It, A", first: 1, offset: 1) {
@@ -242,7 +242,7 @@ RETURN movie {
 === Query Single Relation
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   MovieById(movieId: "3100") {
@@ -285,7 +285,7 @@ RETURN movieById {
 === Query Single Object and Array of Object Relations
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   MovieById(movieId: "3100") {
@@ -342,7 +342,7 @@ RETURN movieById {
 === Relationship Expansion
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   Movie(title: "River Runs Through It, A") {
@@ -388,7 +388,7 @@ RETURN movie {
 === Projection with sub-paging
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   Movie(title: "River Runs Through It, A") {
@@ -434,7 +434,7 @@ RETURN movie {
 === Subquery Cypher Directive
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   Movie {
@@ -481,7 +481,7 @@ RETURN movie {
 === Subquery Cypher Directive Paging
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   Movie {
@@ -528,7 +528,7 @@ RETURN movie {
 === Handle Cypher Directive on Query Type
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   GenresBySubstring(substring:"Action") {
@@ -576,7 +576,7 @@ RETURN genresBySubstring {
 === Handle Cypher directive on Mutation type
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 mutation someMutation {
   createGenre(name: "Wildlife Documentary") {
@@ -610,7 +610,7 @@ RETURN createGenre {
 === Query using Inline Fragment
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   Movie(title: "River Runs Through It, A") {
@@ -663,7 +663,7 @@ RETURN movie {
 === Deeply nested object query
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   Movie(title: "River Runs Through It, A") {
@@ -768,7 +768,7 @@ RETURN movie {
 === Should merge an actor by the userId
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 mutation {
   actor: mergeActor(userId: "1", name: "Andrea") {
@@ -806,7 +806,7 @@ RETURN actor {
 === Should auto generate `add` relationship mutations for arrays
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 mutation {
   add: addMovieGenres(movieId: 1, genres: ["Action", "Fantasy"]) {
@@ -844,7 +844,7 @@ RETURN add {
 === Should auto generate `delete` relationship mutations for arrays
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 mutation {
   del: deleteMovieGenres(movieId: 1, genres: ["Action", "Fantasy"]) {
@@ -882,7 +882,7 @@ RETURN del {
 === Should auto generate `add` relationship mutations
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 mutation {
   add: addMoviePublishedBy(movieId: 1, publishedBy: "Company") {
@@ -921,7 +921,7 @@ RETURN add {
 === Should auto generate `delete` relationship mutations
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 mutation {
   del: deleteMoviePublishedBy(movieId: 1, publishedBy: "Company") {
@@ -960,7 +960,7 @@ RETURN del {
 === Should auto generate `add` recursive relationship mutations for arrays
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 mutation {
   add: addUserKnows(userId: 1, knows: [10, 23]) {
@@ -1000,7 +1000,7 @@ RETURN add {
 === Descending, top level
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   Movie(year: 2010, orderBy:title_desc, first: 10) {
@@ -1033,7 +1033,7 @@ RETURN movie {
 === Descending, number
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {  Movie(orderBy:year_desc, first:10)  {  title }  }
 ----
@@ -1060,7 +1060,7 @@ RETURN movie {
 === Deeply nested orderBy
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   Movie(orderBy:title_desc) {
@@ -1116,7 +1116,7 @@ RETURN movie {
 === Deeply nested query using temporal orderBy
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   User(orderBy: born_desc){
@@ -1184,7 +1184,7 @@ RETURN user {
 === Find all relations
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 { rated(_id:1){
     rating
@@ -1217,7 +1217,7 @@ RETURN rated {
 === Create relation
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 mutation {
   createRated(from_userId: "1", to_movieId: "2", rating: 5) {
@@ -1259,7 +1259,7 @@ RETURN createRated {
 === Mutate relation
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 mutation {
  updateRated(_id:1, rating: 5){
@@ -1296,7 +1296,7 @@ RETURN updateRated {
 === create relation
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 mutation {
  addGenreMovies(name:"Action", movies: ["m1"]){
@@ -1334,7 +1334,7 @@ RETURN addGenreMovies {
 == create object with multiple labels
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 mutation {
  createUser(userId:1){
@@ -1373,7 +1373,7 @@ RETURN createUser {
 === User born extraction
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query {
   User {
@@ -1408,7 +1408,7 @@ RETURN user {
 === User born query filter with multiple fields
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query {
   User(born: {formatted: "2015-06-24T12:50:35.556000000+01:00", year: 2015 }) {
@@ -1446,7 +1446,7 @@ RETURN user {
 === Merge Actor with born field formatted
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 mutation {
   actor: mergeActor(userId: "1", name: "Andrea", born: { formatted: "2015-06-24T12:50:35.556000000+01:00" }) {
@@ -1488,7 +1488,7 @@ RETURN actor {
 === Create Actor with born field formatted
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 mutation {
   actor: createActor(userId: "1", name: "Andrea", born: { formatted: "2015-06-24T12:50:35.556000000+01:00" }) {
@@ -1528,7 +1528,7 @@ RETURN actor {
 === Merge Actor with born field object
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 mutation {
   actor: mergeActor(userId: "1", name: "Andrea", born: { year: 2018
@@ -1588,7 +1588,7 @@ RETURN actor {
 === Create Actor with born field object
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 mutation {
   actor: createActor(userId: "1", name: "Andrea", born: { year: 2018
@@ -1656,7 +1656,7 @@ RETURN actor {
 === delete node by id
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 mutation{
   deleteMovie(movieId:"id"){
@@ -1690,7 +1690,7 @@ RETURN deleteMovie AS deleteMovie
 === delete node by native id
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 mutation{
   deleteState(_id: 1){
@@ -1723,7 +1723,7 @@ RETURN deleteState AS deleteState
 === delete relation by native id
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 mutation{
   deleteRated(_id: 1){
diff --git a/core/src/test/resources/optimized-query-for-filter.adoc b/core/src/test/resources/optimized-query-for-filter.adoc
index 5fc680b1..42e8f4f4 100644
--- a/core/src/test/resources/optimized-query-for-filter.adoc
+++ b/core/src/test/resources/optimized-query-for-filter.adoc
@@ -57,7 +57,7 @@ type Review @relation(name:"REVIEWED", to: "movie") {
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movie(filter: {
@@ -121,7 +121,7 @@ CAUTION: *Not yet implemented*
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movie(filter: {
@@ -189,7 +189,7 @@ RETURN movie { .title } AS movie
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movie(filter: {
@@ -250,7 +250,7 @@ RETURN movie {
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movie(filter: {
@@ -315,7 +315,7 @@ CAUTION: *Not yet implemented*
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movie(filter: {
@@ -425,7 +425,7 @@ RETURN movie { .title } AS movie
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movie(filter: {
@@ -498,7 +498,7 @@ RETURN movie {
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movie(filter: {
@@ -555,7 +555,7 @@ RETURN movie {
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movie(filter: {
@@ -609,7 +609,7 @@ RETURN movie {
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movie(filter: {
@@ -695,7 +695,7 @@ RETURN movie {
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movie(filter: {
@@ -781,7 +781,7 @@ RETURN movie {
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movie(filter: {
@@ -835,7 +835,7 @@ RETURN movie {
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movie(filter: {
@@ -915,7 +915,7 @@ RETURN movie {
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   person(filter:{ location_not: null}){
@@ -952,7 +952,7 @@ RETURN person {
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   person(filter:{ location: null}){
@@ -989,7 +989,7 @@ RETURN person {
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   person(filter:{ location_not: {longitude: 3, latitude: 3}}){
@@ -1030,7 +1030,7 @@ RETURN person {
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   person(filter:{ location_distance_lt: { distance: 3, point: {longitude: 1, latitude:2, height: 3}}}){
diff --git a/core/src/test/resources/property-tests.adoc b/core/src/test/resources/property-tests.adoc
index ca96216e..de6ef860 100644
--- a/core/src/test/resources/property-tests.adoc
+++ b/core/src/test/resources/property-tests.adoc
@@ -21,7 +21,7 @@ type Query {
 === rename property
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 { person(id:"32",name:"Jane") { name }}
 ----
diff --git a/core/src/test/resources/relationship-tests.adoc b/core/src/test/resources/relationship-tests.adoc
index e2efa37c..ffb82f8a 100644
--- a/core/src/test/resources/relationship-tests.adoc
+++ b/core/src/test/resources/relationship-tests.adoc
@@ -47,7 +47,7 @@ type CategoryAssignment @relation(from: "child", to: "parent", name: "HAS_PARENT
 === add incoming relationship
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 mutation{
   addTeamPlayers(id:1, players: [2]){
@@ -85,7 +85,7 @@ RETURN addTeamPlayers {
 === delete incoming relationship
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 mutation{
   deleteTeamPlayers(id:1, players: [2]){
@@ -123,7 +123,7 @@ RETURN deleteTeamPlayers {
 === add outgoing relationship
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 mutation{
   addPlayerTeams(id:1, teams: [2]){
@@ -161,7 +161,7 @@ RETURN addPlayerTeams {
 === delete outgoing relationship
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 mutation{
   deletePlayerTeams(id:1, teams: [2]){
@@ -199,7 +199,7 @@ RETURN deletePlayerTeams {
 === create relationship
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 mutation{
   createMembership(player_id: 1, team_id: 2, prop: "foo"){
@@ -243,7 +243,7 @@ RETURN createMembership {
 === query incoming node
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   team{
@@ -281,7 +281,7 @@ RETURN team {
 === query outgoing node
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   player{
@@ -319,7 +319,7 @@ RETURN player {
 === query incoming relation
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   team{
@@ -365,7 +365,7 @@ RETURN team {
 === query outgoing relation
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   player{
@@ -415,7 +415,7 @@ RETURN player {
 ==== add incoming relationship
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 mutation{
   addCategoryParentCategory(name: "child", parentCategory: "parent", prop: "foo"){
@@ -454,7 +454,7 @@ RETURN addCategoryParentCategory {
 ==== delete incoming relationship
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 mutation{
   deleteCategoryParentCategory(name:"child", parentCategory: "parent") {
@@ -493,7 +493,7 @@ RETURN deleteCategoryParentCategory {
 ==== add outgoing relationship
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 mutation{
   addCategoryChildCategories(name: "parent", childCategories: ["child1", "child2"], prop: "foo") {
@@ -531,7 +531,7 @@ RETURN addCategoryChildCategories {
 ==== delete outgoing relationship
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 mutation{
   deleteCategoryChildCategories(name: "parent", childCategories:["child1", "child2"] ) {
@@ -569,7 +569,7 @@ RETURN deleteCategoryChildCategories {
 ==== create relationship
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 mutation{
   createCategoryAssignment(parent_name: "parent", child_name: "child", prop: "foo"){
@@ -613,7 +613,7 @@ RETURN createCategoryAssignment {
 ==== query incoming node
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   category{
@@ -651,7 +651,7 @@ RETURN category {
 ==== query outgoing node
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   category{
@@ -689,7 +689,7 @@ RETURN category {
 ==== query incoming relation
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   category{
@@ -733,7 +733,7 @@ RETURN category {
 ==== query outgoing relation
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   category {
diff --git a/core/src/test/resources/schema-operations-tests.adoc b/core/src/test/resources/schema-operations-tests.adoc
index 583f0d18..b6ca2cef 100644
--- a/core/src/test/resources/schema-operations-tests.adoc
+++ b/core/src/test/resources/schema-operations-tests.adoc
@@ -30,7 +30,7 @@ schema {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: CustomQueryType
@@ -128,7 +128,7 @@ input _PersonFilter {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: CustomQueryType
diff --git a/core/src/test/resources/tck-test-files/cypher/advanced-filtering.adoc b/core/src/test/resources/tck-test-files/cypher/advanced-filtering.adoc
index 1be3f8eb..34074944 100644
--- a/core/src/test/resources/tck-test-files/cypher/advanced-filtering.adoc
+++ b/core/src/test/resources/tck-test-files/cypher/advanced-filtering.adoc
@@ -39,7 +39,7 @@ type Genre {
 === IN
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
     movie(where: { id_in: ["123"] }) {
@@ -71,7 +71,7 @@ RETURN movie {
 === REGEX
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
     movie(where: { id_matches: "(?i)123.*" }) {
@@ -103,7 +103,7 @@ RETURN movie {
 === NOT
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
     movie(where: { id_not: "123" }) {
@@ -135,7 +135,7 @@ RETURN movie {
 === NOT_IN
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
     movie(where: { id_not_in: ["123"] }) {
@@ -167,7 +167,7 @@ RETURN movie {
 === CONTAINS
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
     movie(where: { id_contains: "123" }) {
@@ -199,7 +199,7 @@ RETURN movie {
 === NOT_CONTAINS
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
     movie(where: { id_not_contains: "123" }) {
@@ -231,7 +231,7 @@ RETURN movie {
 === STARTS_WITH
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
     movie(where: { id_starts_with: "123" }) {
@@ -263,7 +263,7 @@ RETURN movie {
 === NOT_STARTS_WITH
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
     movie(where: { id_not_starts_with: "123" }) {
@@ -295,7 +295,7 @@ RETURN movie {
 === ENDS_WITH
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
     movie(where: { id_ends_with: "123" }) {
@@ -327,7 +327,7 @@ RETURN movie {
 === NOT_ENDS_WITH
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
     movie(where: { id_not_ends_with: "123" }) {
@@ -359,7 +359,7 @@ RETURN movie {
 === LT
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
     movie(where: { actorCount_lt: 123 }) {
@@ -393,7 +393,7 @@ RETURN movie {
 CAUTION: *Not yet implemented*
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
     movie(where: { budget_lt: 9223372036854775807 }) {
@@ -426,7 +426,7 @@ RETURN this { .budget } as this
 === LTE
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
     movie(where: { actorCount_lte: 123 }) {
@@ -460,7 +460,7 @@ RETURN movie {
 CAUTION: *Not yet implemented*
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
     movie(where: { budget_lte: 9223372036854775807 }) {
@@ -493,7 +493,7 @@ RETURN this { .budget } as this
 === GT
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
     movie(where: { actorCount_gt: 123 }) {
@@ -527,7 +527,7 @@ RETURN movie {
 CAUTION: *Not yet implemented*
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
     movie(where: { budget_gt: 9223372036854775000 }) {
@@ -560,7 +560,7 @@ RETURN this { .budget } as this
 === GTE
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
     movie(where: { actorCount_gte: 123 }) {
@@ -594,7 +594,7 @@ RETURN movie {
 CAUTION: *Not yet implemented*
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
     movie(where: { budget_gte: 9223372036854775000 }) {
@@ -627,7 +627,7 @@ RETURN this { .budget } as this
 === Relationship equality
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
     movie(where: { genres: { name: "some genre" } }) {
@@ -660,7 +660,7 @@ RETURN movie {
 === Relationship NOT
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
     movie(where: { genres_not: { name: "some genre" } }) {
diff --git a/core/src/test/resources/tck-test-files/cypher/directives/ignore.adoc b/core/src/test/resources/tck-test-files/cypher/directives/ignore.adoc
index fb7ffc2b..b99d53fd 100644
--- a/core/src/test/resources/tck-test-files/cypher/directives/ignore.adoc
+++ b/core/src/test/resources/tck-test-files/cypher/directives/ignore.adoc
@@ -32,7 +32,7 @@ type User {
 === Ignore field for cypher
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
     users {
diff --git a/core/src/test/resources/tck-test-files/cypher/pagination.adoc b/core/src/test/resources/tck-test-files/cypher/pagination.adoc
index f26cab02..a949de0b 100644
--- a/core/src/test/resources/tck-test-files/cypher/pagination.adoc
+++ b/core/src/test/resources/tck-test-files/cypher/pagination.adoc
@@ -42,7 +42,7 @@ input ActorOptions {
 === Skipping
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
     movies(options: { skip: 1 }) {
@@ -73,7 +73,7 @@ RETURN movies {
 === Limit
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
     movies(options: { limit: 1 }) {
@@ -104,7 +104,7 @@ RETURN movies {
 === Skip + Limit
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
     movies(options: { limit: 1, skip: 2  }) {
@@ -136,7 +136,7 @@ RETURN movies {
 === Skip + Limit as variables
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query($skip: Int, $limit: Int) {
     movies(options: { limit: $limit, skip: $skip }) {
@@ -177,7 +177,7 @@ RETURN movies {
 === Skip + Limit with other variables
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query($skip: Int, $limit: Int, $title: String) {
     movies(
@@ -224,7 +224,7 @@ RETURN movies {
 === Default values
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
     actors {
@@ -258,7 +258,7 @@ RETURN actors {
 === Skipping
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
     actors {
@@ -303,7 +303,7 @@ RETURN actors {
 === Limit
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
     actors {
@@ -348,7 +348,7 @@ RETURN actors {
 === Skip + Limit
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
     actors {
@@ -394,7 +394,7 @@ RETURN actors {
 === Skip + Limit as variables
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query($skip: Int, $limit: Int) {
     actors {
@@ -449,7 +449,7 @@ RETURN actors {
 === Skip + Limit with other variables
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query($skip: Int, $limit: Int, $title: String) {
     actors {
@@ -510,7 +510,7 @@ RETURN actors {
 === Default values
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
     movies {
diff --git a/core/src/test/resources/tck-test-files/cypher/sort.adoc b/core/src/test/resources/tck-test-files/cypher/sort.adoc
index 45617bae..84960e89 100644
--- a/core/src/test/resources/tck-test-files/cypher/sort.adoc
+++ b/core/src/test/resources/tck-test-files/cypher/sort.adoc
@@ -47,7 +47,7 @@ input GenreSort {
 === Simple Sort
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
     movies(options: { sort: [{ id: DESC }] }) {
@@ -76,7 +76,7 @@ RETURN movies {
 === Multi Sort
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
     movies(options: { sort: [{ id: DESC }, { title: ASC }] }) {
@@ -105,7 +105,7 @@ RETURN movies {
 === Sort with skip limit & with other variables
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query($title: String, $skip: Int, $limit: Int, $sort: [MovieSort!]) {
     movies(
@@ -159,7 +159,7 @@ RETURN movies {
 === Default values
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
     genres {
@@ -190,7 +190,7 @@ RETURN genres {
 === Simple Sort
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
     movies {
@@ -229,7 +229,7 @@ RETURN movies {
 === Multi Sort
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
     movies {
@@ -268,7 +268,7 @@ RETURN movies {
 === Sort with skip limit & with other variables
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query($name: String, $skip: Int, $limit: Int, $sort: [GenreSort!]) {
     movies {
@@ -334,7 +334,7 @@ RETURN movies {
 === Default values
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
     movies {
diff --git a/core/src/test/resources/tck-test-files/cypher/types/datetime.adoc b/core/src/test/resources/tck-test-files/cypher/types/datetime.adoc
index 3287c41a..dbbecdef 100644
--- a/core/src/test/resources/tck-test-files/cypher/types/datetime.adoc
+++ b/core/src/test/resources/tck-test-files/cypher/types/datetime.adoc
@@ -41,7 +41,7 @@ CREATE
 === Simple Read
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query {
     movies(where: { datetime: "1970-01-01T00:00:00.000Z" }) {
@@ -86,7 +86,7 @@ RETURN movies {
 === Complex Read
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query {
     movies(
@@ -139,7 +139,7 @@ RETURN movies {
 === Simple Create
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 mutation {
     createMovie(datetime: "1970-01-01T00:00:00.000Z", id: "m4") {
@@ -188,7 +188,7 @@ RETURN createMovie {
 === Simple Update
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 mutation {
     updateMovie(id: "m1", datetime: "2000-01-01T00:00:00.000Z") {
diff --git a/core/src/test/resources/tck-test-files/cypher/v2/advanced-filtering.adoc b/core/src/test/resources/tck-test-files/cypher/v2/advanced-filtering.adoc
index cdc8b95a..adc1e1ea 100644
--- a/core/src/test/resources/tck-test-files/cypher/v2/advanced-filtering.adoc
+++ b/core/src/test/resources/tck-test-files/cypher/v2/advanced-filtering.adoc
@@ -27,17 +27,17 @@ type Genre {
 [source,json,schema-config=true]
 ----
 {
-  "features": {
-    "filters": {
-      "String": {
-        "LT": true,
-        "GT": true,
-        "LTE": true,
-        "GTE": true,
-        "MATCHES": true
+  "features" : {
+    "filters" : {
+      "String" : {
+        "LT" : true,
+        "GT" : true,
+        "LTE" : true,
+        "GTE" : true,
+        "MATCHES" : true
       },
-      "ID": {
-        "MATCHES": true
+      "ID" : {
+        "MATCHES" : true
       }
     }
   }
@@ -47,7 +47,7 @@ type Genre {
 == IN
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies(where: {_id_IN: ["123"]}) {
@@ -74,12 +74,10 @@ RETURN this {
 } AS this
 ----
 
-'''
-
 == REGEX
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies(where: {id_MATCHES: "(?i)123.*"}) {
@@ -106,12 +104,10 @@ RETURN this {
 } AS this
 ----
 
-'''
-
 == CONTAINS
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies(where: {id_CONTAINS: "123"}) {
@@ -138,12 +134,10 @@ RETURN this {
 } AS this
 ----
 
-'''
-
 == STARTS_WITH
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies(where: {id_STARTS_WITH: "123"}) {
@@ -170,12 +164,10 @@ RETURN this {
 } AS this
 ----
 
-'''
-
 == ENDS_WITH
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies(where: {id_ENDS_WITH: "123"}) {
@@ -202,12 +194,10 @@ RETURN this {
 } AS this
 ----
 
-'''
-
 == LT
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies(where: {actorCount_LT: 123}) {
@@ -234,12 +224,10 @@ RETURN this {
 } AS this
 ----
 
-'''
-
 == LT BigInt
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies(where: {budget_LT: 9223372036854775807}) {
@@ -252,10 +240,7 @@ RETURN this {
 [source,json]
 ----
 {
-  "param0" : {
-    "low" : -1,
-    "high" : 2147483647
-  }
+  "param0" : 9223372036854775807
 }
 ----
 
@@ -269,12 +254,10 @@ RETURN this {
 } AS this
 ----
 
-'''
-
 == LT String
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies(where: {title_LT: "The Matrix Revolutions"}) {
@@ -301,12 +284,10 @@ RETURN this {
 } AS this
 ----
 
-'''
-
 == LTE
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies(where: {actorCount_LTE: 123}) {
@@ -333,12 +314,10 @@ RETURN this {
 } AS this
 ----
 
-'''
-
 == LTE BigInt
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies(where: {budget_LTE: 9223372036854775807}) {
@@ -351,10 +330,7 @@ RETURN this {
 [source,json]
 ----
 {
-  "param0" : {
-    "low" : -1,
-    "high" : 2147483647
-  }
+  "param0" : 9223372036854775807
 }
 ----
 
@@ -368,12 +344,10 @@ RETURN this {
 } AS this
 ----
 
-'''
-
 == LTE String
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies(where: {title_LTE: "The Matrix Revolutions"}) {
@@ -400,12 +374,10 @@ RETURN this {
 } AS this
 ----
 
-'''
-
 == GT
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies(where: {actorCount_GT: 123}) {
@@ -432,12 +404,10 @@ RETURN this {
 } AS this
 ----
 
-'''
-
 == GT BigInt
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies(where: {budget_GT: 9223372036854775000}) {
@@ -450,10 +420,7 @@ RETURN this {
 [source,json]
 ----
 {
-  "param0" : {
-    "low" : -808,
-    "high" : 2147483647
-  }
+  "param0" : 9223372036854775000
 }
 ----
 
@@ -467,12 +434,10 @@ RETURN this {
 } AS this
 ----
 
-'''
-
 == GT String
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies(where: {title_GT: "The Matrix Revolutions"}) {
@@ -499,12 +464,10 @@ RETURN this {
 } AS this
 ----
 
-'''
-
 == GTE
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies(where: {actorCount_GTE: 123}) {
@@ -531,12 +494,10 @@ RETURN this {
 } AS this
 ----
 
-'''
-
 == GTE BigInt
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies(where: {budget_GTE: 9223372036854775000}) {
@@ -549,10 +510,7 @@ RETURN this {
 [source,json]
 ----
 {
-  "param0" : {
-    "low" : -808,
-    "high" : 2147483647
-  }
+  "param0" : 9223372036854775000
 }
 ----
 
@@ -566,12 +524,10 @@ RETURN this {
 } AS this
 ----
 
-'''
-
 == GTE String
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies(where: {title_GTE: "The Matrix Revolutions"}) {
@@ -598,8 +554,6 @@ RETURN this {
 } AS this
 ----
 
-'''
-
 == Relationships
 
 === List Predicates
@@ -607,7 +561,7 @@ RETURN this {
 ==== ALL
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies(where: {genres_ALL: {name: "some genre"}}) {
@@ -641,12 +595,10 @@ RETURN this {
 } AS this
 ----
 
-'''
-
 ==== NONE
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies(where: {genres_NONE: {name: "some genre"}}) {
@@ -676,12 +628,10 @@ RETURN this {
 } AS this
 ----
 
-'''
-
 ==== SINGLE
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies(where: {genres_SINGLE: {name: "some genre"}}) {
@@ -710,12 +660,10 @@ RETURN this {
 } AS this
 ----
 
-'''
-
 ==== SOME
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies(where: {genres_SOME: {name: "some genre"}}) {
@@ -745,8 +693,6 @@ RETURN this {
 } AS this
 ----
 
-'''
-
 == Connections
 
 === List Predicates
@@ -754,7 +700,7 @@ RETURN this {
 ==== ALL
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies(where: {genresConnection_ALL: {node: {name: "some genre"}}}) {
@@ -788,12 +734,10 @@ RETURN this {
 } AS this
 ----
 
-'''
-
 ==== NONE
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies(where: {genresConnection_NONE: {node: {name: "some genre"}}}) {
@@ -823,12 +767,10 @@ RETURN this {
 } AS this
 ----
 
-'''
-
 ==== SINGLE
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies(where: {genresConnection_SINGLE: {node: {name: "some genre"}}}) {
@@ -857,12 +799,10 @@ RETURN this {
 } AS this
 ----
 
-'''
-
 ==== SOME
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies(where: {genresConnection_SOME: {node: {name: "some genre"}}}) {
@@ -891,6 +831,3 @@ RETURN this {
 	.actorCount
 } AS this
 ----
-
-'''
-
diff --git a/core/src/test/resources/tck-test-files/cypher/v2/advanced-filtering.js.adoc b/core/src/test/resources/tck-test-files/cypher/v2/advanced-filtering.js.adoc
new file mode 100644
index 00000000..3808c938
--- /dev/null
+++ b/core/src/test/resources/tck-test-files/cypher/v2/advanced-filtering.js.adoc
@@ -0,0 +1,780 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= Cypher Advanced Filtering
+
+== Setup
+
+.Schema
+[source,graphql,schema=true]
+----
+type Movie {
+  _id: ID
+  id: ID
+  title: String
+  actorCount: Int
+  budget: BigInt
+  genres: [Genre!]! @relationship(type: "IN_GENRE", direction: OUT)
+}
+
+type Genre {
+  name: String
+  movies: [Movie!]! @relationship(type: "IN_GENRE", direction: IN)
+}
+----
+
+.Configuration
+[source,json,schema-config=true]
+----
+{
+  "features": {
+    "filters": {
+      "String": {
+        "LT": true,
+        "GT": true,
+        "LTE": true,
+        "GTE": true,
+        "MATCHES": true
+      },
+      "ID": {
+        "MATCHES": true
+      }
+    }
+  }
+}
+----
+
+== IN
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies(where: {_id_IN: ["123"]}) {
+    _id
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": [
+    "123"
+  ]
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE this._id IN $param0
+RETURN this { ._id } AS this
+----
+
+== REGEX
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies(where: {id_MATCHES: "(?i)123.*"}) {
+    id
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "(?i)123.*"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE this.id =~ $param0
+RETURN this { .id } AS this
+----
+
+== CONTAINS
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies(where: {id_CONTAINS: "123"}) {
+    id
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "123"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE this.id CONTAINS $param0
+RETURN this { .id } AS this
+----
+
+== STARTS_WITH
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies(where: {id_STARTS_WITH: "123"}) {
+    id
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "123"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE this.id STARTS WITH $param0
+RETURN this { .id } AS this
+----
+
+== ENDS_WITH
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies(where: {id_ENDS_WITH: "123"}) {
+    id
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "123"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE this.id ENDS WITH $param0
+RETURN this { .id } AS this
+----
+
+== LT
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies(where: {actorCount_LT: 123}) {
+    actorCount
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": 123
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE this.actorCount < $param0
+RETURN this { .actorCount } AS this
+----
+
+== LT BigInt
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies(where: {budget_LT: 9223372036854775807}) {
+    budget
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": 9223372036854775807
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE this.budget < $param0
+RETURN this { .budget } AS this
+----
+
+== LT String
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies(where: {title_LT: "The Matrix Revolutions"}) {
+    title
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "The Matrix Revolutions"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE this.title < $param0
+RETURN this { .title } AS this
+----
+
+== LTE
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies(where: {actorCount_LTE: 123}) {
+    actorCount
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": 123
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE this.actorCount <= $param0
+RETURN this { .actorCount } AS this
+----
+
+== LTE BigInt
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies(where: {budget_LTE: 9223372036854775807}) {
+    budget
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": 9223372036854775807
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE this.budget <= $param0
+RETURN this { .budget } AS this
+----
+
+== LTE String
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies(where: {title_LTE: "The Matrix Revolutions"}) {
+    title
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "The Matrix Revolutions"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE this.title <= $param0
+RETURN this { .title } AS this
+----
+
+== GT
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies(where: {actorCount_GT: 123}) {
+    actorCount
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": 123
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE this.actorCount > $param0
+RETURN this { .actorCount } AS this
+----
+
+== GT BigInt
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies(where: {budget_GT: 9223372036854775000}) {
+    budget
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": 9223372036854775000
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE this.budget > $param0
+RETURN this { .budget } AS this
+----
+
+== GT String
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies(where: {title_GT: "The Matrix Revolutions"}) {
+    title
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "The Matrix Revolutions"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE this.title > $param0
+RETURN this { .title } AS this
+----
+
+== GTE
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies(where: {actorCount_GTE: 123}) {
+    actorCount
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": 123
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE this.actorCount >= $param0
+RETURN this { .actorCount } AS this
+----
+
+== GTE BigInt
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies(where: {budget_GTE: 9223372036854775000}) {
+    budget
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": 9223372036854775000
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE this.budget >= $param0
+RETURN this { .budget } AS this
+----
+
+== GTE String
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies(where: {title_GTE: "The Matrix Revolutions"}) {
+    title
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "The Matrix Revolutions"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE this.title >= $param0
+RETURN this { .title } AS this
+----
+
+== Relationships
+
+=== List Predicates
+
+==== ALL
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies(where: {genres_ALL: {name: "some genre"}}) {
+    actorCount
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "some genre"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE (EXISTS {
+    MATCH (this)-[:IN_GENRE]->(this0:Genre)
+    WHERE this0.name = $param0
+} AND NOT (EXISTS {
+    MATCH (this)-[:IN_GENRE]->(this0:Genre)
+    WHERE NOT (this0.name = $param0)
+}))
+RETURN this { .actorCount } AS this
+----
+
+==== NONE
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies(where: {genres_NONE: {name: "some genre"}}) {
+    actorCount
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "some genre"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE NOT (EXISTS {
+    MATCH (this)-[:IN_GENRE]->(this0:Genre)
+    WHERE this0.name = $param0
+})
+RETURN this { .actorCount } AS this
+----
+
+==== SINGLE
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies(where: {genres_SINGLE: {name: "some genre"}}) {
+    actorCount
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "some genre"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE single(this0 IN [(this)-[:IN_GENRE]->(this0:Genre) WHERE this0.name = $param0 | 1] WHERE true)
+RETURN this { .actorCount } AS this
+----
+
+==== SOME
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies(where: {genres_SOME: {name: "some genre"}}) {
+    actorCount
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "some genre"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE EXISTS {
+    MATCH (this)-[:IN_GENRE]->(this0:Genre)
+    WHERE this0.name = $param0
+}
+RETURN this { .actorCount } AS this
+----
+
+== Connections
+
+=== List Predicates
+
+==== ALL
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies(where: {genresConnection_ALL: {node: {name: "some genre"}}}) {
+    actorCount
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "some genre"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE (EXISTS {
+    MATCH (this)-[this0:IN_GENRE]->(this1:Genre)
+    WHERE this1.name = $param0
+} AND NOT (EXISTS {
+    MATCH (this)-[this0:IN_GENRE]->(this1:Genre)
+    WHERE NOT (this1.name = $param0)
+}))
+RETURN this { .actorCount } AS this
+----
+
+==== NONE
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies(where: {genresConnection_NONE: {node: {name: "some genre"}}}) {
+    actorCount
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "some genre"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE NOT (EXISTS {
+    MATCH (this)-[this0:IN_GENRE]->(this1:Genre)
+    WHERE this1.name = $param0
+})
+RETURN this { .actorCount } AS this
+----
+
+==== SINGLE
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies(where: {genresConnection_SINGLE: {node: {name: "some genre"}}}) {
+    actorCount
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "some genre"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE single(this0 IN [(this)-[this1:IN_GENRE]->(this0:Genre) WHERE this0.name = $param0 | 1] WHERE true)
+RETURN this { .actorCount } AS this
+----
+
+==== SOME
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies(where: {genresConnection_SOME: {node: {name: "some genre"}}}) {
+    actorCount
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "some genre"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE EXISTS {
+    MATCH (this)-[this0:IN_GENRE]->(this1:Genre)
+    WHERE this1.name = $param0
+}
+RETURN this { .actorCount } AS this
+----
diff --git a/core/src/test/resources/tck-test-files/cypher/v2/arrays.adoc b/core/src/test/resources/tck-test-files/cypher/v2/arrays.adoc
index d77dff8c..d2a02ffb 100644
--- a/core/src/test/resources/tck-test-files/cypher/v2/arrays.adoc
+++ b/core/src/test/resources/tck-test-files/cypher/v2/arrays.adoc
@@ -17,7 +17,7 @@ type Movie {
 == WHERE INCLUDES
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies(where: {ratings_INCLUDES: 4.0}) {
@@ -45,6 +45,3 @@ RETURN this {
 	.ratings
 } AS this
 ----
-
-'''
-
diff --git a/core/src/test/resources/tck-test-files/cypher/v2/arrays.js.adoc b/core/src/test/resources/tck-test-files/cypher/v2/arrays.js.adoc
new file mode 100644
index 00000000..a0f87f71
--- /dev/null
+++ b/core/src/test/resources/tck-test-files/cypher/v2/arrays.js.adoc
@@ -0,0 +1,45 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= Cypher Arrays
+
+== Setup
+
+.Schema
+[source,graphql,schema=true]
+----
+type Movie {
+  title: String!
+  ratings: [Float!]!
+}
+----
+
+== WHERE INCLUDES
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies(where: {ratings_INCLUDES: 4.0}) {
+    title
+    ratings
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": 4
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE $param0 IN this.ratings
+RETURN this { .title, .ratings } AS this
+----
diff --git a/core/src/test/resources/tck-test-files/cypher/v2/connections/alias.adoc b/core/src/test/resources/tck-test-files/cypher/v2/connections/alias.adoc
index 58894e80..28721d94 100644
--- a/core/src/test/resources/tck-test-files/cypher/v2/connections/alias.adoc
+++ b/core/src/test/resources/tck-test-files/cypher/v2/connections/alias.adoc
@@ -26,7 +26,7 @@ type ActedIn @relationshipProperties {
 == Alias Top Level Connection Field
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies {
@@ -76,12 +76,10 @@ RETURN this {
 } AS this
 ----
 
-'''
-
 == Alias Top Level Connection Field Multiple Times
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies(where: {title: "Forrest Gump"}) {
@@ -189,6 +187,3 @@ RETURN this {
 	jenny: jenny
 } AS this
 ----
-
-'''
-
diff --git a/core/src/test/resources/tck-test-files/cypher/v2/connections/alias.js.adoc b/core/src/test/resources/tck-test-files/cypher/v2/connections/alias.js.adoc
new file mode 100644
index 00000000..c4bce893
--- /dev/null
+++ b/core/src/test/resources/tck-test-files/cypher/v2/connections/alias.js.adoc
@@ -0,0 +1,143 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= Connections Alias
+
+== Setup
+
+.Schema
+[source,graphql,schema=true]
+----
+type Movie {
+  title: String!
+  actors: [Actor!]! @relationship(type: "ACTED_IN", properties: "ActedIn", direction: IN)
+}
+
+type Actor {
+  name: String!
+  movies: [Movie!]! @relationship(type: "ACTED_IN", properties: "ActedIn", direction: OUT)
+}
+
+type ActedIn @relationshipProperties {
+  screenTime: Int!
+}
+----
+
+== Alias Top Level Connection Field
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies {
+    actors: actorsConnection {
+      totalCount
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+CALL {
+    WITH this
+    MATCH (this)<-[this0:ACTED_IN]-(this1:Actor)
+    WITH collect({ node: this1, relationship: this0 }) AS edges
+    WITH edges, size(edges) AS totalCount
+    CALL {
+        WITH edges
+        UNWIND edges AS edge
+        WITH edge.node AS this1, edge.relationship AS this0
+        RETURN collect({ node: { __id: toString(id(this1)), __typename: "Actor" } }) AS var2
+    }
+    RETURN { edges: var2, totalCount: totalCount } AS var3
+}
+RETURN this { actors: var3 } AS this
+----
+
+== Alias Top Level Connection Field Multiple Times
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies(where: {title: "Forrest Gump"}) {
+    title
+    hanks: actorsConnection(where: {node: {name: "Tom Hanks"}}) {
+      edges {
+        properties {
+          screenTime
+        }
+        node {
+          name
+        }
+      }
+    }
+    jenny: actorsConnection(where: {node: {name: "Robin Wright"}}) {
+      edges {
+        properties {
+          screenTime
+        }
+        node {
+          name
+        }
+      }
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "Forrest Gump",
+  "param1": "Tom Hanks",
+  "param2": "Robin Wright"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE this.title = $param0
+CALL {
+    WITH this
+    MATCH (this)<-[this0:ACTED_IN]-(this1:Actor)
+    WHERE this1.name = $param1
+    WITH collect({ node: this1, relationship: this0 }) AS edges
+    WITH edges, size(edges) AS totalCount
+    CALL {
+        WITH edges
+        UNWIND edges AS edge
+        WITH edge.node AS this1, edge.relationship AS this0
+        RETURN collect({ properties: { screenTime: this0.screenTime, __typename: "ActedIn" }, node: { name: this1.name, __typename: "Actor" } }) AS var2
+    }
+    RETURN { edges: var2, totalCount: totalCount } AS var3
+}
+CALL {
+    WITH this
+    MATCH (this)<-[this4:ACTED_IN]-(this5:Actor)
+    WHERE this5.name = $param2
+    WITH collect({ node: this5, relationship: this4 }) AS edges
+    WITH edges, size(edges) AS totalCount
+    CALL {
+        WITH edges
+        UNWIND edges AS edge
+        WITH edge.node AS this5, edge.relationship AS this4
+        RETURN collect({ properties: { screenTime: this4.screenTime, __typename: "ActedIn" }, node: { name: this5.name, __typename: "Actor" } }) AS var6
+    }
+    RETURN { edges: var6, totalCount: totalCount } AS var7
+}
+RETURN this { .title, hanks: var3, jenny: var7 } AS this
+----
diff --git a/core/src/test/resources/tck-test-files/cypher/v2/connections/filtering/composite.adoc b/core/src/test/resources/tck-test-files/cypher/v2/connections/filtering/composite.adoc
index f4ec0d98..1c46de46 100644
--- a/core/src/test/resources/tck-test-files/cypher/v2/connections/filtering/composite.adoc
+++ b/core/src/test/resources/tck-test-files/cypher/v2/connections/filtering/composite.adoc
@@ -27,7 +27,7 @@ type ActedIn @relationshipProperties {
 == Composite
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies(where: {title: "Forrest Gump"}) {
@@ -105,12 +105,10 @@ RETURN this {
 } AS this
 ----
 
-'''
-
 == Composite NOT
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies(where: {title: "Forrest Gump"}) {
@@ -188,12 +186,10 @@ RETURN this {
 } AS this
 ----
 
-'''
-
 == Composite OR (edge and node)
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies(where: {title: "Forrest Gump"}) {
@@ -271,12 +267,10 @@ RETURN this {
 } AS this
 ----
 
-'''
-
 == Composite NOT with nested OR (edge and node)
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies(where: {title: "Forrest Gump"}) {
@@ -354,12 +348,10 @@ RETURN this {
 } AS this
 ----
 
-'''
-
 == Composite NOT with complex nested filters
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies(where: {title: "Forrest Gump"}) {
@@ -440,6 +432,3 @@ RETURN this {
 	actorsConnection: actorsConnection
 } AS this
 ----
-
-'''
-
diff --git a/core/src/test/resources/tck-test-files/cypher/v2/connections/filtering/composite.js.adoc b/core/src/test/resources/tck-test-files/cypher/v2/connections/filtering/composite.js.adoc
new file mode 100644
index 00000000..636b4225
--- /dev/null
+++ b/core/src/test/resources/tck-test-files/cypher/v2/connections/filtering/composite.js.adoc
@@ -0,0 +1,323 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= Cypher -> Connections -> Filtering -> Composite
+
+== Setup
+
+.Schema
+[source,graphql,schema=true]
+----
+type Movie {
+  title: String!
+  actors: [Actor!]! @relationship(type: "ACTED_IN", properties: "ActedIn", direction: IN)
+}
+
+type Actor {
+  firstName: String!
+  lastName: String!
+  movies: [Movie!]! @relationship(type: "ACTED_IN", properties: "ActedIn", direction: OUT)
+}
+
+type ActedIn @relationshipProperties {
+  screenTime: Int!
+}
+----
+
+== Composite
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies(where: {title: "Forrest Gump"}) {
+    title
+    actorsConnection(
+      where: {node: {AND: [{firstName: "Tom"}, {lastName: "Hanks"}]}, edge: {AND: [{screenTime_GT: 30}, {screenTime_LT: 90}]}}
+    ) {
+      edges {
+        properties {
+          screenTime
+        }
+        node {
+          firstName
+          lastName
+        }
+      }
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "Forrest Gump",
+  "param1": "Tom",
+  "param2": "Hanks",
+  "param3": 30,
+  "param4": 90
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE this.title = $param0
+CALL {
+    WITH this
+    MATCH (this)<-[this0:ACTED_IN]-(this1:Actor)
+    WHERE ((this1.firstName = $param1 AND this1.lastName = $param2) AND (this0.screenTime > $param3 AND this0.screenTime < $param4))
+    WITH collect({ node: this1, relationship: this0 }) AS edges
+    WITH edges, size(edges) AS totalCount
+    CALL {
+        WITH edges
+        UNWIND edges AS edge
+        WITH edge.node AS this1, edge.relationship AS this0
+        RETURN collect({ properties: { screenTime: this0.screenTime, __typename: "ActedIn" }, node: { firstName: this1.firstName, lastName: this1.lastName, __typename: "Actor" } }) AS var2
+    }
+    RETURN { edges: var2, totalCount: totalCount } AS var3
+}
+RETURN this { .title, actorsConnection: var3 } AS this
+----
+
+== Composite NOT
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies(where: {title: "Forrest Gump"}) {
+    title
+    actorsConnection(
+      where: {node: {NOT: {firstName: "Tom", lastName: "Hanks"}}, edge: {NOT: {screenTime_GT: 30, screenTime_LT: 90}}}
+    ) {
+      edges {
+        properties {
+          screenTime
+        }
+        node {
+          firstName
+          lastName
+        }
+      }
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "Forrest Gump",
+  "param1": "Tom",
+  "param2": "Hanks",
+  "param3": 90,
+  "param4": 30
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE this.title = $param0
+CALL {
+    WITH this
+    MATCH (this)<-[this0:ACTED_IN]-(this1:Actor)
+    WHERE (NOT (this1.firstName = $param1 AND this1.lastName = $param2) AND NOT (this0.screenTime < $param3 AND this0.screenTime > $param4))
+    WITH collect({ node: this1, relationship: this0 }) AS edges
+    WITH edges, size(edges) AS totalCount
+    CALL {
+        WITH edges
+        UNWIND edges AS edge
+        WITH edge.node AS this1, edge.relationship AS this0
+        RETURN collect({ properties: { screenTime: this0.screenTime, __typename: "ActedIn" }, node: { firstName: this1.firstName, lastName: this1.lastName, __typename: "Actor" } }) AS var2
+    }
+    RETURN { edges: var2, totalCount: totalCount } AS var3
+}
+RETURN this { .title, actorsConnection: var3 } AS this
+----
+
+== Composite OR (edge and node)
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies(where: {title: "Forrest Gump"}) {
+    title
+    actorsConnection(
+      where: {OR: [{node: {AND: [{firstName: "Tom"}, {lastName: "Hanks"}]}}, {edge: {AND: [{screenTime_GT: 30}, {screenTime_LT: 90}]}}]}
+    ) {
+      edges {
+        properties {
+          screenTime
+        }
+        node {
+          firstName
+          lastName
+        }
+      }
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "Forrest Gump",
+  "param1": "Tom",
+  "param2": "Hanks",
+  "param3": 30,
+  "param4": 90
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE this.title = $param0
+CALL {
+    WITH this
+    MATCH (this)<-[this0:ACTED_IN]-(this1:Actor)
+    WHERE ((this1.firstName = $param1 AND this1.lastName = $param2) OR (this0.screenTime > $param3 AND this0.screenTime < $param4))
+    WITH collect({ node: this1, relationship: this0 }) AS edges
+    WITH edges, size(edges) AS totalCount
+    CALL {
+        WITH edges
+        UNWIND edges AS edge
+        WITH edge.node AS this1, edge.relationship AS this0
+        RETURN collect({ properties: { screenTime: this0.screenTime, __typename: "ActedIn" }, node: { firstName: this1.firstName, lastName: this1.lastName, __typename: "Actor" } }) AS var2
+    }
+    RETURN { edges: var2, totalCount: totalCount } AS var3
+}
+RETURN this { .title, actorsConnection: var3 } AS this
+----
+
+== Composite NOT with nested OR (edge and node)
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies(where: {title: "Forrest Gump"}) {
+    title
+    actorsConnection(
+      where: {NOT: {OR: [{node: {AND: [{firstName: "Tom"}, {lastName: "Hanks"}]}}, {edge: {AND: [{screenTime_GT: 30}, {screenTime_LT: 90}]}}]}}
+    ) {
+      edges {
+        properties {
+          screenTime
+        }
+        node {
+          firstName
+          lastName
+        }
+      }
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "Forrest Gump",
+  "param1": "Tom",
+  "param2": "Hanks",
+  "param3": 30,
+  "param4": 90
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE this.title = $param0
+CALL {
+    WITH this
+    MATCH (this)<-[this0:ACTED_IN]-(this1:Actor)
+    WHERE NOT ((this1.firstName = $param1 AND this1.lastName = $param2) OR (this0.screenTime > $param3 AND this0.screenTime < $param4))
+    WITH collect({ node: this1, relationship: this0 }) AS edges
+    WITH edges, size(edges) AS totalCount
+    CALL {
+        WITH edges
+        UNWIND edges AS edge
+        WITH edge.node AS this1, edge.relationship AS this0
+        RETURN collect({ properties: { screenTime: this0.screenTime, __typename: "ActedIn" }, node: { firstName: this1.firstName, lastName: this1.lastName, __typename: "Actor" } }) AS var2
+    }
+    RETURN { edges: var2, totalCount: totalCount } AS var3
+}
+RETURN this { .title, actorsConnection: var3 } AS this
+----
+
+== Composite NOT with complex nested filters
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies(where: {title: "Forrest Gump"}) {
+    title
+    actorsConnection(
+      where: {NOT: {AND: [{OR: [{node: {AND: [{firstName: "Tom"}, {lastName: "Hanks"}]}}, {edge: {AND: [{screenTime_GT: 30}, {screenTime_LT: 90}]}}]}, {node: {AND: [{firstName: "Tommy"}, {lastName: "Ford"}]}}]}}
+    ) {
+      edges {
+        properties {
+          screenTime
+        }
+        node {
+          firstName
+          lastName
+        }
+      }
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "Forrest Gump",
+  "param1": "Tom",
+  "param2": "Hanks",
+  "param3": 30,
+  "param4": 90,
+  "param5": "Tommy",
+  "param6": "Ford"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE this.title = $param0
+CALL {
+    WITH this
+    MATCH (this)<-[this0:ACTED_IN]-(this1:Actor)
+    WHERE NOT (((this1.firstName = $param1 AND this1.lastName = $param2) OR (this0.screenTime > $param3 AND this0.screenTime < $param4)) AND (this1.firstName = $param5 AND this1.lastName = $param6))
+    WITH collect({ node: this1, relationship: this0 }) AS edges
+    WITH edges, size(edges) AS totalCount
+    CALL {
+        WITH edges
+        UNWIND edges AS edge
+        WITH edge.node AS this1, edge.relationship AS this0
+        RETURN collect({ properties: { screenTime: this0.screenTime, __typename: "ActedIn" }, node: { firstName: this1.firstName, lastName: this1.lastName, __typename: "Actor" } }) AS var2
+    }
+    RETURN { edges: var2, totalCount: totalCount } AS var3
+}
+RETURN this { .title, actorsConnection: var3 } AS this
+----
diff --git a/core/src/test/resources/tck-test-files/cypher/v2/connections/filtering/node/and.adoc b/core/src/test/resources/tck-test-files/cypher/v2/connections/filtering/node/and.adoc
index 28441168..55c87bd2 100644
--- a/core/src/test/resources/tck-test-files/cypher/v2/connections/filtering/node/and.adoc
+++ b/core/src/test/resources/tck-test-files/cypher/v2/connections/filtering/node/and.adoc
@@ -27,7 +27,7 @@ type ActedIn @relationshipProperties {
 == AND
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies {
@@ -99,12 +99,10 @@ RETURN this {
 } AS this
 ----
 
-'''
-
 == NOT
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies {
@@ -171,6 +169,3 @@ RETURN this {
 	actorsConnection: actorsConnection
 } AS this
 ----
-
-'''
-
diff --git a/core/src/test/resources/tck-test-files/cypher/v2/connections/filtering/node/and.js.adoc b/core/src/test/resources/tck-test-files/cypher/v2/connections/filtering/node/and.js.adoc
new file mode 100644
index 00000000..fd146cc6
--- /dev/null
+++ b/core/src/test/resources/tck-test-files/cypher/v2/connections/filtering/node/and.js.adoc
@@ -0,0 +1,133 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= Cypher -> Connections -> Filtering -> Node -> AND
+
+== Setup
+
+.Schema
+[source,graphql,schema=true]
+----
+type Movie {
+  title: String!
+  actors: [Actor!]! @relationship(type: "ACTED_IN", properties: "ActedIn", direction: IN)
+}
+
+type Actor {
+  firstName: String!
+  lastName: String!
+  movies: [Movie!]! @relationship(type: "ACTED_IN", properties: "ActedIn", direction: OUT)
+}
+
+type ActedIn @relationshipProperties {
+  screenTime: Int!
+}
+----
+
+== AND
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies {
+    title
+    actorsConnection(
+      where: {node: {AND: [{firstName: "Tom"}, {lastName: "Hanks"}]}}
+    ) {
+      edges {
+        properties {
+          screenTime
+        }
+        node {
+          firstName
+          lastName
+        }
+      }
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "Tom",
+  "param1": "Hanks"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+CALL {
+    WITH this
+    MATCH (this)<-[this0:ACTED_IN]-(this1:Actor)
+    WHERE (this1.firstName = $param0 AND this1.lastName = $param1)
+    WITH collect({ node: this1, relationship: this0 }) AS edges
+    WITH edges, size(edges) AS totalCount
+    CALL {
+        WITH edges
+        UNWIND edges AS edge
+        WITH edge.node AS this1, edge.relationship AS this0
+        RETURN collect({ properties: { screenTime: this0.screenTime, __typename: "ActedIn" }, node: { firstName: this1.firstName, lastName: this1.lastName, __typename: "Actor" } }) AS var2
+    }
+    RETURN { edges: var2, totalCount: totalCount } AS var3
+}
+RETURN this { .title, actorsConnection: var3 } AS this
+----
+
+== NOT
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies {
+    title
+    actorsConnection(where: {node: {NOT: {firstName: "Tom"}}}) {
+      edges {
+        properties {
+          screenTime
+        }
+        node {
+          firstName
+          lastName
+        }
+      }
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "Tom"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+CALL {
+    WITH this
+    MATCH (this)<-[this0:ACTED_IN]-(this1:Actor)
+    WHERE NOT (this1.firstName = $param0)
+    WITH collect({ node: this1, relationship: this0 }) AS edges
+    WITH edges, size(edges) AS totalCount
+    CALL {
+        WITH edges
+        UNWIND edges AS edge
+        WITH edge.node AS this1, edge.relationship AS this0
+        RETURN collect({ properties: { screenTime: this0.screenTime, __typename: "ActedIn" }, node: { firstName: this1.firstName, lastName: this1.lastName, __typename: "Actor" } }) AS var2
+    }
+    RETURN { edges: var2, totalCount: totalCount } AS var3
+}
+RETURN this { .title, actorsConnection: var3 } AS this
+----
diff --git a/core/src/test/resources/tck-test-files/cypher/v2/connections/filtering/node/arrays.adoc b/core/src/test/resources/tck-test-files/cypher/v2/connections/filtering/node/arrays.adoc
index a74c8795..7840409a 100644
--- a/core/src/test/resources/tck-test-files/cypher/v2/connections/filtering/node/arrays.adoc
+++ b/core/src/test/resources/tck-test-files/cypher/v2/connections/filtering/node/arrays.adoc
@@ -27,7 +27,7 @@ type ActedIn @relationshipProperties {
 == IN
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies {
@@ -93,12 +93,10 @@ RETURN this {
 } AS this
 ----
 
-'''
-
 == INCLUDES
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies {
@@ -165,6 +163,3 @@ RETURN this {
 	actorsConnection: actorsConnection
 } AS this
 ----
-
-'''
-
diff --git a/core/src/test/resources/tck-test-files/cypher/v2/connections/filtering/node/arrays.js.adoc b/core/src/test/resources/tck-test-files/cypher/v2/connections/filtering/node/arrays.js.adoc
new file mode 100644
index 00000000..200ac356
--- /dev/null
+++ b/core/src/test/resources/tck-test-files/cypher/v2/connections/filtering/node/arrays.js.adoc
@@ -0,0 +1,132 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= Cypher -> Connections -> Filtering -> Node -> Arrays
+
+== Setup
+
+.Schema
+[source,graphql,schema=true]
+----
+type Movie {
+  title: String!
+  actors: [Actor!]! @relationship(type: "ACTED_IN", properties: "ActedIn", direction: IN)
+}
+
+type Actor {
+  name: String!
+  favouriteColours: [String!]
+  movies: [Movie!]! @relationship(type: "ACTED_IN", properties: "ActedIn", direction: OUT)
+}
+
+type ActedIn @relationshipProperties {
+  screenTime: Int!
+}
+----
+
+== IN
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies {
+    title
+    actorsConnection(where: {node: {name_IN: ["Tom Hanks", "Robin Wright"]}}) {
+      edges {
+        properties {
+          screenTime
+        }
+        node {
+          name
+        }
+      }
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": [
+    "Tom Hanks",
+    "Robin Wright"
+  ]
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+CALL {
+    WITH this
+    MATCH (this)<-[this0:ACTED_IN]-(this1:Actor)
+    WHERE this1.name IN $param0
+    WITH collect({ node: this1, relationship: this0 }) AS edges
+    WITH edges, size(edges) AS totalCount
+    CALL {
+        WITH edges
+        UNWIND edges AS edge
+        WITH edge.node AS this1, edge.relationship AS this0
+        RETURN collect({ properties: { screenTime: this0.screenTime, __typename: "ActedIn" }, node: { name: this1.name, __typename: "Actor" } }) AS var2
+    }
+    RETURN { edges: var2, totalCount: totalCount } AS var3
+}
+RETURN this { .title, actorsConnection: var3 } AS this
+----
+
+== INCLUDES
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies {
+    title
+    actorsConnection(where: {node: {favouriteColours_INCLUDES: "Blue"}}) {
+      edges {
+        properties {
+          screenTime
+        }
+        node {
+          name
+          favouriteColours
+        }
+      }
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "Blue"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+CALL {
+    WITH this
+    MATCH (this)<-[this0:ACTED_IN]-(this1:Actor)
+    WHERE $param0 IN this1.favouriteColours
+    WITH collect({ node: this1, relationship: this0 }) AS edges
+    WITH edges, size(edges) AS totalCount
+    CALL {
+        WITH edges
+        UNWIND edges AS edge
+        WITH edge.node AS this1, edge.relationship AS this0
+        RETURN collect({ properties: { screenTime: this0.screenTime, __typename: "ActedIn" }, node: { name: this1.name, favouriteColours: this1.favouriteColours, __typename: "Actor" } }) AS var2
+    }
+    RETURN { edges: var2, totalCount: totalCount } AS var3
+}
+RETURN this { .title, actorsConnection: var3 } AS this
+----
diff --git a/core/src/test/resources/tck-test-files/cypher/v2/connections/filtering/node/equality.adoc b/core/src/test/resources/tck-test-files/cypher/v2/connections/filtering/node/equality.adoc
index eca34db5..e62c02b3 100644
--- a/core/src/test/resources/tck-test-files/cypher/v2/connections/filtering/node/equality.adoc
+++ b/core/src/test/resources/tck-test-files/cypher/v2/connections/filtering/node/equality.adoc
@@ -26,7 +26,7 @@ type ActedIn @relationshipProperties {
 == Equality
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies {
@@ -91,6 +91,3 @@ RETURN this {
 	actorsConnection: actorsConnection
 } AS this
 ----
-
-'''
-
diff --git a/core/src/test/resources/tck-test-files/cypher/v2/connections/filtering/node/equality.js.adoc b/core/src/test/resources/tck-test-files/cypher/v2/connections/filtering/node/equality.js.adoc
new file mode 100644
index 00000000..6ac70701
--- /dev/null
+++ b/core/src/test/resources/tck-test-files/cypher/v2/connections/filtering/node/equality.js.adoc
@@ -0,0 +1,76 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= Cypher -> Connections -> Filtering -> Node -> Equality
+
+== Setup
+
+.Schema
+[source,graphql,schema=true]
+----
+type Movie {
+  title: String!
+  actors: [Actor!]! @relationship(type: "ACTED_IN", properties: "ActedIn", direction: IN)
+}
+
+type Actor {
+  name: String!
+  movies: [Movie!]! @relationship(type: "ACTED_IN", properties: "ActedIn", direction: OUT)
+}
+
+type ActedIn @relationshipProperties {
+  screenTime: Int!
+}
+----
+
+== Equality
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies {
+    title
+    actorsConnection(where: {node: {name: "Tom Hanks"}}) {
+      edges {
+        properties {
+          screenTime
+        }
+        node {
+          name
+        }
+      }
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "Tom Hanks"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+CALL {
+    WITH this
+    MATCH (this)<-[this0:ACTED_IN]-(this1:Actor)
+    WHERE this1.name = $param0
+    WITH collect({ node: this1, relationship: this0 }) AS edges
+    WITH edges, size(edges) AS totalCount
+    CALL {
+        WITH edges
+        UNWIND edges AS edge
+        WITH edge.node AS this1, edge.relationship AS this0
+        RETURN collect({ properties: { screenTime: this0.screenTime, __typename: "ActedIn" }, node: { name: this1.name, __typename: "Actor" } }) AS var2
+    }
+    RETURN { edges: var2, totalCount: totalCount } AS var3
+}
+RETURN this { .title, actorsConnection: var3 } AS this
+----
diff --git a/core/src/test/resources/tck-test-files/cypher/v2/connections/filtering/node/numerical.adoc b/core/src/test/resources/tck-test-files/cypher/v2/connections/filtering/node/numerical.adoc
index be835fbc..83e6e1f0 100644
--- a/core/src/test/resources/tck-test-files/cypher/v2/connections/filtering/node/numerical.adoc
+++ b/core/src/test/resources/tck-test-files/cypher/v2/connections/filtering/node/numerical.adoc
@@ -27,7 +27,7 @@ type ActedIn @relationshipProperties {
 == LT
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies {
@@ -95,12 +95,10 @@ RETURN this {
 } AS this
 ----
 
-'''
-
 == LTE
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies {
@@ -168,12 +166,10 @@ RETURN this {
 } AS this
 ----
 
-'''
-
 == GT
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies {
@@ -241,12 +237,10 @@ RETURN this {
 } AS this
 ----
 
-'''
-
 == GTE
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies {
@@ -313,6 +307,3 @@ RETURN this {
 	actorsConnection: actorsConnection
 } AS this
 ----
-
-'''
-
diff --git a/core/src/test/resources/tck-test-files/cypher/v2/connections/filtering/node/numerical.js.adoc b/core/src/test/resources/tck-test-files/cypher/v2/connections/filtering/node/numerical.js.adoc
new file mode 100644
index 00000000..dda64b99
--- /dev/null
+++ b/core/src/test/resources/tck-test-files/cypher/v2/connections/filtering/node/numerical.js.adoc
@@ -0,0 +1,234 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= Cypher -> Connections -> Filtering -> Node -> Numerical
+
+== Setup
+
+.Schema
+[source,graphql,schema=true]
+----
+type Movie {
+  title: String!
+  actors: [Actor!]! @relationship(type: "ACTED_IN", properties: "ActedIn", direction: IN)
+}
+
+type Actor {
+  name: String!
+  age: Int!
+  movies: [Movie!]! @relationship(type: "ACTED_IN", properties: "ActedIn", direction: OUT)
+}
+
+type ActedIn @relationshipProperties {
+  screenTime: Int!
+}
+----
+
+== LT
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies {
+    title
+    actorsConnection(where: {node: {age_LT: 60}}) {
+      edges {
+        properties {
+          screenTime
+        }
+        node {
+          name
+          age
+        }
+      }
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": 60
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+CALL {
+    WITH this
+    MATCH (this)<-[this0:ACTED_IN]-(this1:Actor)
+    WHERE this1.age < $param0
+    WITH collect({ node: this1, relationship: this0 }) AS edges
+    WITH edges, size(edges) AS totalCount
+    CALL {
+        WITH edges
+        UNWIND edges AS edge
+        WITH edge.node AS this1, edge.relationship AS this0
+        RETURN collect({ properties: { screenTime: this0.screenTime, __typename: "ActedIn" }, node: { name: this1.name, age: this1.age, __typename: "Actor" } }) AS var2
+    }
+    RETURN { edges: var2, totalCount: totalCount } AS var3
+}
+RETURN this { .title, actorsConnection: var3 } AS this
+----
+
+== LTE
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies {
+    title
+    actorsConnection(where: {node: {age_LTE: 60}}) {
+      edges {
+        properties {
+          screenTime
+        }
+        node {
+          name
+          age
+        }
+      }
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": 60
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+CALL {
+    WITH this
+    MATCH (this)<-[this0:ACTED_IN]-(this1:Actor)
+    WHERE this1.age <= $param0
+    WITH collect({ node: this1, relationship: this0 }) AS edges
+    WITH edges, size(edges) AS totalCount
+    CALL {
+        WITH edges
+        UNWIND edges AS edge
+        WITH edge.node AS this1, edge.relationship AS this0
+        RETURN collect({ properties: { screenTime: this0.screenTime, __typename: "ActedIn" }, node: { name: this1.name, age: this1.age, __typename: "Actor" } }) AS var2
+    }
+    RETURN { edges: var2, totalCount: totalCount } AS var3
+}
+RETURN this { .title, actorsConnection: var3 } AS this
+----
+
+== GT
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies {
+    title
+    actorsConnection(where: {node: {age_GT: 60}}) {
+      edges {
+        properties {
+          screenTime
+        }
+        node {
+          name
+          age
+        }
+      }
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": 60
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+CALL {
+    WITH this
+    MATCH (this)<-[this0:ACTED_IN]-(this1:Actor)
+    WHERE this1.age > $param0
+    WITH collect({ node: this1, relationship: this0 }) AS edges
+    WITH edges, size(edges) AS totalCount
+    CALL {
+        WITH edges
+        UNWIND edges AS edge
+        WITH edge.node AS this1, edge.relationship AS this0
+        RETURN collect({ properties: { screenTime: this0.screenTime, __typename: "ActedIn" }, node: { name: this1.name, age: this1.age, __typename: "Actor" } }) AS var2
+    }
+    RETURN { edges: var2, totalCount: totalCount } AS var3
+}
+RETURN this { .title, actorsConnection: var3 } AS this
+----
+
+== GTE
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies {
+    title
+    actorsConnection(where: {node: {age_GTE: 60}}) {
+      edges {
+        properties {
+          screenTime
+        }
+        node {
+          name
+          age
+        }
+      }
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": 60
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+CALL {
+    WITH this
+    MATCH (this)<-[this0:ACTED_IN]-(this1:Actor)
+    WHERE this1.age >= $param0
+    WITH collect({ node: this1, relationship: this0 }) AS edges
+    WITH edges, size(edges) AS totalCount
+    CALL {
+        WITH edges
+        UNWIND edges AS edge
+        WITH edge.node AS this1, edge.relationship AS this0
+        RETURN collect({ properties: { screenTime: this0.screenTime, __typename: "ActedIn" }, node: { name: this1.name, age: this1.age, __typename: "Actor" } }) AS var2
+    }
+    RETURN { edges: var2, totalCount: totalCount } AS var3
+}
+RETURN this { .title, actorsConnection: var3 } AS this
+----
diff --git a/core/src/test/resources/tck-test-files/cypher/v2/connections/filtering/node/or.adoc b/core/src/test/resources/tck-test-files/cypher/v2/connections/filtering/node/or.adoc
index 9a5ad65a..f96dc912 100644
--- a/core/src/test/resources/tck-test-files/cypher/v2/connections/filtering/node/or.adoc
+++ b/core/src/test/resources/tck-test-files/cypher/v2/connections/filtering/node/or.adoc
@@ -27,7 +27,7 @@ type ActedIn @relationshipProperties {
 == OR
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies {
@@ -96,6 +96,3 @@ RETURN this {
 	actorsConnection: actorsConnection
 } AS this
 ----
-
-'''
-
diff --git a/core/src/test/resources/tck-test-files/cypher/v2/connections/filtering/node/or.js.adoc b/core/src/test/resources/tck-test-files/cypher/v2/connections/filtering/node/or.js.adoc
new file mode 100644
index 00000000..089a2861
--- /dev/null
+++ b/core/src/test/resources/tck-test-files/cypher/v2/connections/filtering/node/or.js.adoc
@@ -0,0 +1,79 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= Cypher -> Connections -> Filtering -> Node -> OR
+
+== Setup
+
+.Schema
+[source,graphql,schema=true]
+----
+type Movie {
+  title: String!
+  actors: [Actor!]! @relationship(type: "ACTED_IN", properties: "ActedIn", direction: IN)
+}
+
+type Actor {
+  firstName: String!
+  lastName: String!
+  movies: [Movie!]! @relationship(type: "ACTED_IN", properties: "ActedIn", direction: OUT)
+}
+
+type ActedIn @relationshipProperties {
+  screenTime: Int!
+}
+----
+
+== OR
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies {
+    title
+    actorsConnection(where: {node: {OR: [{firstName: "Tom"}, {lastName: "Hanks"}]}}) {
+      edges {
+        properties {
+          screenTime
+        }
+        node {
+          firstName
+          lastName
+        }
+      }
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "Tom",
+  "param1": "Hanks"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+CALL {
+    WITH this
+    MATCH (this)<-[this0:ACTED_IN]-(this1:Actor)
+    WHERE (this1.firstName = $param0 OR this1.lastName = $param1)
+    WITH collect({ node: this1, relationship: this0 }) AS edges
+    WITH edges, size(edges) AS totalCount
+    CALL {
+        WITH edges
+        UNWIND edges AS edge
+        WITH edge.node AS this1, edge.relationship AS this0
+        RETURN collect({ properties: { screenTime: this0.screenTime, __typename: "ActedIn" }, node: { firstName: this1.firstName, lastName: this1.lastName, __typename: "Actor" } }) AS var2
+    }
+    RETURN { edges: var2, totalCount: totalCount } AS var3
+}
+RETURN this { .title, actorsConnection: var3 } AS this
+----
diff --git a/core/src/test/resources/tck-test-files/cypher/v2/connections/filtering/node/points.adoc b/core/src/test/resources/tck-test-files/cypher/v2/connections/filtering/node/points.adoc
index 5ca56fd6..c5e19bbb 100644
--- a/core/src/test/resources/tck-test-files/cypher/v2/connections/filtering/node/points.adoc
+++ b/core/src/test/resources/tck-test-files/cypher/v2/connections/filtering/node/points.adoc
@@ -27,7 +27,7 @@ type ActedIn @relationshipProperties {
 == DISTANCE
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies {
@@ -108,6 +108,3 @@ RETURN this {
 	actorsConnection: actorsConnection
 } AS this
 ----
-
-'''
-
diff --git a/core/src/test/resources/tck-test-files/cypher/v2/connections/filtering/node/points.js.adoc b/core/src/test/resources/tck-test-files/cypher/v2/connections/filtering/node/points.js.adoc
new file mode 100644
index 00000000..110b21bd
--- /dev/null
+++ b/core/src/test/resources/tck-test-files/cypher/v2/connections/filtering/node/points.js.adoc
@@ -0,0 +1,92 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= Cypher -> Connections -> Filtering -> Node -> Points
+
+== Setup
+
+.Schema
+[source,graphql,schema=true]
+----
+type Movie {
+  title: String!
+  actors: [Actor!]! @relationship(type: "ACTED_IN", properties: "ActedIn", direction: IN)
+}
+
+type Actor {
+  name: String!
+  currentLocation: Point!
+  movies: [Movie!]! @relationship(type: "ACTED_IN", properties: "ActedIn", direction: OUT)
+}
+
+type ActedIn @relationshipProperties {
+  screenTime: Int!
+}
+----
+
+== DISTANCE
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies {
+    title
+    actorsConnection(
+      where: {node: {currentLocation_DISTANCE: {point: {longitude: 1.0, latitude: 2.0}, distance: 3.0}}}
+    ) {
+      edges {
+        properties {
+          screenTime
+        }
+        node {
+          name
+          currentLocation {
+            latitude
+            longitude
+          }
+        }
+      }
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": {
+    "point": {
+      "longitude": 1,
+      "latitude": 2
+    },
+    "distance": 3
+  }
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+CALL {
+    WITH this
+    MATCH (this)<-[this0:ACTED_IN]-(this1:Actor)
+    WHERE point.distance(this1.currentLocation, point($param0.point)) = $param0.distance
+    WITH collect({ node: this1, relationship: this0 }) AS edges
+    WITH edges, size(edges) AS totalCount
+    CALL {
+        WITH edges
+        UNWIND edges AS edge
+        WITH edge.node AS this1, edge.relationship AS this0
+        RETURN collect({ properties: { screenTime: this0.screenTime, __typename: "ActedIn" }, node: { name: this1.name, currentLocation: CASE
+            WHEN this1.currentLocation IS NOT NULL THEN { point: this1.currentLocation }
+            ELSE NULL
+        END, __typename: "Actor" } }) AS var2
+    }
+    RETURN { edges: var2, totalCount: totalCount } AS var3
+}
+RETURN this { .title, actorsConnection: var3 } AS this
+----
diff --git a/core/src/test/resources/tck-test-files/cypher/v2/connections/filtering/node/string.adoc b/core/src/test/resources/tck-test-files/cypher/v2/connections/filtering/node/string.adoc
index 6e1cb911..e1e637b3 100644
--- a/core/src/test/resources/tck-test-files/cypher/v2/connections/filtering/node/string.adoc
+++ b/core/src/test/resources/tck-test-files/cypher/v2/connections/filtering/node/string.adoc
@@ -27,10 +27,10 @@ type ActedIn @relationshipProperties {
 [source,json,schema-config=true]
 ----
 {
-  "features": {
-    "filters": {
-      "String": {
-        "MATCHES": true
+  "features" : {
+    "filters" : {
+      "String" : {
+        "MATCHES" : true
       }
     }
   }
@@ -40,7 +40,7 @@ type ActedIn @relationshipProperties {
 == CONTAINS
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies {
@@ -106,12 +106,10 @@ RETURN this {
 } AS this
 ----
 
-'''
-
 == STARTS_WITH
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies {
@@ -177,12 +175,10 @@ RETURN this {
 } AS this
 ----
 
-'''
-
 == ENDS_WITH
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies {
@@ -248,12 +244,10 @@ RETURN this {
 } AS this
 ----
 
-'''
-
 == MATCHES
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies {
@@ -318,6 +312,3 @@ RETURN this {
 	actorsConnection: actorsConnection
 } AS this
 ----
-
-'''
-
diff --git a/core/src/test/resources/tck-test-files/cypher/v2/connections/filtering/node/string.js.adoc b/core/src/test/resources/tck-test-files/cypher/v2/connections/filtering/node/string.js.adoc
new file mode 100644
index 00000000..078cf1d6
--- /dev/null
+++ b/core/src/test/resources/tck-test-files/cypher/v2/connections/filtering/node/string.js.adoc
@@ -0,0 +1,243 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= Cypher -> Connections -> Filtering -> Node -> String
+
+== Setup
+
+.Schema
+[source,graphql,schema=true]
+----
+type Movie {
+  title: String!
+  actors: [Actor!]! @relationship(type: "ACTED_IN", properties: "ActedIn", direction: IN)
+}
+
+type Actor {
+  name: String!
+  movies: [Movie!]! @relationship(type: "ACTED_IN", properties: "ActedIn", direction: OUT)
+}
+
+type ActedIn @relationshipProperties {
+  screenTime: Int!
+}
+----
+
+.Configuration
+[source,json,schema-config=true]
+----
+{
+  "features": {
+    "filters": {
+      "String": {
+        "MATCHES": true
+      }
+    }
+  }
+}
+----
+
+== CONTAINS
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies {
+    title
+    actorsConnection(where: {node: {name_CONTAINS: "Tom"}}) {
+      edges {
+        properties {
+          screenTime
+        }
+        node {
+          name
+        }
+      }
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "Tom"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+CALL {
+    WITH this
+    MATCH (this)<-[this0:ACTED_IN]-(this1:Actor)
+    WHERE this1.name CONTAINS $param0
+    WITH collect({ node: this1, relationship: this0 }) AS edges
+    WITH edges, size(edges) AS totalCount
+    CALL {
+        WITH edges
+        UNWIND edges AS edge
+        WITH edge.node AS this1, edge.relationship AS this0
+        RETURN collect({ properties: { screenTime: this0.screenTime, __typename: "ActedIn" }, node: { name: this1.name, __typename: "Actor" } }) AS var2
+    }
+    RETURN { edges: var2, totalCount: totalCount } AS var3
+}
+RETURN this { .title, actorsConnection: var3 } AS this
+----
+
+== STARTS_WITH
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies {
+    title
+    actorsConnection(where: {node: {name_STARTS_WITH: "Tom"}}) {
+      edges {
+        properties {
+          screenTime
+        }
+        node {
+          name
+        }
+      }
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "Tom"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+CALL {
+    WITH this
+    MATCH (this)<-[this0:ACTED_IN]-(this1:Actor)
+    WHERE this1.name STARTS WITH $param0
+    WITH collect({ node: this1, relationship: this0 }) AS edges
+    WITH edges, size(edges) AS totalCount
+    CALL {
+        WITH edges
+        UNWIND edges AS edge
+        WITH edge.node AS this1, edge.relationship AS this0
+        RETURN collect({ properties: { screenTime: this0.screenTime, __typename: "ActedIn" }, node: { name: this1.name, __typename: "Actor" } }) AS var2
+    }
+    RETURN { edges: var2, totalCount: totalCount } AS var3
+}
+RETURN this { .title, actorsConnection: var3 } AS this
+----
+
+== ENDS_WITH
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies {
+    title
+    actorsConnection(where: {node: {name_ENDS_WITH: "Hanks"}}) {
+      edges {
+        properties {
+          screenTime
+        }
+        node {
+          name
+        }
+      }
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "Hanks"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+CALL {
+    WITH this
+    MATCH (this)<-[this0:ACTED_IN]-(this1:Actor)
+    WHERE this1.name ENDS WITH $param0
+    WITH collect({ node: this1, relationship: this0 }) AS edges
+    WITH edges, size(edges) AS totalCount
+    CALL {
+        WITH edges
+        UNWIND edges AS edge
+        WITH edge.node AS this1, edge.relationship AS this0
+        RETURN collect({ properties: { screenTime: this0.screenTime, __typename: "ActedIn" }, node: { name: this1.name, __typename: "Actor" } }) AS var2
+    }
+    RETURN { edges: var2, totalCount: totalCount } AS var3
+}
+RETURN this { .title, actorsConnection: var3 } AS this
+----
+
+== MATCHES
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies {
+    title
+    actorsConnection(where: {node: {name_MATCHES: "Tom.+"}}) {
+      edges {
+        properties {
+          screenTime
+        }
+        node {
+          name
+        }
+      }
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "Tom.+"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+CALL {
+    WITH this
+    MATCH (this)<-[this0:ACTED_IN]-(this1:Actor)
+    WHERE this1.name =~ $param0
+    WITH collect({ node: this1, relationship: this0 }) AS edges
+    WITH edges, size(edges) AS totalCount
+    CALL {
+        WITH edges
+        UNWIND edges AS edge
+        WITH edge.node AS this1, edge.relationship AS this0
+        RETURN collect({ properties: { screenTime: this0.screenTime, __typename: "ActedIn" }, node: { name: this1.name, __typename: "Actor" } }) AS var2
+    }
+    RETURN { edges: var2, totalCount: totalCount } AS var3
+}
+RETURN this { .title, actorsConnection: var3 } AS this
+----
diff --git a/core/src/test/resources/tck-test-files/cypher/v2/connections/filtering/relationship/and.adoc b/core/src/test/resources/tck-test-files/cypher/v2/connections/filtering/relationship/and.adoc
index 9db428b8..e0f1aa35 100644
--- a/core/src/test/resources/tck-test-files/cypher/v2/connections/filtering/relationship/and.adoc
+++ b/core/src/test/resources/tck-test-files/cypher/v2/connections/filtering/relationship/and.adoc
@@ -27,7 +27,7 @@ type ActedIn @relationshipProperties {
 == AND
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies {
@@ -99,12 +99,10 @@ RETURN this {
 } AS this
 ----
 
-'''
-
 == NOT
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies {
@@ -171,6 +169,3 @@ RETURN this {
 	actorsConnection: actorsConnection
 } AS this
 ----
-
-'''
-
diff --git a/core/src/test/resources/tck-test-files/cypher/v2/connections/filtering/relationship/and.js.adoc b/core/src/test/resources/tck-test-files/cypher/v2/connections/filtering/relationship/and.js.adoc
new file mode 100644
index 00000000..461e3d2a
--- /dev/null
+++ b/core/src/test/resources/tck-test-files/cypher/v2/connections/filtering/relationship/and.js.adoc
@@ -0,0 +1,133 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= Cypher -> Connections -> Filtering -> Relationship -> AND
+
+== Setup
+
+.Schema
+[source,graphql,schema=true]
+----
+type Movie {
+  title: String!
+  actors: [Actor!]! @relationship(type: "ACTED_IN", properties: "ActedIn", direction: IN)
+}
+
+type Actor {
+  name: String!
+  movies: [Movie!]! @relationship(type: "ACTED_IN", properties: "ActedIn", direction: OUT)
+}
+
+type ActedIn @relationshipProperties {
+  role: String!
+  screenTime: Int!
+}
+----
+
+== AND
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies {
+    title
+    actorsConnection(
+      where: {edge: {AND: [{role_ENDS_WITH: "Gump"}, {screenTime_LT: 60}]}}
+    ) {
+      edges {
+        properties {
+          role
+          screenTime
+        }
+        node {
+          name
+        }
+      }
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "Gump",
+  "param1": 60
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+CALL {
+    WITH this
+    MATCH (this)<-[this0:ACTED_IN]-(this1:Actor)
+    WHERE (this0.role ENDS WITH $param0 AND this0.screenTime < $param1)
+    WITH collect({ node: this1, relationship: this0 }) AS edges
+    WITH edges, size(edges) AS totalCount
+    CALL {
+        WITH edges
+        UNWIND edges AS edge
+        WITH edge.node AS this1, edge.relationship AS this0
+        RETURN collect({ properties: { role: this0.role, screenTime: this0.screenTime, __typename: "ActedIn" }, node: { name: this1.name, __typename: "Actor" } }) AS var2
+    }
+    RETURN { edges: var2, totalCount: totalCount } AS var3
+}
+RETURN this { .title, actorsConnection: var3 } AS this
+----
+
+== NOT
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies {
+    title
+    actorsConnection(where: {edge: {NOT: {role_ENDS_WITH: "Gump"}}}) {
+      edges {
+        properties {
+          role
+          screenTime
+        }
+        node {
+          name
+        }
+      }
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "Gump"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+CALL {
+    WITH this
+    MATCH (this)<-[this0:ACTED_IN]-(this1:Actor)
+    WHERE NOT (this0.role ENDS WITH $param0)
+    WITH collect({ node: this1, relationship: this0 }) AS edges
+    WITH edges, size(edges) AS totalCount
+    CALL {
+        WITH edges
+        UNWIND edges AS edge
+        WITH edge.node AS this1, edge.relationship AS this0
+        RETURN collect({ properties: { role: this0.role, screenTime: this0.screenTime, __typename: "ActedIn" }, node: { name: this1.name, __typename: "Actor" } }) AS var2
+    }
+    RETURN { edges: var2, totalCount: totalCount } AS var3
+}
+RETURN this { .title, actorsConnection: var3 } AS this
+----
diff --git a/core/src/test/resources/tck-test-files/cypher/v2/connections/filtering/relationship/arrays.adoc b/core/src/test/resources/tck-test-files/cypher/v2/connections/filtering/relationship/arrays.adoc
index 69731492..97fd92c7 100644
--- a/core/src/test/resources/tck-test-files/cypher/v2/connections/filtering/relationship/arrays.adoc
+++ b/core/src/test/resources/tck-test-files/cypher/v2/connections/filtering/relationship/arrays.adoc
@@ -27,7 +27,7 @@ type ActedIn @relationshipProperties {
 == IN
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies {
@@ -93,12 +93,10 @@ RETURN this {
 } AS this
 ----
 
-'''
-
 == INCLUDES
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies {
@@ -165,6 +163,3 @@ RETURN this {
 	actorsConnection: actorsConnection
 } AS this
 ----
-
-'''
-
diff --git a/core/src/test/resources/tck-test-files/cypher/v2/connections/filtering/relationship/arrays.js.adoc b/core/src/test/resources/tck-test-files/cypher/v2/connections/filtering/relationship/arrays.js.adoc
new file mode 100644
index 00000000..c71010df
--- /dev/null
+++ b/core/src/test/resources/tck-test-files/cypher/v2/connections/filtering/relationship/arrays.js.adoc
@@ -0,0 +1,133 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= Cypher -> Connections -> Filtering -> Relationship -> Arrays
+
+== Setup
+
+.Schema
+[source,graphql,schema=true]
+----
+type Movie {
+  title: String!
+  actors: [Actor!]! @relationship(type: "ACTED_IN", properties: "ActedIn", direction: IN)
+}
+
+type Actor {
+  name: String!
+  movies: [Movie!]! @relationship(type: "ACTED_IN", properties: "ActedIn", direction: OUT)
+}
+
+type ActedIn @relationshipProperties {
+  screenTime: Int!
+  quotes: [String!]
+}
+----
+
+== IN
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies {
+    title
+    actorsConnection(where: {edge: {screenTime_IN: [60, 70]}}) {
+      edges {
+        properties {
+          screenTime
+        }
+        node {
+          name
+        }
+      }
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": [
+    60,
+    70
+  ]
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+CALL {
+    WITH this
+    MATCH (this)<-[this0:ACTED_IN]-(this1:Actor)
+    WHERE this0.screenTime IN $param0
+    WITH collect({ node: this1, relationship: this0 }) AS edges
+    WITH edges, size(edges) AS totalCount
+    CALL {
+        WITH edges
+        UNWIND edges AS edge
+        WITH edge.node AS this1, edge.relationship AS this0
+        RETURN collect({ properties: { screenTime: this0.screenTime, __typename: "ActedIn" }, node: { name: this1.name, __typename: "Actor" } }) AS var2
+    }
+    RETURN { edges: var2, totalCount: totalCount } AS var3
+}
+RETURN this { .title, actorsConnection: var3 } AS this
+----
+
+== INCLUDES
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies {
+    title
+    actorsConnection(
+      where: {edge: {quotes_INCLUDES: "Life is like a box of chocolates"}}
+    ) {
+      edges {
+        properties {
+          screenTime
+        }
+        node {
+          name
+        }
+      }
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "Life is like a box of chocolates"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+CALL {
+    WITH this
+    MATCH (this)<-[this0:ACTED_IN]-(this1:Actor)
+    WHERE $param0 IN this0.quotes
+    WITH collect({ node: this1, relationship: this0 }) AS edges
+    WITH edges, size(edges) AS totalCount
+    CALL {
+        WITH edges
+        UNWIND edges AS edge
+        WITH edge.node AS this1, edge.relationship AS this0
+        RETURN collect({ properties: { screenTime: this0.screenTime, __typename: "ActedIn" }, node: { name: this1.name, __typename: "Actor" } }) AS var2
+    }
+    RETURN { edges: var2, totalCount: totalCount } AS var3
+}
+RETURN this { .title, actorsConnection: var3 } AS this
+----
diff --git a/core/src/test/resources/tck-test-files/cypher/v2/connections/filtering/relationship/equality.adoc b/core/src/test/resources/tck-test-files/cypher/v2/connections/filtering/relationship/equality.adoc
index c4105307..009b5221 100644
--- a/core/src/test/resources/tck-test-files/cypher/v2/connections/filtering/relationship/equality.adoc
+++ b/core/src/test/resources/tck-test-files/cypher/v2/connections/filtering/relationship/equality.adoc
@@ -26,7 +26,7 @@ type ActedIn @relationshipProperties {
 == Equality
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies {
@@ -91,6 +91,3 @@ RETURN this {
 	actorsConnection: actorsConnection
 } AS this
 ----
-
-'''
-
diff --git a/core/src/test/resources/tck-test-files/cypher/v2/connections/filtering/relationship/equality.js.adoc b/core/src/test/resources/tck-test-files/cypher/v2/connections/filtering/relationship/equality.js.adoc
new file mode 100644
index 00000000..ad8e6772
--- /dev/null
+++ b/core/src/test/resources/tck-test-files/cypher/v2/connections/filtering/relationship/equality.js.adoc
@@ -0,0 +1,76 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= Cypher -> Connections -> Filtering -> Relationship -> Equality
+
+== Setup
+
+.Schema
+[source,graphql,schema=true]
+----
+type Movie {
+  title: String!
+  actors: [Actor!]! @relationship(type: "ACTED_IN", properties: "ActedIn", direction: IN)
+}
+
+type Actor {
+  name: String!
+  movies: [Movie!]! @relationship(type: "ACTED_IN", properties: "ActedIn", direction: OUT)
+}
+
+type ActedIn @relationshipProperties {
+  screenTime: Int!
+}
+----
+
+== Equality
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies {
+    title
+    actorsConnection(where: {edge: {screenTime: 60}}) {
+      edges {
+        properties {
+          screenTime
+        }
+        node {
+          name
+        }
+      }
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": 60
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+CALL {
+    WITH this
+    MATCH (this)<-[this0:ACTED_IN]-(this1:Actor)
+    WHERE this0.screenTime = $param0
+    WITH collect({ node: this1, relationship: this0 }) AS edges
+    WITH edges, size(edges) AS totalCount
+    CALL {
+        WITH edges
+        UNWIND edges AS edge
+        WITH edge.node AS this1, edge.relationship AS this0
+        RETURN collect({ properties: { screenTime: this0.screenTime, __typename: "ActedIn" }, node: { name: this1.name, __typename: "Actor" } }) AS var2
+    }
+    RETURN { edges: var2, totalCount: totalCount } AS var3
+}
+RETURN this { .title, actorsConnection: var3 } AS this
+----
diff --git a/core/src/test/resources/tck-test-files/cypher/v2/connections/filtering/relationship/numerical.adoc b/core/src/test/resources/tck-test-files/cypher/v2/connections/filtering/relationship/numerical.adoc
index c1bd3fc9..972d636b 100644
--- a/core/src/test/resources/tck-test-files/cypher/v2/connections/filtering/relationship/numerical.adoc
+++ b/core/src/test/resources/tck-test-files/cypher/v2/connections/filtering/relationship/numerical.adoc
@@ -26,7 +26,7 @@ type ActedIn @relationshipProperties {
 == LT
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies {
@@ -92,12 +92,10 @@ RETURN this {
 } AS this
 ----
 
-'''
-
 == LTE
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies {
@@ -163,12 +161,10 @@ RETURN this {
 } AS this
 ----
 
-'''
-
 == GT
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies {
@@ -234,12 +230,10 @@ RETURN this {
 } AS this
 ----
 
-'''
-
 == GTE
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies {
@@ -304,6 +298,3 @@ RETURN this {
 	actorsConnection: actorsConnection
 } AS this
 ----
-
-'''
-
diff --git a/core/src/test/resources/tck-test-files/cypher/v2/connections/filtering/relationship/numerical.js.adoc b/core/src/test/resources/tck-test-files/cypher/v2/connections/filtering/relationship/numerical.js.adoc
new file mode 100644
index 00000000..5bcbc67a
--- /dev/null
+++ b/core/src/test/resources/tck-test-files/cypher/v2/connections/filtering/relationship/numerical.js.adoc
@@ -0,0 +1,229 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= Cypher -> Connections -> Filtering -> Relationship -> Numerical
+
+== Setup
+
+.Schema
+[source,graphql,schema=true]
+----
+type Movie {
+  title: String!
+  actors: [Actor!]! @relationship(type: "ACTED_IN", properties: "ActedIn", direction: IN)
+}
+
+type Actor {
+  name: String!
+  movies: [Movie!]! @relationship(type: "ACTED_IN", properties: "ActedIn", direction: OUT)
+}
+
+type ActedIn @relationshipProperties {
+  screenTime: Int!
+}
+----
+
+== LT
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies {
+    title
+    actorsConnection(where: {edge: {screenTime_LT: 60}}) {
+      edges {
+        properties {
+          screenTime
+        }
+        node {
+          name
+        }
+      }
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": 60
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+CALL {
+    WITH this
+    MATCH (this)<-[this0:ACTED_IN]-(this1:Actor)
+    WHERE this0.screenTime < $param0
+    WITH collect({ node: this1, relationship: this0 }) AS edges
+    WITH edges, size(edges) AS totalCount
+    CALL {
+        WITH edges
+        UNWIND edges AS edge
+        WITH edge.node AS this1, edge.relationship AS this0
+        RETURN collect({ properties: { screenTime: this0.screenTime, __typename: "ActedIn" }, node: { name: this1.name, __typename: "Actor" } }) AS var2
+    }
+    RETURN { edges: var2, totalCount: totalCount } AS var3
+}
+RETURN this { .title, actorsConnection: var3 } AS this
+----
+
+== LTE
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies {
+    title
+    actorsConnection(where: {edge: {screenTime_LTE: 60}}) {
+      edges {
+        properties {
+          screenTime
+        }
+        node {
+          name
+        }
+      }
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": 60
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+CALL {
+    WITH this
+    MATCH (this)<-[this0:ACTED_IN]-(this1:Actor)
+    WHERE this0.screenTime <= $param0
+    WITH collect({ node: this1, relationship: this0 }) AS edges
+    WITH edges, size(edges) AS totalCount
+    CALL {
+        WITH edges
+        UNWIND edges AS edge
+        WITH edge.node AS this1, edge.relationship AS this0
+        RETURN collect({ properties: { screenTime: this0.screenTime, __typename: "ActedIn" }, node: { name: this1.name, __typename: "Actor" } }) AS var2
+    }
+    RETURN { edges: var2, totalCount: totalCount } AS var3
+}
+RETURN this { .title, actorsConnection: var3 } AS this
+----
+
+== GT
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies {
+    title
+    actorsConnection(where: {edge: {screenTime_GT: 60}}) {
+      edges {
+        properties {
+          screenTime
+        }
+        node {
+          name
+        }
+      }
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": 60
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+CALL {
+    WITH this
+    MATCH (this)<-[this0:ACTED_IN]-(this1:Actor)
+    WHERE this0.screenTime > $param0
+    WITH collect({ node: this1, relationship: this0 }) AS edges
+    WITH edges, size(edges) AS totalCount
+    CALL {
+        WITH edges
+        UNWIND edges AS edge
+        WITH edge.node AS this1, edge.relationship AS this0
+        RETURN collect({ properties: { screenTime: this0.screenTime, __typename: "ActedIn" }, node: { name: this1.name, __typename: "Actor" } }) AS var2
+    }
+    RETURN { edges: var2, totalCount: totalCount } AS var3
+}
+RETURN this { .title, actorsConnection: var3 } AS this
+----
+
+== GTE
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies {
+    title
+    actorsConnection(where: {edge: {screenTime_GTE: 60}}) {
+      edges {
+        properties {
+          screenTime
+        }
+        node {
+          name
+        }
+      }
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": 60
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+CALL {
+    WITH this
+    MATCH (this)<-[this0:ACTED_IN]-(this1:Actor)
+    WHERE this0.screenTime >= $param0
+    WITH collect({ node: this1, relationship: this0 }) AS edges
+    WITH edges, size(edges) AS totalCount
+    CALL {
+        WITH edges
+        UNWIND edges AS edge
+        WITH edge.node AS this1, edge.relationship AS this0
+        RETURN collect({ properties: { screenTime: this0.screenTime, __typename: "ActedIn" }, node: { name: this1.name, __typename: "Actor" } }) AS var2
+    }
+    RETURN { edges: var2, totalCount: totalCount } AS var3
+}
+RETURN this { .title, actorsConnection: var3 } AS this
+----
diff --git a/core/src/test/resources/tck-test-files/cypher/v2/connections/filtering/relationship/or.adoc b/core/src/test/resources/tck-test-files/cypher/v2/connections/filtering/relationship/or.adoc
index bca493c1..2991af1e 100644
--- a/core/src/test/resources/tck-test-files/cypher/v2/connections/filtering/relationship/or.adoc
+++ b/core/src/test/resources/tck-test-files/cypher/v2/connections/filtering/relationship/or.adoc
@@ -27,7 +27,7 @@ type ActedIn @relationshipProperties {
 == OR
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies {
@@ -98,6 +98,3 @@ RETURN this {
 	actorsConnection: actorsConnection
 } AS this
 ----
-
-'''
-
diff --git a/core/src/test/resources/tck-test-files/cypher/v2/connections/filtering/relationship/or.js.adoc b/core/src/test/resources/tck-test-files/cypher/v2/connections/filtering/relationship/or.js.adoc
new file mode 100644
index 00000000..c2b90e40
--- /dev/null
+++ b/core/src/test/resources/tck-test-files/cypher/v2/connections/filtering/relationship/or.js.adoc
@@ -0,0 +1,81 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= Cypher -> Connections -> Filtering -> Relationship -> OR
+
+== Setup
+
+.Schema
+[source,graphql,schema=true]
+----
+type Movie {
+  title: String!
+  actors: [Actor!]! @relationship(type: "ACTED_IN", properties: "ActedIn", direction: IN)
+}
+
+type Actor {
+  name: String!
+  movies: [Movie!]! @relationship(type: "ACTED_IN", properties: "ActedIn", direction: OUT)
+}
+
+type ActedIn @relationshipProperties {
+  role: String!
+  screenTime: Int!
+}
+----
+
+== OR
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies {
+    title
+    actorsConnection(
+      where: {edge: {OR: [{role_ENDS_WITH: "Gump"}, {screenTime_LT: 60}]}}
+    ) {
+      edges {
+        properties {
+          role
+          screenTime
+        }
+        node {
+          name
+        }
+      }
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "Gump",
+  "param1": 60
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+CALL {
+    WITH this
+    MATCH (this)<-[this0:ACTED_IN]-(this1:Actor)
+    WHERE (this0.role ENDS WITH $param0 OR this0.screenTime < $param1)
+    WITH collect({ node: this1, relationship: this0 }) AS edges
+    WITH edges, size(edges) AS totalCount
+    CALL {
+        WITH edges
+        UNWIND edges AS edge
+        WITH edge.node AS this1, edge.relationship AS this0
+        RETURN collect({ properties: { role: this0.role, screenTime: this0.screenTime, __typename: "ActedIn" }, node: { name: this1.name, __typename: "Actor" } }) AS var2
+    }
+    RETURN { edges: var2, totalCount: totalCount } AS var3
+}
+RETURN this { .title, actorsConnection: var3 } AS this
+----
diff --git a/core/src/test/resources/tck-test-files/cypher/v2/connections/filtering/relationship/points.adoc b/core/src/test/resources/tck-test-files/cypher/v2/connections/filtering/relationship/points.adoc
index 2faecba8..2a934294 100644
--- a/core/src/test/resources/tck-test-files/cypher/v2/connections/filtering/relationship/points.adoc
+++ b/core/src/test/resources/tck-test-files/cypher/v2/connections/filtering/relationship/points.adoc
@@ -27,7 +27,7 @@ type ActedIn @relationshipProperties {
 == DISTANCE
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies {
@@ -108,6 +108,3 @@ RETURN this {
 	actorsConnection: actorsConnection
 } AS this
 ----
-
-'''
-
diff --git a/core/src/test/resources/tck-test-files/cypher/v2/connections/filtering/relationship/points.js.adoc b/core/src/test/resources/tck-test-files/cypher/v2/connections/filtering/relationship/points.js.adoc
new file mode 100644
index 00000000..f5dc064f
--- /dev/null
+++ b/core/src/test/resources/tck-test-files/cypher/v2/connections/filtering/relationship/points.js.adoc
@@ -0,0 +1,92 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= Cypher -> Connections -> Filtering -> Relationship -> Points
+
+== Setup
+
+.Schema
+[source,graphql,schema=true]
+----
+type Movie {
+  title: String!
+  actors: [Actor!]! @relationship(type: "ACTED_IN", properties: "ActedIn", direction: IN)
+}
+
+type Actor {
+  name: String!
+  movies: [Movie!]! @relationship(type: "ACTED_IN", properties: "ActedIn", direction: OUT)
+}
+
+type ActedIn @relationshipProperties {
+  screenTime: Int!
+  location: Point!
+}
+----
+
+== DISTANCE
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies {
+    title
+    actorsConnection(
+      where: {edge: {location_DISTANCE: {point: {longitude: 1.0, latitude: 2.0}, distance: 3.0}}}
+    ) {
+      edges {
+        properties {
+          screenTime
+          location {
+            latitude
+            longitude
+          }
+        }
+        node {
+          name
+        }
+      }
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": {
+    "point": {
+      "longitude": 1,
+      "latitude": 2
+    },
+    "distance": 3
+  }
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+CALL {
+    WITH this
+    MATCH (this)<-[this0:ACTED_IN]-(this1:Actor)
+    WHERE point.distance(this0.location, point($param0.point)) = $param0.distance
+    WITH collect({ node: this1, relationship: this0 }) AS edges
+    WITH edges, size(edges) AS totalCount
+    CALL {
+        WITH edges
+        UNWIND edges AS edge
+        WITH edge.node AS this1, edge.relationship AS this0
+        RETURN collect({ properties: { screenTime: this0.screenTime, location: CASE
+            WHEN this0.location IS NOT NULL THEN { point: this0.location }
+            ELSE NULL
+        END, __typename: "ActedIn" }, node: { name: this1.name, __typename: "Actor" } }) AS var2
+    }
+    RETURN { edges: var2, totalCount: totalCount } AS var3
+}
+RETURN this { .title, actorsConnection: var3 } AS this
+----
diff --git a/core/src/test/resources/tck-test-files/cypher/v2/connections/filtering/relationship/string.adoc b/core/src/test/resources/tck-test-files/cypher/v2/connections/filtering/relationship/string.adoc
index 55249d57..314d0c3c 100644
--- a/core/src/test/resources/tck-test-files/cypher/v2/connections/filtering/relationship/string.adoc
+++ b/core/src/test/resources/tck-test-files/cypher/v2/connections/filtering/relationship/string.adoc
@@ -28,10 +28,10 @@ type ActedIn @relationshipProperties {
 [source,json,schema-config=true]
 ----
 {
-  "features": {
-    "filters": {
-      "String": {
-        "MATCHES": true
+  "features" : {
+    "filters" : {
+      "String" : {
+        "MATCHES" : true
       }
     }
   }
@@ -41,7 +41,7 @@ type ActedIn @relationshipProperties {
 == CONTAINS
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies {
@@ -107,12 +107,10 @@ RETURN this {
 } AS this
 ----
 
-'''
-
 == STARTS_WITH
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies {
@@ -178,12 +176,10 @@ RETURN this {
 } AS this
 ----
 
-'''
-
 == ENDS_WITH
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies {
@@ -249,12 +245,10 @@ RETURN this {
 } AS this
 ----
 
-'''
-
 == MATCHES
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies {
@@ -319,6 +313,3 @@ RETURN this {
 	actorsConnection: actorsConnection
 } AS this
 ----
-
-'''
-
diff --git a/core/src/test/resources/tck-test-files/cypher/v2/connections/filtering/relationship/string.js.adoc b/core/src/test/resources/tck-test-files/cypher/v2/connections/filtering/relationship/string.js.adoc
new file mode 100644
index 00000000..af887726
--- /dev/null
+++ b/core/src/test/resources/tck-test-files/cypher/v2/connections/filtering/relationship/string.js.adoc
@@ -0,0 +1,244 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= Cypher -> Connections -> Filtering -> Relationship -> String
+
+== Setup
+
+.Schema
+[source,graphql,schema=true]
+----
+type Movie {
+  title: String!
+  actors: [Actor!]! @relationship(type: "ACTED_IN", properties: "ActedIn", direction: IN)
+}
+
+type Actor {
+  name: String!
+  movies: [Movie!]! @relationship(type: "ACTED_IN", properties: "ActedIn", direction: OUT)
+}
+
+type ActedIn @relationshipProperties {
+  role: String!
+  screenTime: Int!
+}
+----
+
+.Configuration
+[source,json,schema-config=true]
+----
+{
+  "features": {
+    "filters": {
+      "String": {
+        "MATCHES": true
+      }
+    }
+  }
+}
+----
+
+== CONTAINS
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies {
+    title
+    actorsConnection(where: {edge: {role_CONTAINS: "Forrest"}}) {
+      edges {
+        properties {
+          role
+        }
+        node {
+          name
+        }
+      }
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "Forrest"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+CALL {
+    WITH this
+    MATCH (this)<-[this0:ACTED_IN]-(this1:Actor)
+    WHERE this0.role CONTAINS $param0
+    WITH collect({ node: this1, relationship: this0 }) AS edges
+    WITH edges, size(edges) AS totalCount
+    CALL {
+        WITH edges
+        UNWIND edges AS edge
+        WITH edge.node AS this1, edge.relationship AS this0
+        RETURN collect({ properties: { role: this0.role, __typename: "ActedIn" }, node: { name: this1.name, __typename: "Actor" } }) AS var2
+    }
+    RETURN { edges: var2, totalCount: totalCount } AS var3
+}
+RETURN this { .title, actorsConnection: var3 } AS this
+----
+
+== STARTS_WITH
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies {
+    title
+    actorsConnection(where: {edge: {role_STARTS_WITH: "Forrest"}}) {
+      edges {
+        properties {
+          role
+        }
+        node {
+          name
+        }
+      }
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "Forrest"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+CALL {
+    WITH this
+    MATCH (this)<-[this0:ACTED_IN]-(this1:Actor)
+    WHERE this0.role STARTS WITH $param0
+    WITH collect({ node: this1, relationship: this0 }) AS edges
+    WITH edges, size(edges) AS totalCount
+    CALL {
+        WITH edges
+        UNWIND edges AS edge
+        WITH edge.node AS this1, edge.relationship AS this0
+        RETURN collect({ properties: { role: this0.role, __typename: "ActedIn" }, node: { name: this1.name, __typename: "Actor" } }) AS var2
+    }
+    RETURN { edges: var2, totalCount: totalCount } AS var3
+}
+RETURN this { .title, actorsConnection: var3 } AS this
+----
+
+== ENDS_WITH
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies {
+    title
+    actorsConnection(where: {edge: {role_ENDS_WITH: "Gump"}}) {
+      edges {
+        properties {
+          role
+        }
+        node {
+          name
+        }
+      }
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "Gump"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+CALL {
+    WITH this
+    MATCH (this)<-[this0:ACTED_IN]-(this1:Actor)
+    WHERE this0.role ENDS WITH $param0
+    WITH collect({ node: this1, relationship: this0 }) AS edges
+    WITH edges, size(edges) AS totalCount
+    CALL {
+        WITH edges
+        UNWIND edges AS edge
+        WITH edge.node AS this1, edge.relationship AS this0
+        RETURN collect({ properties: { role: this0.role, __typename: "ActedIn" }, node: { name: this1.name, __typename: "Actor" } }) AS var2
+    }
+    RETURN { edges: var2, totalCount: totalCount } AS var3
+}
+RETURN this { .title, actorsConnection: var3 } AS this
+----
+
+== MATCHES
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies {
+    title
+    actorsConnection(where: {edge: {role_MATCHES: "Forrest.+"}}) {
+      edges {
+        properties {
+          role
+        }
+        node {
+          name
+        }
+      }
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "Forrest.+"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+CALL {
+    WITH this
+    MATCH (this)<-[this0:ACTED_IN]-(this1:Actor)
+    WHERE this0.role =~ $param0
+    WITH collect({ node: this1, relationship: this0 }) AS edges
+    WITH edges, size(edges) AS totalCount
+    CALL {
+        WITH edges
+        UNWIND edges AS edge
+        WITH edge.node AS this1, edge.relationship AS this0
+        RETURN collect({ properties: { role: this0.role, __typename: "ActedIn" }, node: { name: this1.name, __typename: "Actor" } }) AS var2
+    }
+    RETURN { edges: var2, totalCount: totalCount } AS var3
+}
+RETURN this { .title, actorsConnection: var3 } AS this
+----
diff --git a/core/src/test/resources/tck-test-files/cypher/v2/connections/filtering/relationship/temporal.adoc b/core/src/test/resources/tck-test-files/cypher/v2/connections/filtering/relationship/temporal.adoc
index db1c857c..6954154f 100644
--- a/core/src/test/resources/tck-test-files/cypher/v2/connections/filtering/relationship/temporal.adoc
+++ b/core/src/test/resources/tck-test-files/cypher/v2/connections/filtering/relationship/temporal.adoc
@@ -27,7 +27,7 @@ type ActedIn @relationshipProperties {
 == GT and LT
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies {
@@ -98,6 +98,3 @@ RETURN this {
 	actorsConnection: actorsConnection
 } AS this
 ----
-
-'''
-
diff --git a/core/src/test/resources/tck-test-files/cypher/v2/connections/filtering/relationship/temporal.js.adoc b/core/src/test/resources/tck-test-files/cypher/v2/connections/filtering/relationship/temporal.js.adoc
new file mode 100644
index 00000000..56202512
--- /dev/null
+++ b/core/src/test/resources/tck-test-files/cypher/v2/connections/filtering/relationship/temporal.js.adoc
@@ -0,0 +1,81 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= Cypher -> Connections -> Filtering -> Relationship -> Temporal
+
+== Setup
+
+.Schema
+[source,graphql,schema=true]
+----
+type Movie {
+  title: String!
+  actors: [Actor!]! @relationship(type: "ACTED_IN", properties: "ActedIn", direction: IN)
+}
+
+type Actor {
+  name: String!
+  movies: [Movie!]! @relationship(type: "ACTED_IN", properties: "ActedIn", direction: OUT)
+}
+
+type ActedIn @relationshipProperties {
+  startDate: Date
+  endDateTime: DateTime
+}
+----
+
+== GT and LT
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies {
+    title
+    actorsConnection(
+      where: {edge: {startDate_GT: "2000-01-01", endDateTime_LT: "2010-01-01T00:00:00.000Z"}}
+    ) {
+      edges {
+        properties {
+          startDate
+          endDateTime
+        }
+        node {
+          name
+        }
+      }
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "2000-01-01",
+  "param1": "2010-01-01T00:00:00Z"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+CALL {
+    WITH this
+    MATCH (this)<-[this0:ACTED_IN]-(this1:Actor)
+    WHERE (this0.startDate > $param0 AND this0.endDateTime < $param1)
+    WITH collect({ node: this1, relationship: this0 }) AS edges
+    WITH edges, size(edges) AS totalCount
+    CALL {
+        WITH edges
+        UNWIND edges AS edge
+        WITH edge.node AS this1, edge.relationship AS this0
+        RETURN collect({ properties: { startDate: this0.startDate, endDateTime: apoc.date.convertFormat(toString(this0.endDateTime), "iso_zoned_date_time", "iso_offset_date_time"), __typename: "ActedIn" }, node: { name: this1.name, __typename: "Actor" } }) AS var2
+    }
+    RETURN { edges: var2, totalCount: totalCount } AS var3
+}
+RETURN this { .title, actorsConnection: var3 } AS this
+----
diff --git a/core/src/test/resources/tck-test-files/cypher/v2/connections/interfaces.adoc b/core/src/test/resources/tck-test-files/cypher/v2/connections/interfaces.adoc
index 4fd89db6..033e8c35 100644
--- a/core/src/test/resources/tck-test-files/cypher/v2/connections/interfaces.adoc
+++ b/core/src/test/resources/tck-test-files/cypher/v2/connections/interfaces.adoc
@@ -35,7 +35,7 @@ type Actor {
 == Projecting interface node and relationship properties with no arguments
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   actors {
@@ -117,12 +117,10 @@ RETURN this {
 } AS this
 ----
 
-'''
-
 == Projecting interface node and relationship properties with common where argument
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   actors {
@@ -209,12 +207,10 @@ RETURN this {
 } AS this
 ----
 
-'''
-
 == Projecting interface node and relationship properties with where relationship argument
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   actors {
@@ -301,8 +297,6 @@ RETURN this {
 } AS this
 ----
 
-'''
-
 == Projecting interface node and relationship properties with sort argument
 
 === field in selection set
@@ -310,7 +304,7 @@ RETURN this {
 ==== on edge
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   actors {
@@ -398,12 +392,10 @@ RETURN this {
 } AS this
 ----
 
-'''
-
 ==== on node
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   actors {
@@ -491,14 +483,12 @@ RETURN this {
 } AS this
 ----
 
-'''
-
 === field not in selection set
 
 ==== on edge
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   actors {
@@ -583,12 +573,10 @@ RETURN this {
 } AS this
 ----
 
-'''
-
 ==== on node
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   actors {
@@ -674,6 +662,3 @@ RETURN this {
 	actedInConnection: actedInConnection
 } AS this
 ----
-
-'''
-
diff --git a/core/src/test/resources/tck-test-files/cypher/v2/connections/interfaces.js.adoc b/core/src/test/resources/tck-test-files/cypher/v2/connections/interfaces.js.adoc
new file mode 100644
index 00000000..9d2b49a7
--- /dev/null
+++ b/core/src/test/resources/tck-test-files/cypher/v2/connections/interfaces.js.adoc
@@ -0,0 +1,480 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= Cypher -> Connections -> Interfaces
+
+== Setup
+
+.Schema
+[source,graphql,schema=true]
+----
+interface Production {
+  title: String!
+}
+
+type Movie implements Production {
+  title: String!
+  runtime: Int!
+}
+
+type Series implements Production {
+  title: String!
+  episodes: Int!
+}
+
+type ActedIn @relationshipProperties {
+  screenTime: Int!
+}
+
+type Actor {
+  name: String!
+  actedIn: [Production!]! @relationship(type: "ACTED_IN", direction: OUT, properties: "ActedIn")
+}
+----
+
+== Projecting interface node and relationship properties with no arguments
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  actors {
+    name
+    actedInConnection {
+      edges {
+        properties {
+          screenTime
+        }
+        node {
+          title
+          ... on Movie {
+            runtime
+          }
+          ... on Series {
+            episodes
+          }
+        }
+      }
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Actor)
+CALL {
+    WITH this
+    CALL {
+        WITH this
+        MATCH (this)-[this0:ACTED_IN]->(this1:Movie)
+        WITH { properties: { screenTime: this0.screenTime, __typename: "ActedIn" }, node: { __typename: "Movie", __id: toString(id(this1)), runtime: this1.runtime, title: this1.title } } AS edge
+        RETURN edge
+        UNION
+        WITH this
+        MATCH (this)-[this2:ACTED_IN]->(this3:Series)
+        WITH { properties: { screenTime: this2.screenTime, __typename: "ActedIn" }, node: { __typename: "Series", __id: toString(id(this3)), episodes: this3.episodes, title: this3.title } } AS edge
+        RETURN edge
+    }
+    WITH collect(edge) AS edges
+    WITH edges, size(edges) AS totalCount
+    RETURN { edges: edges, totalCount: totalCount } AS var4
+}
+RETURN this { .name, actedInConnection: var4 } AS this
+----
+
+== Projecting interface node and relationship properties with common where argument
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  actors {
+    name
+    actedInConnection(where: {node: {title_STARTS_WITH: "The "}}) {
+      edges {
+        properties {
+          screenTime
+        }
+        node {
+          title
+          ... on Movie {
+            runtime
+          }
+          ... on Series {
+            episodes
+          }
+        }
+      }
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "The ",
+  "param1": "The "
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Actor)
+CALL {
+    WITH this
+    CALL {
+        WITH this
+        MATCH (this)-[this0:ACTED_IN]->(this1:Movie)
+        WHERE this1.title STARTS WITH $param0
+        WITH { properties: { screenTime: this0.screenTime, __typename: "ActedIn" }, node: { __typename: "Movie", __id: toString(id(this1)), runtime: this1.runtime, title: this1.title } } AS edge
+        RETURN edge
+        UNION
+        WITH this
+        MATCH (this)-[this2:ACTED_IN]->(this3:Series)
+        WHERE this3.title STARTS WITH $param1
+        WITH { properties: { screenTime: this2.screenTime, __typename: "ActedIn" }, node: { __typename: "Series", __id: toString(id(this3)), episodes: this3.episodes, title: this3.title } } AS edge
+        RETURN edge
+    }
+    WITH collect(edge) AS edges
+    WITH edges, size(edges) AS totalCount
+    RETURN { edges: edges, totalCount: totalCount } AS var4
+}
+RETURN this { .name, actedInConnection: var4 } AS this
+----
+
+== Projecting interface node and relationship properties with where relationship argument
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  actors {
+    name
+    actedInConnection(where: {edge: {screenTime_GT: 60}}) {
+      edges {
+        properties {
+          screenTime
+        }
+        node {
+          title
+          ... on Movie {
+            runtime
+          }
+          ... on Series {
+            episodes
+          }
+        }
+      }
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": 60,
+  "param1": 60
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Actor)
+CALL {
+    WITH this
+    CALL {
+        WITH this
+        MATCH (this)-[this0:ACTED_IN]->(this1:Movie)
+        WHERE this0.screenTime > $param0
+        WITH { properties: { screenTime: this0.screenTime, __typename: "ActedIn" }, node: { __typename: "Movie", __id: toString(id(this1)), runtime: this1.runtime, title: this1.title } } AS edge
+        RETURN edge
+        UNION
+        WITH this
+        MATCH (this)-[this2:ACTED_IN]->(this3:Series)
+        WHERE this2.screenTime > $param1
+        WITH { properties: { screenTime: this2.screenTime, __typename: "ActedIn" }, node: { __typename: "Series", __id: toString(id(this3)), episodes: this3.episodes, title: this3.title } } AS edge
+        RETURN edge
+    }
+    WITH collect(edge) AS edges
+    WITH edges, size(edges) AS totalCount
+    RETURN { edges: edges, totalCount: totalCount } AS var4
+}
+RETURN this { .name, actedInConnection: var4 } AS this
+----
+
+== Projecting interface node and relationship properties with sort argument
+
+=== field in selection set
+
+==== on edge
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  actors {
+    name
+    actedInConnection(sort: [{edge: {screenTime: ASC}}]) {
+      edges {
+        properties {
+          screenTime
+        }
+        node {
+          title
+          ... on Movie {
+            runtime
+          }
+          ... on Series {
+            episodes
+          }
+        }
+      }
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Actor)
+CALL {
+    WITH this
+    CALL {
+        WITH this
+        MATCH (this)-[this0:ACTED_IN]->(this1:Movie)
+        WITH { properties: { screenTime: this0.screenTime, __typename: "ActedIn" }, node: { __typename: "Movie", __id: toString(id(this1)), runtime: this1.runtime, title: this1.title } } AS edge
+        RETURN edge
+        UNION
+        WITH this
+        MATCH (this)-[this2:ACTED_IN]->(this3:Series)
+        WITH { properties: { screenTime: this2.screenTime, __typename: "ActedIn" }, node: { __typename: "Series", __id: toString(id(this3)), episodes: this3.episodes, title: this3.title } } AS edge
+        RETURN edge
+    }
+    WITH collect(edge) AS edges
+    WITH edges, size(edges) AS totalCount
+    CALL {
+        WITH edges
+        UNWIND edges AS edge
+        WITH edge
+        ORDER BY edge.properties.screenTime ASC
+        RETURN collect(edge) AS var4
+    }
+    RETURN { edges: var4, totalCount: totalCount } AS var5
+}
+RETURN this { .name, actedInConnection: var5 } AS this
+----
+
+==== on node
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  actors {
+    name
+    actedInConnection(sort: [{node: {title: ASC}}]) {
+      edges {
+        properties {
+          screenTime
+        }
+        node {
+          title
+          ... on Movie {
+            runtime
+          }
+          ... on Series {
+            episodes
+          }
+        }
+      }
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Actor)
+CALL {
+    WITH this
+    CALL {
+        WITH this
+        MATCH (this)-[this0:ACTED_IN]->(this1:Movie)
+        WITH { properties: { screenTime: this0.screenTime, __typename: "ActedIn" }, node: { __typename: "Movie", __id: toString(id(this1)), runtime: this1.runtime, title: this1.title } } AS edge
+        RETURN edge
+        UNION
+        WITH this
+        MATCH (this)-[this2:ACTED_IN]->(this3:Series)
+        WITH { properties: { screenTime: this2.screenTime, __typename: "ActedIn" }, node: { __typename: "Series", __id: toString(id(this3)), episodes: this3.episodes, title: this3.title } } AS edge
+        RETURN edge
+    }
+    WITH collect(edge) AS edges
+    WITH edges, size(edges) AS totalCount
+    CALL {
+        WITH edges
+        UNWIND edges AS edge
+        WITH edge
+        ORDER BY edge.node.title ASC
+        RETURN collect(edge) AS var4
+    }
+    RETURN { edges: var4, totalCount: totalCount } AS var5
+}
+RETURN this { .name, actedInConnection: var5 } AS this
+----
+
+=== field not in selection set
+
+==== on edge
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  actors {
+    name
+    actedInConnection(sort: [{edge: {screenTime: ASC}}]) {
+      edges {
+        node {
+          title
+          ... on Movie {
+            runtime
+          }
+          ... on Series {
+            episodes
+          }
+        }
+      }
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Actor)
+CALL {
+    WITH this
+    CALL {
+        WITH this
+        MATCH (this)-[this0:ACTED_IN]->(this1:Movie)
+        WITH { properties: { screenTime: this0.screenTime, __typename: "ActedIn" }, node: { __typename: "Movie", __id: toString(id(this1)), runtime: this1.runtime, title: this1.title } } AS edge
+        RETURN edge
+        UNION
+        WITH this
+        MATCH (this)-[this2:ACTED_IN]->(this3:Series)
+        WITH { properties: { screenTime: this2.screenTime, __typename: "ActedIn" }, node: { __typename: "Series", __id: toString(id(this3)), episodes: this3.episodes, title: this3.title } } AS edge
+        RETURN edge
+    }
+    WITH collect(edge) AS edges
+    WITH edges, size(edges) AS totalCount
+    CALL {
+        WITH edges
+        UNWIND edges AS edge
+        WITH edge
+        ORDER BY edge.properties.screenTime ASC
+        RETURN collect(edge) AS var4
+    }
+    RETURN { edges: var4, totalCount: totalCount } AS var5
+}
+RETURN this { .name, actedInConnection: var5 } AS this
+----
+
+==== on node
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  actors {
+    name
+    actedInConnection(sort: [{node: {title: ASC}}]) {
+      edges {
+        properties {
+          screenTime
+        }
+        node {
+          ... on Movie {
+            runtime
+          }
+          ... on Series {
+            episodes
+          }
+        }
+      }
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Actor)
+CALL {
+    WITH this
+    CALL {
+        WITH this
+        MATCH (this)-[this0:ACTED_IN]->(this1:Movie)
+        WITH { properties: { screenTime: this0.screenTime, __typename: "ActedIn" }, node: { __typename: "Movie", __id: toString(id(this1)), runtime: this1.runtime, title: this1.title } } AS edge
+        RETURN edge
+        UNION
+        WITH this
+        MATCH (this)-[this2:ACTED_IN]->(this3:Series)
+        WITH { properties: { screenTime: this2.screenTime, __typename: "ActedIn" }, node: { __typename: "Series", __id: toString(id(this3)), episodes: this3.episodes, title: this3.title } } AS edge
+        RETURN edge
+    }
+    WITH collect(edge) AS edges
+    WITH edges, size(edges) AS totalCount
+    CALL {
+        WITH edges
+        UNWIND edges AS edge
+        WITH edge
+        ORDER BY edge.node.title ASC
+        RETURN collect(edge) AS var4
+    }
+    RETURN { edges: var4, totalCount: totalCount } AS var5
+}
+RETURN this { .name, actedInConnection: var5 } AS this
+----
diff --git a/core/src/test/resources/tck-test-files/cypher/v2/connections/projections/projections.adoc b/core/src/test/resources/tck-test-files/cypher/v2/connections/projections/projections.adoc
index db13b1c8..09d76ff6 100644
--- a/core/src/test/resources/tck-test-files/cypher/v2/connections/projections/projections.adoc
+++ b/core/src/test/resources/tck-test-files/cypher/v2/connections/projections/projections.adoc
@@ -29,7 +29,7 @@ type Actor {
 == edges not returned if not asked for
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies(where: {title: "Forrest Gump"}) {
@@ -84,12 +84,10 @@ RETURN this {
 } AS this
 ----
 
-'''
-
 == edges and totalCount returned if pageInfo asked for
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies(where: {title: "Forrest Gump"}) {
@@ -149,12 +147,10 @@ RETURN this {
 } AS this
 ----
 
-'''
-
 == Minimal edges returned if not asked for with pagination arguments
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies(where: {title: "Forrest Gump"}) {
@@ -210,12 +206,10 @@ RETURN this {
 } AS this
 ----
 
-'''
-
 == edges not returned if not asked for on a union
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   actors(where: {name: "Tom Hanks"}) {
@@ -275,12 +269,10 @@ RETURN this {
 } AS this
 ----
 
-'''
-
 == edges and totalCount returned if pageInfo asked for on a union
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   actors(where: {name: "Tom Hanks"}) {
@@ -345,12 +337,10 @@ RETURN this {
 } AS this
 ----
 
-'''
-
 == totalCount is calculated and returned if asked for with edges
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies(where: {title: "Forrest Gump"}) {
@@ -410,12 +400,10 @@ RETURN this {
 } AS this
 ----
 
-'''
-
 == totalCount is calculated and returned if asked for with edges with pagination arguments
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies(where: {title: "Forrest Gump"}) {
@@ -475,6 +463,3 @@ RETURN this {
 	actorsConnection: actorsConnection
 } AS this
 ----
-
-'''
-
diff --git a/core/src/test/resources/tck-test-files/cypher/v2/connections/projections/projections.js.adoc b/core/src/test/resources/tck-test-files/cypher/v2/connections/projections/projections.js.adoc
new file mode 100644
index 00000000..e4057bc3
--- /dev/null
+++ b/core/src/test/resources/tck-test-files/cypher/v2/connections/projections/projections.js.adoc
@@ -0,0 +1,372 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= Relay Cursor Connection projections
+
+== Setup
+
+.Schema
+[source,graphql,schema=true]
+----
+union Production = Movie | Series
+
+type Movie {
+  title: String!
+  actors: [Actor!]! @relationship(type: "ACTED_IN", direction: IN)
+}
+
+type Series {
+  title: String!
+  actors: [Actor!]! @relationship(type: "ACTED_IN", direction: IN)
+}
+
+type Actor {
+  name: String!
+  productions: [Production!]! @relationship(type: "ACTED_IN", direction: OUT)
+}
+----
+
+== edges not returned if not asked for
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies(where: {title: "Forrest Gump"}) {
+    title
+    actorsConnection {
+      totalCount
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "Forrest Gump"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE this.title = $param0
+CALL {
+    WITH this
+    MATCH (this)<-[this0:ACTED_IN]-(this1:Actor)
+    WITH collect({ node: this1, relationship: this0 }) AS edges
+    WITH edges, size(edges) AS totalCount
+    CALL {
+        WITH edges
+        UNWIND edges AS edge
+        WITH edge.node AS this1, edge.relationship AS this0
+        RETURN collect({ node: { __id: toString(id(this1)), __typename: "Actor" } }) AS var2
+    }
+    RETURN { edges: var2, totalCount: totalCount } AS var3
+}
+RETURN this { .title, actorsConnection: var3 } AS this
+----
+
+== edges and totalCount returned if pageInfo asked for
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies(where: {title: "Forrest Gump"}) {
+    title
+    actorsConnection {
+      pageInfo {
+        startCursor
+        endCursor
+        hasNextPage
+        hasPreviousPage
+      }
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "Forrest Gump"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE this.title = $param0
+CALL {
+    WITH this
+    MATCH (this)<-[this0:ACTED_IN]-(this1:Actor)
+    WITH collect({ node: this1, relationship: this0 }) AS edges
+    WITH edges, size(edges) AS totalCount
+    CALL {
+        WITH edges
+        UNWIND edges AS edge
+        WITH edge.node AS this1, edge.relationship AS this0
+        RETURN collect({ node: { __id: toString(id(this1)), __typename: "Actor" } }) AS var2
+    }
+    RETURN { edges: var2, totalCount: totalCount } AS var3
+}
+RETURN this { .title, actorsConnection: var3 } AS this
+----
+
+== Minimal edges returned if not asked for with pagination arguments
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies(where: {title: "Forrest Gump"}) {
+    title
+    actorsConnection(first: 5) {
+      totalCount
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "Forrest Gump",
+  "param1": 5
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE this.title = $param0
+CALL {
+    WITH this
+    MATCH (this)<-[this0:ACTED_IN]-(this1:Actor)
+    WITH collect({ node: this1, relationship: this0 }) AS edges
+    WITH edges, size(edges) AS totalCount
+    CALL {
+        WITH edges
+        UNWIND edges AS edge
+        WITH edge.node AS this1, edge.relationship AS this0
+        WITH *
+        
+        LIMIT $param1
+        RETURN collect({ node: { __id: toString(id(this1)), __typename: "Actor" } }) AS var2
+    }
+    RETURN { edges: var2, totalCount: totalCount } AS var3
+}
+RETURN this { .title, actorsConnection: var3 } AS this
+----
+
+== edges not returned if not asked for on a union
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  actors(where: {name: "Tom Hanks"}) {
+    name
+    productionsConnection {
+      totalCount
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "Tom Hanks"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Actor)
+WHERE this.name = $param0
+CALL {
+    WITH this
+    CALL {
+        WITH this
+        MATCH (this)-[this0:ACTED_IN]->(this1:Movie)
+        WITH { node: { __typename: "Movie", __id: toString(id(this1)) } } AS edge
+        RETURN edge
+        UNION
+        WITH this
+        MATCH (this)-[this2:ACTED_IN]->(this3:Series)
+        WITH { node: { __typename: "Series", __id: toString(id(this3)) } } AS edge
+        RETURN edge
+    }
+    WITH collect(edge) AS edges
+    WITH edges, size(edges) AS totalCount
+    RETURN { edges: edges, totalCount: totalCount } AS var4
+}
+RETURN this { .name, productionsConnection: var4 } AS this
+----
+
+== edges and totalCount returned if pageInfo asked for on a union
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  actors(where: {name: "Tom Hanks"}) {
+    name
+    productionsConnection {
+      pageInfo {
+        startCursor
+        endCursor
+        hasNextPage
+        hasPreviousPage
+      }
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "Tom Hanks"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Actor)
+WHERE this.name = $param0
+CALL {
+    WITH this
+    CALL {
+        WITH this
+        MATCH (this)-[this0:ACTED_IN]->(this1:Movie)
+        WITH { node: { __typename: "Movie", __id: toString(id(this1)) } } AS edge
+        RETURN edge
+        UNION
+        WITH this
+        MATCH (this)-[this2:ACTED_IN]->(this3:Series)
+        WITH { node: { __typename: "Series", __id: toString(id(this3)) } } AS edge
+        RETURN edge
+    }
+    WITH collect(edge) AS edges
+    WITH edges, size(edges) AS totalCount
+    RETURN { edges: edges, totalCount: totalCount } AS var4
+}
+RETURN this { .name, productionsConnection: var4 } AS this
+----
+
+== totalCount is calculated and returned if asked for with edges
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies(where: {title: "Forrest Gump"}) {
+    title
+    actorsConnection {
+      totalCount
+      edges {
+        node {
+          name
+        }
+      }
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "Forrest Gump"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE this.title = $param0
+CALL {
+    WITH this
+    MATCH (this)<-[this0:ACTED_IN]-(this1:Actor)
+    WITH collect({ node: this1, relationship: this0 }) AS edges
+    WITH edges, size(edges) AS totalCount
+    CALL {
+        WITH edges
+        UNWIND edges AS edge
+        WITH edge.node AS this1, edge.relationship AS this0
+        RETURN collect({ node: { name: this1.name, __typename: "Actor" } }) AS var2
+    }
+    RETURN { edges: var2, totalCount: totalCount } AS var3
+}
+RETURN this { .title, actorsConnection: var3 } AS this
+----
+
+== totalCount is calculated and returned if asked for with edges with pagination arguments
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies(where: {title: "Forrest Gump"}) {
+    title
+    actorsConnection(first: 5) {
+      totalCount
+      edges {
+        node {
+          name
+        }
+      }
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "Forrest Gump",
+  "param1": 5
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE this.title = $param0
+CALL {
+    WITH this
+    MATCH (this)<-[this0:ACTED_IN]-(this1:Actor)
+    WITH collect({ node: this1, relationship: this0 }) AS edges
+    WITH edges, size(edges) AS totalCount
+    CALL {
+        WITH edges
+        UNWIND edges AS edge
+        WITH edge.node AS this1, edge.relationship AS this0
+        WITH *
+        
+        LIMIT $param1
+        RETURN collect({ node: { name: this1.name, __typename: "Actor" } }) AS var2
+    }
+    RETURN { edges: var2, totalCount: totalCount } AS var3
+}
+RETURN this { .title, actorsConnection: var3 } AS this
+----
diff --git a/core/src/test/resources/tck-test-files/cypher/v2/connections/relationship-properties.adoc b/core/src/test/resources/tck-test-files/cypher/v2/connections/relationship-properties.adoc
index 0d6bea47..bc0b66be 100644
--- a/core/src/test/resources/tck-test-files/cypher/v2/connections/relationship-properties.adoc
+++ b/core/src/test/resources/tck-test-files/cypher/v2/connections/relationship-properties.adoc
@@ -27,7 +27,7 @@ type ActedIn @relationshipProperties {
 == Projecting node and relationship properties with no arguments
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies(where: {title: "Forrest Gump"}) {
@@ -93,12 +93,10 @@ RETURN this {
 } AS this
 ----
 
-'''
-
 == Projecting node and relationship properties with where argument
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies(where: {title: "Forrest Gump"}) {
@@ -166,12 +164,10 @@ RETURN this {
 } AS this
 ----
 
-'''
-
 == Projecting node and relationship properties with sort argument
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies(where: {title: "Forrest Gump"}) {
@@ -237,12 +233,10 @@ RETURN this {
 } AS this
 ----
 
-'''
-
 == Projecting node and relationship properties with sort argument ordered edge first
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies {
@@ -303,12 +297,10 @@ RETURN this {
 } AS this
 ----
 
-'''
-
 == Projecting node and relationship properties with sort argument ordered node first
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies {
@@ -369,12 +361,10 @@ RETURN this {
 } AS this
 ----
 
-'''
-
 == Projecting twice nested node and relationship properties with no arguments
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies(where: {title: "Forrest Gump"}) {
@@ -479,12 +469,10 @@ RETURN this {
 } AS this
 ----
 
-'''
-
 == Projecting thrice nested node and relationship properties with no arguments
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies(where: {title: "Forrest Gump"}) {
@@ -627,6 +615,3 @@ RETURN this {
 	actorsConnection: actorsConnection
 } AS this
 ----
-
-'''
-
diff --git a/core/src/test/resources/tck-test-files/cypher/v2/connections/relationship-properties.js.adoc b/core/src/test/resources/tck-test-files/cypher/v2/connections/relationship-properties.js.adoc
new file mode 100644
index 00000000..bd1b54ed
--- /dev/null
+++ b/core/src/test/resources/tck-test-files/cypher/v2/connections/relationship-properties.js.adoc
@@ -0,0 +1,452 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= Relationship Properties Cypher
+
+== Setup
+
+.Schema
+[source,graphql,schema=true]
+----
+type Movie {
+  title: String!
+  actors: [Actor!]! @relationship(type: "ACTED_IN", properties: "ActedIn", direction: IN)
+}
+
+type Actor {
+  name: String!
+  movies: [Movie!]! @relationship(type: "ACTED_IN", properties: "ActedIn", direction: OUT)
+}
+
+type ActedIn @relationshipProperties {
+  screenTime: Int!
+  year: Int!
+}
+----
+
+== Projecting node and relationship properties with no arguments
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies(where: {title: "Forrest Gump"}) {
+    title
+    actorsConnection {
+      edges {
+        properties {
+          screenTime
+        }
+        node {
+          name
+        }
+      }
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "Forrest Gump"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE this.title = $param0
+CALL {
+    WITH this
+    MATCH (this)<-[this0:ACTED_IN]-(this1:Actor)
+    WITH collect({ node: this1, relationship: this0 }) AS edges
+    WITH edges, size(edges) AS totalCount
+    CALL {
+        WITH edges
+        UNWIND edges AS edge
+        WITH edge.node AS this1, edge.relationship AS this0
+        RETURN collect({ properties: { screenTime: this0.screenTime, __typename: "ActedIn" }, node: { name: this1.name, __typename: "Actor" } }) AS var2
+    }
+    RETURN { edges: var2, totalCount: totalCount } AS var3
+}
+RETURN this { .title, actorsConnection: var3 } AS this
+----
+
+== Projecting node and relationship properties with where argument
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies(where: {title: "Forrest Gump"}) {
+    title
+    actorsConnection(where: {node: {name: "Tom Hanks"}}) {
+      edges {
+        properties {
+          screenTime
+        }
+        node {
+          name
+        }
+      }
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "Forrest Gump",
+  "param1": "Tom Hanks"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE this.title = $param0
+CALL {
+    WITH this
+    MATCH (this)<-[this0:ACTED_IN]-(this1:Actor)
+    WHERE this1.name = $param1
+    WITH collect({ node: this1, relationship: this0 }) AS edges
+    WITH edges, size(edges) AS totalCount
+    CALL {
+        WITH edges
+        UNWIND edges AS edge
+        WITH edge.node AS this1, edge.relationship AS this0
+        RETURN collect({ properties: { screenTime: this0.screenTime, __typename: "ActedIn" }, node: { name: this1.name, __typename: "Actor" } }) AS var2
+    }
+    RETURN { edges: var2, totalCount: totalCount } AS var3
+}
+RETURN this { .title, actorsConnection: var3 } AS this
+----
+
+== Projecting node and relationship properties with sort argument
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies(where: {title: "Forrest Gump"}) {
+    title
+    actorsConnection(sort: {edge: {screenTime: DESC}}) {
+      edges {
+        properties {
+          screenTime
+        }
+        node {
+          name
+        }
+      }
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "Forrest Gump"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE this.title = $param0
+CALL {
+    WITH this
+    MATCH (this)<-[this0:ACTED_IN]-(this1:Actor)
+    WITH collect({ node: this1, relationship: this0 }) AS edges
+    WITH edges, size(edges) AS totalCount
+    CALL {
+        WITH edges
+        UNWIND edges AS edge
+        WITH edge.node AS this1, edge.relationship AS this0
+        WITH *
+        ORDER BY this0.screenTime DESC
+        RETURN collect({ properties: { screenTime: this0.screenTime, __typename: "ActedIn" }, node: { name: this1.name, __typename: "Actor" } }) AS var2
+    }
+    RETURN { edges: var2, totalCount: totalCount } AS var3
+}
+RETURN this { .title, actorsConnection: var3 } AS this
+----
+
+== Projecting node and relationship properties with sort argument ordered edge first
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies {
+    actorsConnection(sort: [{edge: {year: DESC}}, {node: {name: ASC}}]) {
+      edges {
+        properties {
+          year
+        }
+        node {
+          name
+        }
+      }
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+CALL {
+    WITH this
+    MATCH (this)<-[this0:ACTED_IN]-(this1:Actor)
+    WITH collect({ node: this1, relationship: this0 }) AS edges
+    WITH edges, size(edges) AS totalCount
+    CALL {
+        WITH edges
+        UNWIND edges AS edge
+        WITH edge.node AS this1, edge.relationship AS this0
+        WITH *
+        ORDER BY this0.year DESC, this1.name ASC
+        RETURN collect({ properties: { year: this0.year, __typename: "ActedIn" }, node: { name: this1.name, __typename: "Actor" } }) AS var2
+    }
+    RETURN { edges: var2, totalCount: totalCount } AS var3
+}
+RETURN this { actorsConnection: var3 } AS this
+----
+
+== Projecting node and relationship properties with sort argument ordered node first
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies {
+    actorsConnection(sort: [{node: {name: ASC}}, {edge: {year: DESC}}]) {
+      edges {
+        properties {
+          year
+        }
+        node {
+          name
+        }
+      }
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+CALL {
+    WITH this
+    MATCH (this)<-[this0:ACTED_IN]-(this1:Actor)
+    WITH collect({ node: this1, relationship: this0 }) AS edges
+    WITH edges, size(edges) AS totalCount
+    CALL {
+        WITH edges
+        UNWIND edges AS edge
+        WITH edge.node AS this1, edge.relationship AS this0
+        WITH *
+        ORDER BY this1.name ASC, this0.year DESC
+        RETURN collect({ properties: { year: this0.year, __typename: "ActedIn" }, node: { name: this1.name, __typename: "Actor" } }) AS var2
+    }
+    RETURN { edges: var2, totalCount: totalCount } AS var3
+}
+RETURN this { actorsConnection: var3 } AS this
+----
+
+== Projecting twice nested node and relationship properties with no arguments
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies(where: {title: "Forrest Gump"}) {
+    title
+    actorsConnection {
+      edges {
+        properties {
+          screenTime
+        }
+        node {
+          name
+          moviesConnection {
+            edges {
+              properties {
+                screenTime
+              }
+              node {
+                title
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "Forrest Gump"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE this.title = $param0
+CALL {
+    WITH this
+    MATCH (this)<-[this0:ACTED_IN]-(this1:Actor)
+    WITH collect({ node: this1, relationship: this0 }) AS edges
+    WITH edges, size(edges) AS totalCount
+    CALL {
+        WITH edges
+        UNWIND edges AS edge
+        WITH edge.node AS this1, edge.relationship AS this0
+        CALL {
+            WITH this1
+            MATCH (this1)-[this2:ACTED_IN]->(this3:Movie)
+            WITH collect({ node: this3, relationship: this2 }) AS edges
+            WITH edges, size(edges) AS totalCount
+            CALL {
+                WITH edges
+                UNWIND edges AS edge
+                WITH edge.node AS this3, edge.relationship AS this2
+                RETURN collect({ properties: { screenTime: this2.screenTime, __typename: "ActedIn" }, node: { title: this3.title, __typename: "Movie" } }) AS var4
+            }
+            RETURN { edges: var4, totalCount: totalCount } AS var5
+        }
+        RETURN collect({ properties: { screenTime: this0.screenTime, __typename: "ActedIn" }, node: { name: this1.name, moviesConnection: var5, __typename: "Actor" } }) AS var6
+    }
+    RETURN { edges: var6, totalCount: totalCount } AS var7
+}
+RETURN this { .title, actorsConnection: var7 } AS this
+----
+
+== Projecting thrice nested node and relationship properties with no arguments
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies(where: {title: "Forrest Gump"}) {
+    title
+    actorsConnection {
+      edges {
+        properties {
+          screenTime
+        }
+        node {
+          name
+          moviesConnection {
+            edges {
+              properties {
+                screenTime
+              }
+              node {
+                title
+                actorsConnection {
+                  edges {
+                    properties {
+                      screenTime
+                    }
+                    node {
+                      name
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "Forrest Gump"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE this.title = $param0
+CALL {
+    WITH this
+    MATCH (this)<-[this0:ACTED_IN]-(this1:Actor)
+    WITH collect({ node: this1, relationship: this0 }) AS edges
+    WITH edges, size(edges) AS totalCount
+    CALL {
+        WITH edges
+        UNWIND edges AS edge
+        WITH edge.node AS this1, edge.relationship AS this0
+        CALL {
+            WITH this1
+            MATCH (this1)-[this2:ACTED_IN]->(this3:Movie)
+            WITH collect({ node: this3, relationship: this2 }) AS edges
+            WITH edges, size(edges) AS totalCount
+            CALL {
+                WITH edges
+                UNWIND edges AS edge
+                WITH edge.node AS this3, edge.relationship AS this2
+                CALL {
+                    WITH this3
+                    MATCH (this3)<-[this4:ACTED_IN]-(this5:Actor)
+                    WITH collect({ node: this5, relationship: this4 }) AS edges
+                    WITH edges, size(edges) AS totalCount
+                    CALL {
+                        WITH edges
+                        UNWIND edges AS edge
+                        WITH edge.node AS this5, edge.relationship AS this4
+                        RETURN collect({ properties: { screenTime: this4.screenTime, __typename: "ActedIn" }, node: { name: this5.name, __typename: "Actor" } }) AS var6
+                    }
+                    RETURN { edges: var6, totalCount: totalCount } AS var7
+                }
+                RETURN collect({ properties: { screenTime: this2.screenTime, __typename: "ActedIn" }, node: { title: this3.title, actorsConnection: var7, __typename: "Movie" } }) AS var8
+            }
+            RETURN { edges: var8, totalCount: totalCount } AS var9
+        }
+        RETURN collect({ properties: { screenTime: this0.screenTime, __typename: "ActedIn" }, node: { name: this1.name, moviesConnection: var9, __typename: "Actor" } }) AS var10
+    }
+    RETURN { edges: var10, totalCount: totalCount } AS var11
+}
+RETURN this { .title, actorsConnection: var11 } AS this
+----
diff --git a/core/src/test/resources/tck-test-files/cypher/v2/connections/unions.adoc b/core/src/test/resources/tck-test-files/cypher/v2/connections/unions.adoc
index fa31a2c3..57b81657 100644
--- a/core/src/test/resources/tck-test-files/cypher/v2/connections/unions.adoc
+++ b/core/src/test/resources/tck-test-files/cypher/v2/connections/unions.adoc
@@ -33,7 +33,7 @@ type Wrote @relationshipProperties {
 == Projecting union node and relationship properties with no arguments
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   authors {
@@ -112,12 +112,10 @@ RETURN this {
 } AS this
 ----
 
-'''
-
 == Projecting union node and relationship properties with where argument
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   authors {
@@ -203,12 +201,10 @@ RETURN this {
 } AS this
 ----
 
-'''
-
 == Projecting union node and relationship properties with where relationship argument
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   authors {
@@ -294,12 +290,10 @@ RETURN this {
 } AS this
 ----
 
-'''
-
 == Projecting union node and relationship properties with where node and relationship argument
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   authors {
@@ -389,12 +383,10 @@ RETURN this {
 } AS this
 ----
 
-'''
-
 == Projecting union node and relationship properties with sort argument
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   authors {
@@ -478,6 +470,3 @@ RETURN this {
 	publicationsConnection: publicationsConnection
 } AS this
 ----
-
-'''
-
diff --git a/core/src/test/resources/tck-test-files/cypher/v2/connections/unions.js.adoc b/core/src/test/resources/tck-test-files/cypher/v2/connections/unions.js.adoc
new file mode 100644
index 00000000..5a5fc9d3
--- /dev/null
+++ b/core/src/test/resources/tck-test-files/cypher/v2/connections/unions.js.adoc
@@ -0,0 +1,347 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= Cypher -> Connections -> Unions
+
+== Setup
+
+.Schema
+[source,graphql,schema=true]
+----
+union Publication = Book | Journal
+
+type Author {
+  name: String!
+  publications: [Publication!]! @relationship(type: "WROTE", direction: OUT, properties: "Wrote")
+}
+
+type Book {
+  title: String!
+  author: [Author!]! @relationship(type: "WROTE", direction: IN, properties: "Wrote")
+}
+
+type Journal {
+  subject: String!
+  author: [Author!]! @relationship(type: "WROTE", direction: IN, properties: "Wrote")
+}
+
+type Wrote @relationshipProperties {
+  words: Int!
+}
+----
+
+== Projecting union node and relationship properties with no arguments
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  authors {
+    name
+    publicationsConnection {
+      edges {
+        properties {
+          words
+        }
+        node {
+          ... on Book {
+            title
+          }
+          ... on Journal {
+            subject
+          }
+        }
+      }
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Author)
+CALL {
+    WITH this
+    CALL {
+        WITH this
+        MATCH (this)-[this0:WROTE]->(this1:Book)
+        WITH { properties: { words: this0.words, __typename: "Wrote" }, node: { __typename: "Book", __id: toString(id(this1)), title: this1.title } } AS edge
+        RETURN edge
+        UNION
+        WITH this
+        MATCH (this)-[this2:WROTE]->(this3:Journal)
+        WITH { properties: { words: this2.words, __typename: "Wrote" }, node: { __typename: "Journal", __id: toString(id(this3)), subject: this3.subject } } AS edge
+        RETURN edge
+    }
+    WITH collect(edge) AS edges
+    WITH edges, size(edges) AS totalCount
+    RETURN { edges: edges, totalCount: totalCount } AS var4
+}
+RETURN this { .name, publicationsConnection: var4 } AS this
+----
+
+== Projecting union node and relationship properties with where argument
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  authors {
+    name
+    publicationsConnection(
+      where: {Book: {node: {title: "Book Title"}}, Journal: {node: {subject: "Journal Subject"}}}
+    ) {
+      edges {
+        properties {
+          words
+        }
+        node {
+          ... on Book {
+            title
+          }
+          ... on Journal {
+            subject
+          }
+        }
+      }
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "Book Title",
+  "param1": "Journal Subject"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Author)
+CALL {
+    WITH this
+    CALL {
+        WITH this
+        MATCH (this)-[this0:WROTE]->(this1:Book)
+        WHERE this1.title = $param0
+        WITH { properties: { words: this0.words, __typename: "Wrote" }, node: { __typename: "Book", __id: toString(id(this1)), title: this1.title } } AS edge
+        RETURN edge
+        UNION
+        WITH this
+        MATCH (this)-[this2:WROTE]->(this3:Journal)
+        WHERE this3.subject = $param1
+        WITH { properties: { words: this2.words, __typename: "Wrote" }, node: { __typename: "Journal", __id: toString(id(this3)), subject: this3.subject } } AS edge
+        RETURN edge
+    }
+    WITH collect(edge) AS edges
+    WITH edges, size(edges) AS totalCount
+    RETURN { edges: edges, totalCount: totalCount } AS var4
+}
+RETURN this { .name, publicationsConnection: var4 } AS this
+----
+
+== Projecting union node and relationship properties with where relationship argument
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  authors {
+    name
+    publicationsConnection(
+      where: {Book: {edge: {words: 1000}}, Journal: {edge: {words: 2000}}}
+    ) {
+      edges {
+        properties {
+          words
+        }
+        node {
+          ... on Book {
+            title
+          }
+          ... on Journal {
+            subject
+          }
+        }
+      }
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": 1000,
+  "param1": 2000
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Author)
+CALL {
+    WITH this
+    CALL {
+        WITH this
+        MATCH (this)-[this0:WROTE]->(this1:Book)
+        WHERE this0.words = $param0
+        WITH { properties: { words: this0.words, __typename: "Wrote" }, node: { __typename: "Book", __id: toString(id(this1)), title: this1.title } } AS edge
+        RETURN edge
+        UNION
+        WITH this
+        MATCH (this)-[this2:WROTE]->(this3:Journal)
+        WHERE this2.words = $param1
+        WITH { properties: { words: this2.words, __typename: "Wrote" }, node: { __typename: "Journal", __id: toString(id(this3)), subject: this3.subject } } AS edge
+        RETURN edge
+    }
+    WITH collect(edge) AS edges
+    WITH edges, size(edges) AS totalCount
+    RETURN { edges: edges, totalCount: totalCount } AS var4
+}
+RETURN this { .name, publicationsConnection: var4 } AS this
+----
+
+== Projecting union node and relationship properties with where node and relationship argument
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  authors {
+    name
+    publicationsConnection(
+      where: {Book: {edge: {words: 1000}, node: {title: "Book Title"}}, Journal: {edge: {words: 2000}, node: {subject: "Journal Subject"}}}
+    ) {
+      edges {
+        properties {
+          words
+        }
+        node {
+          ... on Book {
+            title
+          }
+          ... on Journal {
+            subject
+          }
+        }
+      }
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "Book Title",
+  "param1": 1000,
+  "param2": "Journal Subject",
+  "param3": 2000
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Author)
+CALL {
+    WITH this
+    CALL {
+        WITH this
+        MATCH (this)-[this0:WROTE]->(this1:Book)
+        WHERE (this1.title = $param0 AND this0.words = $param1)
+        WITH { properties: { words: this0.words, __typename: "Wrote" }, node: { __typename: "Book", __id: toString(id(this1)), title: this1.title } } AS edge
+        RETURN edge
+        UNION
+        WITH this
+        MATCH (this)-[this2:WROTE]->(this3:Journal)
+        WHERE (this3.subject = $param2 AND this2.words = $param3)
+        WITH { properties: { words: this2.words, __typename: "Wrote" }, node: { __typename: "Journal", __id: toString(id(this3)), subject: this3.subject } } AS edge
+        RETURN edge
+    }
+    WITH collect(edge) AS edges
+    WITH edges, size(edges) AS totalCount
+    RETURN { edges: edges, totalCount: totalCount } AS var4
+}
+RETURN this { .name, publicationsConnection: var4 } AS this
+----
+
+== Projecting union node and relationship properties with sort argument
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  authors {
+    name
+    publicationsConnection(sort: [{edge: {words: ASC}}]) {
+      edges {
+        properties {
+          words
+        }
+        node {
+          ... on Book {
+            title
+          }
+          ... on Journal {
+            subject
+          }
+        }
+      }
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Author)
+CALL {
+    WITH this
+    CALL {
+        WITH this
+        MATCH (this)-[this0:WROTE]->(this1:Book)
+        WITH { properties: { words: this0.words, __typename: "Wrote" }, node: { __typename: "Book", __id: toString(id(this1)), title: this1.title } } AS edge
+        RETURN edge
+        UNION
+        WITH this
+        MATCH (this)-[this2:WROTE]->(this3:Journal)
+        WITH { properties: { words: this2.words, __typename: "Wrote" }, node: { __typename: "Journal", __id: toString(id(this3)), subject: this3.subject } } AS edge
+        RETURN edge
+    }
+    WITH collect(edge) AS edges
+    WITH edges, size(edges) AS totalCount
+    CALL {
+        WITH edges
+        UNWIND edges AS edge
+        WITH edge
+        ORDER BY edge.properties.words ASC
+        RETURN collect(edge) AS var4
+    }
+    RETURN { edges: var4, totalCount: totalCount } AS var5
+}
+RETURN this { .name, publicationsConnection: var5 } AS this
+----
diff --git a/core/src/test/resources/tck-test-files/cypher/v2/directives/alias.adoc b/core/src/test/resources/tck-test-files/cypher/v2/directives/alias.adoc
index 48377674..d9e68cd6 100644
--- a/core/src/test/resources/tck-test-files/cypher/v2/directives/alias.adoc
+++ b/core/src/test/resources/tck-test-files/cypher/v2/directives/alias.adoc
@@ -28,7 +28,7 @@ type ActorActedInProps @relationshipProperties {
 == Simple relation
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   actors {
@@ -68,12 +68,10 @@ RETURN this {
 } AS this
 ----
 
-'''
-
 == With relationship properties
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   actors {
@@ -141,6 +139,3 @@ RETURN this {
 	actedInConnection: actedInConnection
 } AS this
 ----
-
-'''
-
diff --git a/core/src/test/resources/tck-test-files/cypher/v2/directives/alias.js.adoc b/core/src/test/resources/tck-test-files/cypher/v2/directives/alias.js.adoc
new file mode 100644
index 00000000..ff339f99
--- /dev/null
+++ b/core/src/test/resources/tck-test-files/cypher/v2/directives/alias.js.adoc
@@ -0,0 +1,114 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= Cypher alias directive
+
+== Setup
+
+.Schema
+[source,graphql,schema=true]
+----
+type Actor {
+  name: String!
+  city: String @alias(property: "cityPropInDb")
+  actedIn: [Movie!]! @relationship(direction: OUT, type: "ACTED_IN", properties: "ActorActedInProps")
+}
+
+type Movie {
+  title: String!
+  rating: Float @alias(property: "ratingPropInDb")
+}
+
+type ActorActedInProps @relationshipProperties {
+  character: String! @alias(property: "characterPropInDb")
+  screenTime: Int
+}
+----
+
+== Simple relation
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  actors {
+    name
+    city
+    actedIn {
+      title
+      rating
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Actor)
+CALL {
+    WITH this
+    MATCH (this)-[this0:ACTED_IN]->(this1:Movie)
+    WITH this1 { .title, rating: this1.ratingPropInDb } AS this1
+    RETURN collect(this1) AS var2
+}
+RETURN this { .name, city: this.cityPropInDb, actedIn: var2 } AS this
+----
+
+== With relationship properties
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  actors {
+    name
+    city
+    actedInConnection {
+      edges {
+        properties {
+          character
+          screenTime
+        }
+        node {
+          title
+          rating
+        }
+      }
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Actor)
+CALL {
+    WITH this
+    MATCH (this)-[this0:ACTED_IN]->(this1:Movie)
+    WITH collect({ node: this1, relationship: this0 }) AS edges
+    WITH edges, size(edges) AS totalCount
+    CALL {
+        WITH edges
+        UNWIND edges AS edge
+        WITH edge.node AS this1, edge.relationship AS this0
+        RETURN collect({ properties: { character: this0.characterPropInDb, screenTime: this0.screenTime, __typename: "ActorActedInProps" }, node: { title: this1.title, rating: this1.ratingPropInDb, __typename: "Movie" } }) AS var2
+    }
+    RETURN { edges: var2, totalCount: totalCount } AS var3
+}
+RETURN this { .name, city: this.cityPropInDb, actedInConnection: var3 } AS this
+----
diff --git a/core/src/test/resources/tck-test-files/cypher/v2/directives/coalesce.adoc b/core/src/test/resources/tck-test-files/cypher/v2/directives/coalesce.adoc
index 25bce5af..7cdf7ec3 100644
--- a/core/src/test/resources/tck-test-files/cypher/v2/directives/coalesce.adoc
+++ b/core/src/test/resources/tck-test-files/cypher/v2/directives/coalesce.adoc
@@ -23,10 +23,10 @@ type Movie {
 [source,json,schema-config=true]
 ----
 {
-  "features": {
-    "filters": {
-      "String": {
-        "MATCHES": true
+  "features" : {
+    "filters" : {
+      "String" : {
+        "MATCHES" : true
       }
     }
   }
@@ -34,7 +34,7 @@ type Movie {
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies(where: {status: ACTIVE}) {
@@ -63,8 +63,6 @@ RETURN this {
 } AS this
 ----
 
-'''
-
 == Coalesce with enum in projection
 
 .Schema
@@ -89,10 +87,10 @@ type Actor {
 [source,json,schema-config=true]
 ----
 {
-  "features": {
-    "filters": {
-      "String": {
-        "MATCHES": true
+  "features" : {
+    "filters" : {
+      "String" : {
+        "MATCHES" : true
       }
     }
   }
@@ -100,7 +98,7 @@ type Actor {
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query Actors {
   actors {
@@ -159,8 +157,6 @@ RETURN this {
 } AS this
 ----
 
-'''
-
 == Coalesce with enum list in projection
 
 .Schema
@@ -182,7 +178,7 @@ type Actor {
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query Actors {
   actors {
@@ -240,6 +236,3 @@ RETURN this {
 	moviesConnection: moviesConnection
 } AS this
 ----
-
-'''
-
diff --git a/core/src/test/resources/tck-test-files/cypher/v2/directives/coalesce.js.adoc b/core/src/test/resources/tck-test-files/cypher/v2/directives/coalesce.js.adoc
new file mode 100644
index 00000000..e36731d7
--- /dev/null
+++ b/core/src/test/resources/tck-test-files/cypher/v2/directives/coalesce.js.adoc
@@ -0,0 +1,211 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= Cypher coalesce()
+
+== Coalesce with enum in match
+
+.Schema
+[source,graphql,schema=true]
+----
+enum Status {
+  ACTIVE
+  INACTIVE
+}
+
+type Movie {
+  id: ID
+  status: Status @coalesce(value: ACTIVE)
+}
+----
+
+.Configuration
+[source,json,schema-config=true]
+----
+{
+  "features": {
+    "filters": {
+      "String": {
+        "MATCHES": true
+      }
+    }
+  }
+}
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies(where: {status: ACTIVE}) {
+    id
+    status
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "ACTIVE"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE coalesce(this.status, "ACTIVE") = $param0
+RETURN this { .id, .status } AS this
+----
+
+== Coalesce with enum in projection
+
+.Schema
+[source,graphql,schema=true]
+----
+enum Status {
+  ACTIVE
+  INACTIVE
+}
+
+type Movie {
+  id: ID
+  status: Status @coalesce(value: ACTIVE)
+}
+
+type Actor {
+  movies: [Movie!]! @relationship(type: "ACTED_IN", direction: OUT)
+}
+----
+
+.Configuration
+[source,json,schema-config=true]
+----
+{
+  "features": {
+    "filters": {
+      "String": {
+        "MATCHES": true
+      }
+    }
+  }
+}
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+query Actors {
+  actors {
+    moviesConnection(where: {node: {status: ACTIVE}}) {
+      edges {
+        node {
+          id
+          status
+        }
+      }
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "ACTIVE"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Actor)
+CALL {
+    WITH this
+    MATCH (this)-[this0:ACTED_IN]->(this1:Movie)
+    WHERE coalesce(this1.status, "ACTIVE") = $param0
+    WITH collect({ node: this1, relationship: this0 }) AS edges
+    WITH edges, size(edges) AS totalCount
+    CALL {
+        WITH edges
+        UNWIND edges AS edge
+        WITH edge.node AS this1, edge.relationship AS this0
+        RETURN collect({ node: { id: this1.id, status: this1.status, __typename: "Movie" } }) AS var2
+    }
+    RETURN { edges: var2, totalCount: totalCount } AS var3
+}
+RETURN this { moviesConnection: var3 } AS this
+----
+
+== Coalesce with enum list in projection
+
+.Schema
+[source,graphql,schema=true]
+----
+enum Status {
+  ACTIVE
+  INACTIVE
+}
+
+type Movie {
+  id: ID
+  statuses: [Status!]! @coalesce(value: [ACTIVE, INACTIVE])
+}
+
+type Actor {
+  movies: [Movie!]! @relationship(type: "ACTED_IN", direction: OUT)
+}
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+query Actors {
+  actors {
+    moviesConnection(where: {node: {statuses: [ACTIVE, INACTIVE]}}) {
+      edges {
+        node {
+          id
+          statuses
+        }
+      }
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": [
+    "ACTIVE",
+    "INACTIVE"
+  ]
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Actor)
+CALL {
+    WITH this
+    MATCH (this)-[this0:ACTED_IN]->(this1:Movie)
+    WHERE coalesce(this1.statuses, ["ACTIVE", "INACTIVE"]) = $param0
+    WITH collect({ node: this1, relationship: this0 }) AS edges
+    WITH edges, size(edges) AS totalCount
+    CALL {
+        WITH edges
+        UNWIND edges AS edge
+        WITH edge.node AS this1, edge.relationship AS this0
+        RETURN collect({ node: { id: this1.id, statuses: this1.statuses, __typename: "Movie" } }) AS var2
+    }
+    RETURN { edges: var2, totalCount: totalCount } AS var3
+}
+RETURN this { moviesConnection: var3 } AS this
+----
diff --git a/core/src/test/resources/tck-test-files/cypher/v2/directives/customResolver.adoc b/core/src/test/resources/tck-test-files/cypher/v2/directives/customResolver.adoc
index 0b59755b..fba761cd 100644
--- a/core/src/test/resources/tck-test-files/cypher/v2/directives/customResolver.adoc
+++ b/core/src/test/resources/tck-test-files/cypher/v2/directives/customResolver.adoc
@@ -20,7 +20,7 @@ type User {
 === should not fetch required fields if @customResolver field is not selected
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   users {
@@ -44,12 +44,10 @@ RETURN this {
 } AS this
 ----
 
-'''
-
 === should not over fetch when all required fields are manually selected
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   users {
@@ -76,12 +74,10 @@ RETURN this {
 } AS this
 ----
 
-'''
-
 === should not over fetch when some required fields are manually selected
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   users {
@@ -107,12 +103,10 @@ RETURN this {
 } AS this
 ----
 
-'''
-
 === should not over fetch when no required fields are manually selected
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   users {
@@ -137,8 +131,6 @@ RETURN this {
 } AS this
 ----
 
-'''
-
 == No required fields
 
 === Setup
@@ -156,7 +148,7 @@ type User {
 === should not over fetch when other fields are manually selected
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   users {
@@ -181,12 +173,10 @@ RETURN this {
 } AS this
 ----
 
-'''
-
 === should not over fetch when no other fields are manually selected
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   users {
@@ -209,8 +199,6 @@ RETURN this {
 } AS this
 ----
 
-'''
-
 == Require fields on nested types
 
 === Setup
@@ -240,7 +228,7 @@ type User {
 === should not over fetch when all required fields are manually selected
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   users {
@@ -291,12 +279,10 @@ RETURN this {
 } AS this
 ----
 
-'''
-
 === should not fetch required fields if @customResolver field is not selected
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   users {
@@ -320,12 +306,10 @@ RETURN this {
 } AS this
 ----
 
-'''
-
 === should not over fetch when some required fields are manually selected
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   users {
@@ -374,12 +358,10 @@ RETURN this {
 } AS this
 ----
 
-'''
-
 === should not over fetch when no required fields are manually selected
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   users {
@@ -422,8 +404,6 @@ RETURN this {
 } AS this
 ----
 
-'''
-
 == Require fields on nested unions
 
 === Setup
@@ -453,7 +433,7 @@ type Journal {
 === should not over fetch when all required fields are manually selected
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   authors {
@@ -510,12 +490,10 @@ RETURN this {
 } AS this
 ----
 
-'''
-
 === should not fetch required fields if @customResolver field is not selected
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   authors {
@@ -539,12 +517,10 @@ RETURN this {
 } AS this
 ----
 
-'''
-
 === should not over fetch when some required fields are manually selected
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   authors {
@@ -597,12 +573,10 @@ RETURN this {
 } AS this
 ----
 
-'''
-
 === should not over fetch when no required fields are manually selected
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   authors {
@@ -650,8 +624,6 @@ RETURN this {
 } AS this
 ----
 
-'''
-
 == Require fields on nested interfaces
 
 === Setup
@@ -685,7 +657,7 @@ type Journal implements Publication {
 === should not over fetch when all required fields are manually selected
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   authors {
@@ -745,12 +717,10 @@ RETURN this {
 } AS this
 ----
 
-'''
-
 === should not fetch required fields if @customResolver field is not selected
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   authors {
@@ -774,12 +744,10 @@ RETURN this {
 } AS this
 ----
 
-'''
-
 === should not over fetch when some required fields are manually selected
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   authors {
@@ -834,12 +802,10 @@ RETURN this {
 } AS this
 ----
 
-'''
-
 === should not over fetch when no required fields are manually selected
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   authors {
@@ -888,6 +854,3 @@ RETURN this {
 	publications: publications
 } AS this
 ----
-
-'''
-
diff --git a/core/src/test/resources/tck-test-files/cypher/v2/directives/customResolver.js.adoc b/core/src/test/resources/tck-test-files/cypher/v2/directives/customResolver.js.adoc
new file mode 100644
index 00000000..e1d7e643
--- /dev/null
+++ b/core/src/test/resources/tck-test-files/cypher/v2/directives/customResolver.js.adoc
@@ -0,0 +1,744 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= @customResolver directive
+
+== Require fields on same type
+
+=== Setup
+
+.Schema
+[source,graphql,schema=true]
+----
+type User {
+  firstName: String!
+  lastName: String!
+  fullName: String! @customResolver(requires: "firstName lastName")
+}
+----
+
+=== should not fetch required fields if @customResolver field is not selected
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  users {
+    firstName
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:User)
+RETURN this { .firstName } AS this
+----
+
+=== should not over fetch when all required fields are manually selected
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  users {
+    firstName
+    lastName
+    fullName
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:User)
+RETURN this { .firstName, .lastName, .fullName } AS this
+----
+
+=== should not over fetch when some required fields are manually selected
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  users {
+    firstName
+    fullName
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:User)
+RETURN this { .firstName, .fullName, .lastName } AS this
+----
+
+=== should not over fetch when no required fields are manually selected
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  users {
+    fullName
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:User)
+RETURN this { .fullName, .firstName, .lastName } AS this
+----
+
+== No required fields
+
+=== Setup
+
+.Schema
+[source,graphql,schema=true]
+----
+type User {
+  firstName: String!
+  lastName: String!
+  fullName: String! @customResolver
+}
+----
+
+=== should not over fetch when other fields are manually selected
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  users {
+    firstName
+    fullName
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:User)
+RETURN this { .firstName, .fullName } AS this
+----
+
+=== should not over fetch when no other fields are manually selected
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  users {
+    fullName
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:User)
+RETURN this { .fullName } AS this
+----
+
+== Require fields on nested types
+
+=== Setup
+
+.Schema
+[source,graphql,schema=true]
+----
+type City {
+  name: String!
+  population: Int
+}
+
+type Address {
+  street: String!
+  city: City! @relationship(type: "IN_CITY", direction: OUT)
+}
+
+type User {
+  id: ID!
+  firstName: String!
+  lastName: String!
+  address: Address @relationship(type: "LIVES_AT", direction: OUT)
+  fullName: String @customResolver(requires: "firstName lastName address { city { name population } }")
+}
+----
+
+=== should not over fetch when all required fields are manually selected
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  users {
+    firstName
+    lastName
+    fullName
+    address {
+      city {
+        name
+        population
+      }
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:User)
+CALL {
+    WITH this
+    MATCH (this)-[this0:LIVES_AT]->(this1:Address)
+    CALL {
+        WITH this1
+        MATCH (this1)-[this2:IN_CITY]->(this3:City)
+        WITH this3 { .name, .population } AS this3
+        RETURN head(collect(this3)) AS var4
+    }
+    WITH this1 { city: var4 } AS this1
+    RETURN head(collect(this1)) AS var5
+}
+RETURN this { .firstName, .lastName, .fullName, address: var5 } AS this
+----
+
+=== should not fetch required fields if @customResolver field is not selected
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  users {
+    firstName
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:User)
+RETURN this { .firstName } AS this
+----
+
+=== should not over fetch when some required fields are manually selected
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  users {
+    lastName
+    fullName
+    address {
+      city {
+        population
+      }
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:User)
+CALL {
+    WITH this
+    MATCH (this)-[this0:LIVES_AT]->(this1:Address)
+    CALL {
+        WITH this1
+        MATCH (this1)-[this2:IN_CITY]->(this3:City)
+        WITH this3 { .population, .name } AS this3
+        RETURN head(collect(this3)) AS var4
+    }
+    WITH this1 { city: var4 } AS this1
+    RETURN head(collect(this1)) AS var5
+}
+RETURN this { .lastName, .fullName, .firstName, address: var5 } AS this
+----
+
+=== should not over fetch when no required fields are manually selected
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  users {
+    fullName
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:User)
+CALL {
+    WITH this
+    MATCH (this)-[this0:LIVES_AT]->(this1:Address)
+    CALL {
+        WITH this1
+        MATCH (this1)-[this2:IN_CITY]->(this3:City)
+        WITH this3 { .name, .population } AS this3
+        RETURN head(collect(this3)) AS var4
+    }
+    WITH this1 { city: var4 } AS this1
+    RETURN head(collect(this1)) AS var5
+}
+RETURN this { .fullName, .firstName, .lastName, address: var5 } AS this
+----
+
+== Require fields on nested unions
+
+=== Setup
+
+.Schema
+[source,graphql,schema=true]
+----
+union Publication = Book | Journal
+
+type Author {
+  name: String!
+  publications: [Publication!]! @relationship(type: "WROTE", direction: OUT)
+  publicationsWithAuthor: [String!]! @customResolver(requires: "name publications { ...on Book { title } ... on Journal { subject } }")
+}
+
+type Book {
+  title: String!
+  author: Author! @relationship(type: "WROTE", direction: IN)
+}
+
+type Journal {
+  subject: String!
+  author: Author! @relationship(type: "WROTE", direction: IN)
+}
+----
+
+=== should not over fetch when all required fields are manually selected
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  authors {
+    name
+    publicationsWithAuthor
+    publications {
+      ... on Book {
+        title
+      }
+      ... on Journal {
+        subject
+      }
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Author)
+CALL {
+    WITH this
+    CALL {
+        WITH *
+        MATCH (this)-[this0:WROTE]->(this1:Book)
+        WITH this1 { .title, __typename: "Book", __id: toString(id(this1)) } AS this1
+        RETURN this1 AS var2
+        UNION
+        WITH *
+        MATCH (this)-[this3:WROTE]->(this4:Journal)
+        WITH this4 { .subject, __typename: "Journal", __id: toString(id(this4)) } AS this4
+        RETURN this4 AS var2
+    }
+    WITH var2
+    RETURN collect(var2) AS var2
+}
+RETURN this { .name, .publicationsWithAuthor, publications: var2 } AS this
+----
+
+=== should not fetch required fields if @customResolver field is not selected
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  authors {
+    name
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Author)
+RETURN this { .name } AS this
+----
+
+=== should not over fetch when some required fields are manually selected
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  authors {
+    publicationsWithAuthor
+    publications {
+      ... on Book {
+        title
+      }
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Author)
+CALL {
+    WITH this
+    CALL {
+        WITH *
+        MATCH (this)-[this0:WROTE]->(this1:Book)
+        WITH this1 { .title, __typename: "Book", __id: toString(id(this1)) } AS this1
+        RETURN this1 AS var2
+        UNION
+        WITH *
+        MATCH (this)-[this3:WROTE]->(this4:Journal)
+        WITH this4 { .subject, __typename: "Journal", __id: toString(id(this4)) } AS this4
+        RETURN this4 AS var2
+    }
+    WITH var2
+    RETURN collect(var2) AS var2
+}
+RETURN this { .publicationsWithAuthor, .name, publications: var2 } AS this
+----
+
+=== should not over fetch when no required fields are manually selected
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  authors {
+    publicationsWithAuthor
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Author)
+CALL {
+    WITH this
+    CALL {
+        WITH *
+        MATCH (this)-[this0:WROTE]->(this1:Book)
+        WITH this1 { .title, __typename: "Book", __id: toString(id(this1)) } AS this1
+        RETURN this1 AS var2
+        UNION
+        WITH *
+        MATCH (this)-[this3:WROTE]->(this4:Journal)
+        WITH this4 { .subject, __typename: "Journal", __id: toString(id(this4)) } AS this4
+        RETURN this4 AS var2
+    }
+    WITH var2
+    RETURN collect(var2) AS var2
+}
+RETURN this { .publicationsWithAuthor, .name, publications: var2 } AS this
+----
+
+== Require fields on nested interfaces
+
+=== Setup
+
+.Schema
+[source,graphql,schema=true]
+----
+interface Publication {
+  publicationYear: Int!
+}
+
+type Author {
+  name: String!
+  publications: [Publication!]! @relationship(type: "WROTE", direction: OUT)
+  publicationsWithAuthor: [String!]! @customResolver(requires: "name publications { publicationYear ...on Book { title } ... on Journal { subject } }")
+}
+
+type Book implements Publication {
+  title: String!
+  publicationYear: Int!
+  author: [Author!]! @relationship(type: "WROTE", direction: IN)
+}
+
+type Journal implements Publication {
+  subject: String!
+  publicationYear: Int!
+  author: [Author!]! @relationship(type: "WROTE", direction: IN)
+}
+----
+
+=== should not over fetch when all required fields are manually selected
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  authors {
+    name
+    publicationsWithAuthor
+    publications {
+      publicationYear
+      ... on Book {
+        title
+      }
+      ... on Journal {
+        subject
+      }
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Author)
+CALL {
+    WITH this
+    CALL {
+        WITH *
+        MATCH (this)-[this0:WROTE]->(this1:Book)
+        WITH this1 { .publicationYear, .title, __typename: "Book", __id: toString(id(this1)) } AS this1
+        RETURN this1 AS var2
+        UNION
+        WITH *
+        MATCH (this)-[this3:WROTE]->(this4:Journal)
+        WITH this4 { .publicationYear, .subject, __typename: "Journal", __id: toString(id(this4)) } AS this4
+        RETURN this4 AS var2
+    }
+    WITH var2
+    RETURN collect(var2) AS var2
+}
+RETURN this { .name, .publicationsWithAuthor, publications: var2 } AS this
+----
+
+=== should not fetch required fields if @customResolver field is not selected
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  authors {
+    name
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Author)
+RETURN this { .name } AS this
+----
+
+=== should not over fetch when some required fields are manually selected
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  authors {
+    publicationsWithAuthor
+    publications {
+      ... on Book {
+        title
+      }
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Author)
+CALL {
+    WITH this
+    CALL {
+        WITH *
+        MATCH (this)-[this0:WROTE]->(this1:Book)
+        WITH this1 { .publicationYear, .title, __typename: "Book", __id: toString(id(this1)) } AS this1
+        RETURN this1 AS var2
+        UNION
+        WITH *
+        MATCH (this)-[this3:WROTE]->(this4:Journal)
+        WITH this4 { .publicationYear, .subject, __typename: "Journal", __id: toString(id(this4)) } AS this4
+        RETURN this4 AS var2
+    }
+    WITH var2
+    RETURN collect(var2) AS var2
+}
+RETURN this { .publicationsWithAuthor, .name, publications: var2 } AS this
+----
+
+=== should not over fetch when no required fields are manually selected
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  authors {
+    publicationsWithAuthor
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Author)
+CALL {
+    WITH this
+    CALL {
+        WITH *
+        MATCH (this)-[this0:WROTE]->(this1:Book)
+        WITH this1 { .publicationYear, .title, __typename: "Book", __id: toString(id(this1)) } AS this1
+        RETURN this1 AS var2
+        UNION
+        WITH *
+        MATCH (this)-[this3:WROTE]->(this4:Journal)
+        WITH this4 { .publicationYear, .subject, __typename: "Journal", __id: toString(id(this4)) } AS this4
+        RETURN this4 AS var2
+    }
+    WITH var2
+    RETURN collect(var2) AS var2
+}
+RETURN this { .publicationsWithAuthor, .name, publications: var2 } AS this
+----
diff --git a/core/src/test/resources/tck-test-files/cypher/v2/directives/interface-relationships/read.adoc b/core/src/test/resources/tck-test-files/cypher/v2/directives/interface-relationships/read.adoc
index 581174ca..66a5a8e8 100644
--- a/core/src/test/resources/tck-test-files/cypher/v2/directives/interface-relationships/read.adoc
+++ b/core/src/test/resources/tck-test-files/cypher/v2/directives/interface-relationships/read.adoc
@@ -36,7 +36,7 @@ type Actor {
 == Simple Interface Relationship Query
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   actors {
@@ -93,12 +93,10 @@ RETURN this {
 } AS this
 ----
 
-'''
-
 == Simple Interface Relationship Query For Non-Array Field
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   actors {
@@ -155,12 +153,10 @@ RETURN this {
 } AS this
 ----
 
-'''
-
 == Simple Interface Relationship Query with offset and limit
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   actors {
@@ -220,12 +216,10 @@ RETURN this {
 } AS this
 ----
 
-'''
-
 == Interface Relationship Query through connection
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   actors {
@@ -305,12 +299,10 @@ RETURN this {
 } AS this
 ----
 
-'''
-
 == Interface Relationship Query through connection with where
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   actors {
@@ -400,6 +392,3 @@ RETURN this {
 	actedInConnection: actedInConnection
 } AS this
 ----
-
-'''
-
diff --git a/core/src/test/resources/tck-test-files/cypher/v2/directives/interface-relationships/read.js.adoc b/core/src/test/resources/tck-test-files/cypher/v2/directives/interface-relationships/read.js.adoc
new file mode 100644
index 00000000..f56694e0
--- /dev/null
+++ b/core/src/test/resources/tck-test-files/cypher/v2/directives/interface-relationships/read.js.adoc
@@ -0,0 +1,311 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= Interface Relationships
+
+== Setup
+
+.Schema
+[source,graphql,schema=true]
+----
+interface Production {
+  title: String!
+}
+
+type Movie implements Production {
+  title: String!
+  runtime: Int!
+}
+
+type Series implements Production {
+  title: String!
+  episodes: Int!
+}
+
+type ActedIn @relationshipProperties {
+  screenTime: Int!
+}
+
+type Actor {
+  name: String!
+  currentlyActingIn: Production @relationship(type: "CURRENTLY_ACTING_IN", direction: OUT)
+  actedIn: [Production!]! @relationship(type: "ACTED_IN", direction: OUT, properties: "ActedIn")
+}
+----
+
+== Simple Interface Relationship Query
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  actors {
+    actedIn {
+      title
+      ... on Movie {
+        runtime
+      }
+      ... on Series {
+        episodes
+      }
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Actor)
+CALL {
+    WITH this
+    CALL {
+        WITH *
+        MATCH (this)-[this0:ACTED_IN]->(this1:Movie)
+        WITH this1 { .title, .runtime, __typename: "Movie", __id: toString(id(this1)) } AS this1
+        RETURN this1 AS var2
+        UNION
+        WITH *
+        MATCH (this)-[this3:ACTED_IN]->(this4:Series)
+        WITH this4 { .title, .episodes, __typename: "Series", __id: toString(id(this4)) } AS this4
+        RETURN this4 AS var2
+    }
+    WITH var2
+    RETURN collect(var2) AS var2
+}
+RETURN this { actedIn: var2 } AS this
+----
+
+== Simple Interface Relationship Query For Non-Array Field
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  actors {
+    currentlyActingIn {
+      title
+      ... on Movie {
+        runtime
+      }
+      ... on Series {
+        episodes
+      }
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Actor)
+CALL {
+    WITH this
+    CALL {
+        WITH *
+        MATCH (this)-[this0:CURRENTLY_ACTING_IN]->(this1:Movie)
+        WITH this1 { .title, .runtime, __typename: "Movie", __id: toString(id(this1)) } AS this1
+        RETURN this1 AS var2
+        UNION
+        WITH *
+        MATCH (this)-[this3:CURRENTLY_ACTING_IN]->(this4:Series)
+        WITH this4 { .title, .episodes, __typename: "Series", __id: toString(id(this4)) } AS this4
+        RETURN this4 AS var2
+    }
+    WITH var2
+    RETURN head(collect(var2)) AS var2
+}
+RETURN this { currentlyActingIn: var2 } AS this
+----
+
+== Simple Interface Relationship Query with offset and limit
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  actors {
+    actedIn(options: {offset: 5, limit: 10, sort: [{title: DESC}]}) {
+      title
+      ... on Movie {
+        runtime
+      }
+      ... on Series {
+        episodes
+      }
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": 5,
+  "param1": 10
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Actor)
+CALL {
+    WITH this
+    CALL {
+        WITH *
+        MATCH (this)-[this0:ACTED_IN]->(this1:Movie)
+        WITH this1 { .title, .runtime, __typename: "Movie", __id: toString(id(this1)) } AS this1
+        RETURN this1 AS var2
+        UNION
+        WITH *
+        MATCH (this)-[this3:ACTED_IN]->(this4:Series)
+        WITH this4 { .title, .episodes, __typename: "Series", __id: toString(id(this4)) } AS this4
+        RETURN this4 AS var2
+    }
+    WITH var2
+    ORDER BY var2.title DESC
+    SKIP $param0
+    LIMIT $param1
+    RETURN collect(var2) AS var2
+}
+RETURN this { actedIn: var2 } AS this
+----
+
+== Interface Relationship Query through connection
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  actors {
+    actedInConnection {
+      edges {
+        properties {
+          screenTime
+        }
+        node {
+          title
+          ... on Movie {
+            runtime
+          }
+          ... on Series {
+            episodes
+          }
+        }
+      }
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Actor)
+CALL {
+    WITH this
+    CALL {
+        WITH this
+        MATCH (this)-[this0:ACTED_IN]->(this1:Movie)
+        WITH { properties: { screenTime: this0.screenTime, __typename: "ActedIn" }, node: { __typename: "Movie", __id: toString(id(this1)), runtime: this1.runtime, title: this1.title } } AS edge
+        RETURN edge
+        UNION
+        WITH this
+        MATCH (this)-[this2:ACTED_IN]->(this3:Series)
+        WITH { properties: { screenTime: this2.screenTime, __typename: "ActedIn" }, node: { __typename: "Series", __id: toString(id(this3)), episodes: this3.episodes, title: this3.title } } AS edge
+        RETURN edge
+    }
+    WITH collect(edge) AS edges
+    WITH edges, size(edges) AS totalCount
+    RETURN { edges: edges, totalCount: totalCount } AS var4
+}
+RETURN this { actedInConnection: var4 } AS this
+----
+
+== Interface Relationship Query through connection with where
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  actors {
+    actedInConnection(
+      where: {node: {title_STARTS_WITH: "The "}, edge: {screenTime_GT: 60}}
+    ) {
+      edges {
+        properties {
+          screenTime
+        }
+        node {
+          title
+          ... on Movie {
+            runtime
+          }
+          ... on Series {
+            episodes
+          }
+        }
+      }
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "The ",
+  "param1": 60,
+  "param2": "The ",
+  "param3": 60
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Actor)
+CALL {
+    WITH this
+    CALL {
+        WITH this
+        MATCH (this)-[this0:ACTED_IN]->(this1:Movie)
+        WHERE (this1.title STARTS WITH $param0 AND this0.screenTime > $param1)
+        WITH { properties: { screenTime: this0.screenTime, __typename: "ActedIn" }, node: { __typename: "Movie", __id: toString(id(this1)), runtime: this1.runtime, title: this1.title } } AS edge
+        RETURN edge
+        UNION
+        WITH this
+        MATCH (this)-[this2:ACTED_IN]->(this3:Series)
+        WHERE (this3.title STARTS WITH $param2 AND this2.screenTime > $param3)
+        WITH { properties: { screenTime: this2.screenTime, __typename: "ActedIn" }, node: { __typename: "Series", __id: toString(id(this3)), episodes: this3.episodes, title: this3.title } } AS edge
+        RETURN edge
+    }
+    WITH collect(edge) AS edges
+    WITH edges, size(edges) AS totalCount
+    RETURN { edges: edges, totalCount: totalCount } AS var4
+}
+RETURN this { actedInConnection: var4 } AS this
+----
diff --git a/core/src/test/resources/tck-test-files/cypher/v2/directives/node/node-additional-labels.adoc b/core/src/test/resources/tck-test-files/cypher/v2/directives/node/node-additional-labels.adoc
index 7da56cbf..0825318f 100644
--- a/core/src/test/resources/tck-test-files/cypher/v2/directives/node/node-additional-labels.adoc
+++ b/core/src/test/resources/tck-test-files/cypher/v2/directives/node/node-additional-labels.adoc
@@ -23,7 +23,7 @@ type Movie @node(labels: ["Film", "Multimedia"]) {
 == Select Movie with additional labels
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies {
@@ -47,12 +47,10 @@ RETURN this {
 } AS this
 ----
 
-'''
-
 == Select movie and actor with additional labels
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies {
@@ -87,6 +85,3 @@ RETURN this {
 	actors: actors
 } AS this
 ----
-
-'''
-
diff --git a/core/src/test/resources/tck-test-files/cypher/v2/directives/node/node-additional-labels.js.adoc b/core/src/test/resources/tck-test-files/cypher/v2/directives/node/node-additional-labels.js.adoc
new file mode 100644
index 00000000..36a5378d
--- /dev/null
+++ b/core/src/test/resources/tck-test-files/cypher/v2/directives/node/node-additional-labels.js.adoc
@@ -0,0 +1,81 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= Node directive with additionalLabels
+
+== Setup
+
+.Schema
+[source,graphql,schema=true]
+----
+type Actor @node(labels: ["Actor", "Person"]) {
+  name: String
+  movies: [Movie!]! @relationship(type: "ACTED_IN", direction: OUT)
+}
+
+type Movie @node(labels: ["Film", "Multimedia"]) {
+  id: ID
+  title: String
+  actors: [Actor!]! @relationship(type: "ACTED_IN", direction: IN)
+}
+----
+
+== Select Movie with additional labels
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies {
+    title
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Film:Multimedia)
+RETURN this { .title } AS this
+----
+
+== Select movie and actor with additional labels
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies {
+    title
+    actors {
+      name
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Film:Multimedia)
+CALL {
+    WITH this
+    MATCH (this)<-[this0:ACTED_IN]-(this1:Actor:Person)
+    WITH this1 { .name } AS this1
+    RETURN collect(this1) AS var2
+}
+RETURN this { .title, actors: var2 } AS this
+----
diff --git a/core/src/test/resources/tck-test-files/cypher/v2/directives/node/node-label-interface.adoc b/core/src/test/resources/tck-test-files/cypher/v2/directives/node/node-label-interface.adoc
index 585ffd3f..1c6bd043 100644
--- a/core/src/test/resources/tck-test-files/cypher/v2/directives/node/node-label-interface.adoc
+++ b/core/src/test/resources/tck-test-files/cypher/v2/directives/node/node-label-interface.adoc
@@ -26,7 +26,7 @@ type Movie implements Search @node(labels: ["Film"]) {
 == Read Interface
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies(where: {title: "some title"}) {
@@ -88,6 +88,3 @@ RETURN this {
 	search: search
 } AS this
 ----
-
-'''
-
diff --git a/core/src/test/resources/tck-test-files/cypher/v2/directives/node/node-label-interface.js.adoc b/core/src/test/resources/tck-test-files/cypher/v2/directives/node/node-label-interface.js.adoc
new file mode 100644
index 00000000..09d675d9
--- /dev/null
+++ b/core/src/test/resources/tck-test-files/cypher/v2/directives/node/node-label-interface.js.adoc
@@ -0,0 +1,85 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= Node directive with interface
+
+== Setup
+
+.Schema
+[source,graphql,schema=true]
+----
+interface Search {
+  name: String
+}
+
+type Genre implements Search @node(labels: ["Category", "ExtraLabel1", "ExtraLabel2"]) {
+  name: String
+}
+
+type Movie implements Search @node(labels: ["Film"]) {
+  name: String
+  title: String
+  search: [Search!]! @relationship(type: "SEARCH", direction: OUT)
+}
+----
+
+== Read Interface
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies(where: {title: "some title"}) {
+    search(where: {name: "Horror"}, options: {offset: 1, limit: 10}) {
+      ... on Movie {
+        title
+      }
+      ... on Genre {
+        name
+      }
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "some title",
+  "param1": "Horror",
+  "param2": "Horror",
+  "param3": 1,
+  "param4": 10
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Film)
+WHERE this.title = $param0
+CALL {
+    WITH this
+    CALL {
+        WITH *
+        MATCH (this)-[this0:SEARCH]->(this1:Category:ExtraLabel1:ExtraLabel2)
+        WHERE this1.name = $param1
+        WITH this1 { .name, __typename: "Genre", __id: toString(id(this1)) } AS this1
+        RETURN this1 AS var2
+        UNION
+        WITH *
+        MATCH (this)-[this3:SEARCH]->(this4:Film)
+        WHERE this4.name = $param2
+        WITH this4 { .title, __typename: "Movie", __id: toString(id(this4)) } AS this4
+        RETURN this4 AS var2
+    }
+    WITH var2
+    
+    SKIP $param3
+    LIMIT $param4
+    RETURN collect(var2) AS var2
+}
+RETURN this { search: var2 } AS this
+----
diff --git a/core/src/test/resources/tck-test-files/cypher/v2/directives/node/node-label-union.adoc b/core/src/test/resources/tck-test-files/cypher/v2/directives/node/node-label-union.adoc
index 8997b163..c526f58b 100644
--- a/core/src/test/resources/tck-test-files/cypher/v2/directives/node/node-label-union.adoc
+++ b/core/src/test/resources/tck-test-files/cypher/v2/directives/node/node-label-union.adoc
@@ -23,7 +23,7 @@ type Movie @node(labels: ["Film"]) {
 == Read Unions
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies(where: {title: "some title"}) {
@@ -88,6 +88,3 @@ RETURN this {
 	search: search0
 } AS this
 ----
-
-'''
-
diff --git a/core/src/test/resources/tck-test-files/cypher/v2/directives/node/node-label-union.js.adoc b/core/src/test/resources/tck-test-files/cypher/v2/directives/node/node-label-union.js.adoc
new file mode 100644
index 00000000..b09f533a
--- /dev/null
+++ b/core/src/test/resources/tck-test-files/cypher/v2/directives/node/node-label-union.js.adoc
@@ -0,0 +1,85 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= Node directive with unions
+
+== Setup
+
+.Schema
+[source,graphql,schema=true]
+----
+union Search = Genre | Movie
+
+type Genre @node(labels: ["Category", "ExtraLabel1", "ExtraLabel2"]) {
+  name: String
+}
+
+type Movie @node(labels: ["Film"]) {
+  title: String
+  search: [Search!]! @relationship(type: "SEARCH", direction: OUT)
+}
+----
+
+== Read Unions
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies(where: {title: "some title"}) {
+    search(
+      where: {Movie: {title: "The Matrix"}, Genre: {name: "Horror"}}
+      options: {offset: 1, limit: 10}
+    ) {
+      ... on Movie {
+        title
+      }
+      ... on Genre {
+        name
+      }
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "some title",
+  "param1": "Horror",
+  "param2": "The Matrix",
+  "param3": 1,
+  "param4": 10
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Film)
+WHERE this.title = $param0
+CALL {
+    WITH this
+    CALL {
+        WITH *
+        MATCH (this)-[this0:SEARCH]->(this1:Category:ExtraLabel1:ExtraLabel2)
+        WHERE this1.name = $param1
+        WITH this1 { .name, __typename: "Genre", __id: toString(id(this1)) } AS this1
+        RETURN this1 AS var2
+        UNION
+        WITH *
+        MATCH (this)-[this3:SEARCH]->(this4:Film)
+        WHERE this4.title = $param2
+        WITH this4 { .title, __typename: "Movie", __id: toString(id(this4)) } AS this4
+        RETURN this4 AS var2
+    }
+    WITH var2
+    
+    SKIP $param3
+    LIMIT $param4
+    RETURN collect(var2) AS var2
+}
+RETURN this { search: var2 } AS this
+----
diff --git a/core/src/test/resources/tck-test-files/cypher/v2/directives/node/node-label.adoc b/core/src/test/resources/tck-test-files/cypher/v2/directives/node/node-label.adoc
index 5a506cc7..1c9e8386 100644
--- a/core/src/test/resources/tck-test-files/cypher/v2/directives/node/node-label.adoc
+++ b/core/src/test/resources/tck-test-files/cypher/v2/directives/node/node-label.adoc
@@ -23,7 +23,7 @@ type Movie @node(labels: ["Film"]) {
 == Select Movie with label Film
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies {
@@ -47,12 +47,10 @@ RETURN this {
 } AS this
 ----
 
-'''
-
 == Select movie and actor with custom labels
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies {
@@ -88,12 +86,10 @@ RETURN this {
 } AS this
 ----
 
-'''
-
 == Select movie and actor with custom labels using Relay connection
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies {
@@ -148,6 +144,3 @@ RETURN this {
 	actorsConnection: actorsConnection
 } AS this
 ----
-
-'''
-
diff --git a/core/src/test/resources/tck-test-files/cypher/v2/directives/node/node-label.js.adoc b/core/src/test/resources/tck-test-files/cypher/v2/directives/node/node-label.js.adoc
new file mode 100644
index 00000000..34281e7c
--- /dev/null
+++ b/core/src/test/resources/tck-test-files/cypher/v2/directives/node/node-label.js.adoc
@@ -0,0 +1,126 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= Label in Node directive
+
+== Setup
+
+.Schema
+[source,graphql,schema=true]
+----
+type Actor @node(labels: ["Person"]) {
+  name: String
+  movies: [Movie!]! @relationship(type: "ACTED_IN", direction: OUT)
+}
+
+type Movie @node(labels: ["Film"]) {
+  id: ID
+  title: String
+  actors: [Actor!]! @relationship(type: "ACTED_IN", direction: IN)
+}
+----
+
+== Select Movie with label Film
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies {
+    title
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Film)
+RETURN this { .title } AS this
+----
+
+== Select movie and actor with custom labels
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies {
+    title
+    actors {
+      name
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Film)
+CALL {
+    WITH this
+    MATCH (this)<-[this0:ACTED_IN]-(this1:Person)
+    WITH this1 { .name } AS this1
+    RETURN collect(this1) AS var2
+}
+RETURN this { .title, actors: var2 } AS this
+----
+
+== Select movie and actor with custom labels using Relay connection
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies {
+    title
+    actorsConnection {
+      edges {
+        node {
+          name
+        }
+      }
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Film)
+CALL {
+    WITH this
+    MATCH (this)<-[this0:ACTED_IN]-(this1:Person)
+    WITH collect({ node: this1, relationship: this0 }) AS edges
+    WITH edges, size(edges) AS totalCount
+    CALL {
+        WITH edges
+        UNWIND edges AS edge
+        WITH edge.node AS this1, edge.relationship AS this0
+        RETURN collect({ node: { name: this1.name, __typename: "Actor" } }) AS var2
+    }
+    RETURN { edges: var2, totalCount: totalCount } AS var3
+}
+RETURN this { .title, actorsConnection: var3 } AS this
+----
diff --git a/core/src/test/resources/tck-test-files/cypher/v2/directives/plural.adoc b/core/src/test/resources/tck-test-files/cypher/v2/directives/plural.adoc
index a4ea9529..8b6168e1 100644
--- a/core/src/test/resources/tck-test-files/cypher/v2/directives/plural.adoc
+++ b/core/src/test/resources/tck-test-files/cypher/v2/directives/plural.adoc
@@ -16,7 +16,7 @@ type Tech @plural(value: "Techs") {
 == Select Tech with plural techs
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   techs {
@@ -40,12 +40,10 @@ RETURN this {
 } AS this
 ----
 
-'''
-
 == Query with aliases
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   technologies: techs {
@@ -68,6 +66,3 @@ RETURN this {
 	.name
 } AS this
 ----
-
-'''
-
diff --git a/core/src/test/resources/tck-test-files/cypher/v2/directives/plural.js.adoc b/core/src/test/resources/tck-test-files/cypher/v2/directives/plural.js.adoc
new file mode 100644
index 00000000..728e7ff4
--- /dev/null
+++ b/core/src/test/resources/tck-test-files/cypher/v2/directives/plural.js.adoc
@@ -0,0 +1,65 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= Plural directive
+
+== Setup
+
+.Schema
+[source,graphql,schema=true]
+----
+type Tech @plural(value: "Techs") {
+  name: String
+}
+----
+
+== Select Tech with plural techs
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  techs {
+    name
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Tech)
+RETURN this { .name } AS this
+----
+
+== Query with aliases
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  technologies: techs {
+    name
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Tech)
+RETURN this { .name } AS this
+----
diff --git a/core/src/test/resources/tck-test-files/cypher/v2/experimental/typename-in.adoc b/core/src/test/resources/tck-test-files/cypher/v2/experimental/typename-in.adoc
index 8a10037b..2d217d2e 100644
--- a/core/src/test/resources/tck-test-files/cypher/v2/experimental/typename-in.adoc
+++ b/core/src/test/resources/tck-test-files/cypher/v2/experimental/typename-in.adoc
@@ -44,7 +44,7 @@ type Actor {
 == top-level
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   productions(
@@ -104,12 +104,10 @@ WITH this
 RETURN this AS this
 ----
 
-'''
-
 == top-level + connection where
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   actors(
@@ -180,12 +178,10 @@ RETURN this {
 } AS this
 ----
 
-'''
-
 == nested
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   actors {
@@ -256,6 +252,3 @@ RETURN this {
 	actedIn: actedIn
 } AS this
 ----
-
-'''
-
diff --git a/core/src/test/resources/tck-test-files/cypher/v2/experimental/typename-in.js.adoc b/core/src/test/resources/tck-test-files/cypher/v2/experimental/typename-in.js.adoc
new file mode 100644
index 00000000..a9001c98
--- /dev/null
+++ b/core/src/test/resources/tck-test-files/cypher/v2/experimental/typename-in.js.adoc
@@ -0,0 +1,204 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= typename_IN
+
+== Setup
+
+.Schema
+[source,graphql,schema=true]
+----
+interface Production {
+  title: String!
+  cost: Float!
+}
+
+type Movie implements Production {
+  title: String!
+  cost: Float!
+  runtime: Int!
+}
+
+type Series implements Production {
+  title: String!
+  cost: Float!
+  episodes: Int!
+}
+
+type Cartoon implements Production {
+  title: String!
+  cost: Float!
+  cartoonist: String!
+}
+
+type ActedIn @relationshipProperties {
+  screenTime: Int!
+}
+
+type Actor {
+  name: String!
+  actedIn: [Production!]! @relationship(type: "ACTED_IN", direction: OUT, properties: "ActedIn")
+}
+----
+
+== top-level
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  productions(
+    where: {OR: [{AND: [{title: "The Matrix"}, {typename_IN: [Series]}]}, {typename_IN: [Movie]}]}
+  ) {
+    title
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "The Matrix",
+  "param1": "The Matrix",
+  "param2": "The Matrix"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+CALL {
+    MATCH (this0:Cartoon)
+    WHERE ((this0.title = $param0 AND this0:Series) OR this0:Movie)
+    WITH this0 { .title, __typename: "Cartoon", __id: toString(id(this0)) } AS this0
+    RETURN this0 AS this
+    UNION
+    MATCH (this1:Movie)
+    WHERE ((this1.title = $param1 AND this1:Series) OR this1:Movie)
+    WITH this1 { .title, __typename: "Movie", __id: toString(id(this1)) } AS this1
+    RETURN this1 AS this
+    UNION
+    MATCH (this2:Series)
+    WHERE ((this2.title = $param2 AND this2:Series) OR this2:Movie)
+    WITH this2 { .title, __typename: "Series", __id: toString(id(this2)) } AS this2
+    RETURN this2 AS this
+}
+WITH this
+RETURN this AS this
+----
+
+== top-level + connection where
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  actors(
+    where: {actedInConnection_SOME: {OR: [{edge: {screenTime: 2}}, {node: {OR: [{title: "The Matrix"}, {typename_IN: [Series]}]}}]}}
+  ) {
+    actedIn {
+      title
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": 2,
+  "param1": "The Matrix"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Actor)
+WHERE EXISTS {
+    MATCH (this)-[this0:ACTED_IN]->(this1)
+    WHERE ((this0.screenTime = $param0 OR (this1.title = $param1 OR this1:Series)) AND (this1:Cartoon OR this1:Movie OR this1:Series))
+}
+CALL {
+    WITH this
+    CALL {
+        WITH *
+        MATCH (this)-[this2:ACTED_IN]->(this3:Cartoon)
+        WITH this3 { .title, __typename: "Cartoon", __id: toString(id(this3)) } AS this3
+        RETURN this3 AS var4
+        UNION
+        WITH *
+        MATCH (this)-[this5:ACTED_IN]->(this6:Movie)
+        WITH this6 { .title, __typename: "Movie", __id: toString(id(this6)) } AS this6
+        RETURN this6 AS var4
+        UNION
+        WITH *
+        MATCH (this)-[this7:ACTED_IN]->(this8:Series)
+        WITH this8 { .title, __typename: "Series", __id: toString(id(this8)) } AS this8
+        RETURN this8 AS var4
+    }
+    WITH var4
+    RETURN collect(var4) AS var4
+}
+RETURN this { actedIn: var4 } AS this
+----
+
+== nested
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  actors {
+    actedIn(
+      where: {OR: [{AND: [{title: "The Matrix"}, {typename_IN: [Series]}]}, {typename_IN: [Movie]}]}
+    ) {
+      title
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "The Matrix",
+  "param1": "The Matrix",
+  "param2": "The Matrix"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Actor)
+CALL {
+    WITH this
+    CALL {
+        WITH *
+        MATCH (this)-[this0:ACTED_IN]->(this1:Cartoon)
+        WHERE ((this1.title = $param0 AND this1:Series) OR this1:Movie)
+        WITH this1 { .title, __typename: "Cartoon", __id: toString(id(this1)) } AS this1
+        RETURN this1 AS var2
+        UNION
+        WITH *
+        MATCH (this)-[this3:ACTED_IN]->(this4:Movie)
+        WHERE ((this4.title = $param1 AND this4:Series) OR this4:Movie)
+        WITH this4 { .title, __typename: "Movie", __id: toString(id(this4)) } AS this4
+        RETURN this4 AS var2
+        UNION
+        WITH *
+        MATCH (this)-[this5:ACTED_IN]->(this6:Series)
+        WHERE ((this6.title = $param2 AND this6:Series) OR this6:Movie)
+        WITH this6 { .title, __typename: "Series", __id: toString(id(this6)) } AS this6
+        RETURN this6 AS var2
+    }
+    WITH var2
+    RETURN collect(var2) AS var2
+}
+RETURN this { actedIn: var2 } AS this
+----
diff --git a/core/src/test/resources/tck-test-files/cypher/v2/experimental/union-relationship-filtering.adoc b/core/src/test/resources/tck-test-files/cypher/v2/experimental/union-relationship-filtering.adoc
index b0daf7c5..99f4f3c2 100644
--- a/core/src/test/resources/tck-test-files/cypher/v2/experimental/union-relationship-filtering.adoc
+++ b/core/src/test/resources/tck-test-files/cypher/v2/experimental/union-relationship-filtering.adoc
@@ -36,7 +36,7 @@ type ActedIn @relationshipProperties {
 == Union filter (top level)
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query actedInWhere {
   productions(
@@ -86,12 +86,10 @@ WITH this
 RETURN this AS this
 ----
 
-'''
-
 == Filtering on nested-level relationship unions
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query actedInWhere {
   actors(
@@ -127,6 +125,3 @@ RETURN this {
 	.name
 } AS this
 ----
-
-'''
-
diff --git a/core/src/test/resources/tck-test-files/cypher/v2/experimental/union-relationship-filtering.js.adoc b/core/src/test/resources/tck-test-files/cypher/v2/experimental/union-relationship-filtering.js.adoc
new file mode 100644
index 00000000..46a55ac2
--- /dev/null
+++ b/core/src/test/resources/tck-test-files/cypher/v2/experimental/union-relationship-filtering.js.adoc
@@ -0,0 +1,118 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= Union relationship filtering operations
+
+== Setup
+
+.Schema
+[source,graphql,schema=true]
+----
+union Production = Movie | Series
+
+type Movie {
+  title: String!
+  cost: Float
+  runtime: Int
+  actors: [Actor!]! @relationship(type: "ACTED_IN", direction: IN, properties: "ActedIn")
+}
+
+type Series {
+  title: String!
+  episodes: Int
+  actors: [Actor!]! @relationship(type: "ACTED_IN", direction: IN, properties: "ActedIn")
+}
+
+type Actor {
+  name: String!
+  actedIn: [Production!]! @relationship(type: "ACTED_IN", direction: OUT, properties: "ActedIn")
+}
+
+type ActedIn @relationshipProperties {
+  screenTime: Int
+}
+----
+
+== Union filter (top level)
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+query actedInWhere {
+  productions(
+    where: {Movie: {title: "The Office"}, Series: {title: "The Office 2"}}
+  ) {
+    ... on Movie {
+      title
+    }
+    ... on Series {
+      title
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "The Office",
+  "param1": "The Office 2"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+CALL {
+    MATCH (this0:Movie)
+    WHERE this0.title = $param0
+    WITH this0 { .title, __typename: "Movie", __id: toString(id(this0)) } AS this0
+    RETURN this0 AS this
+    UNION
+    MATCH (this1:Series)
+    WHERE this1.title = $param1
+    WITH this1 { .title, __typename: "Series", __id: toString(id(this1)) } AS this1
+    RETURN this1 AS this
+}
+WITH this
+RETURN this AS this
+----
+
+== Filtering on nested-level relationship unions
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+query actedInWhere {
+  actors(
+    where: {actedIn_SOME: {Movie: {title_CONTAINS: "The Office"}, Series: {title_ENDS_WITH: "Office"}}}
+  ) {
+    name
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "The Office",
+  "param1": "Office"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Actor)
+WHERE (EXISTS {
+    MATCH (this)-[:ACTED_IN]->(this0:Movie)
+    WHERE this0.title CONTAINS $param0
+} AND EXISTS {
+    MATCH (this)-[:ACTED_IN]->(this1:Series)
+    WHERE this1.title ENDS WITH $param1
+})
+RETURN this { .name } AS this
+----
diff --git a/core/src/test/resources/tck-test-files/cypher/v2/experimental/union-top-level.adoc b/core/src/test/resources/tck-test-files/cypher/v2/experimental/union-top-level.adoc
index c6eea331..baa93e9d 100644
--- a/core/src/test/resources/tck-test-files/cypher/v2/experimental/union-top-level.adoc
+++ b/core/src/test/resources/tck-test-files/cypher/v2/experimental/union-top-level.adoc
@@ -23,7 +23,7 @@ type Movie {
 == Read union
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   searches {
@@ -66,12 +66,10 @@ WITH this
 RETURN this AS this
 ----
 
-'''
-
 == Read union with relationship on member type
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   searches {
@@ -141,6 +139,3 @@ CALL {
 WITH this
 RETURN this AS this
 ----
-
-'''
-
diff --git a/core/src/test/resources/tck-test-files/cypher/v2/experimental/union-top-level.js.adoc b/core/src/test/resources/tck-test-files/cypher/v2/experimental/union-top-level.js.adoc
new file mode 100644
index 00000000..67b8e9b4
--- /dev/null
+++ b/core/src/test/resources/tck-test-files/cypher/v2/experimental/union-top-level.js.adoc
@@ -0,0 +1,121 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= Union top level operations
+
+== Setup
+
+.Schema
+[source,graphql,schema=true]
+----
+union Search = Genre | Movie
+
+type Genre {
+  name: String
+}
+
+type Movie {
+  title: String
+  search: [Search!]! @relationship(type: "SEARCH", direction: OUT)
+}
+----
+
+== Read union
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  searches {
+    ... on Movie {
+      title
+    }
+    ... on Genre {
+      name
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+CALL {
+    MATCH (this0:Genre)
+    WITH this0 { .name, __typename: "Genre", __id: toString(id(this0)) } AS this0
+    RETURN this0 AS this
+    UNION
+    MATCH (this1:Movie)
+    WITH this1 { .title, __typename: "Movie", __id: toString(id(this1)) } AS this1
+    RETURN this1 AS this
+}
+WITH this
+RETURN this AS this
+----
+
+== Read union with relationship on member type
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  searches {
+    ... on Movie {
+      title
+      search {
+        ... on Genre {
+          name
+        }
+      }
+    }
+    ... on Genre {
+      name
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+CALL {
+    MATCH (this0:Genre)
+    WITH this0 { .name, __typename: "Genre", __id: toString(id(this0)) } AS this0
+    RETURN this0 AS this
+    UNION
+    MATCH (this1:Movie)
+    CALL {
+        WITH this1
+        CALL {
+            WITH *
+            MATCH (this1)-[this2:SEARCH]->(this3:Genre)
+            WITH this3 { .name, __typename: "Genre", __id: toString(id(this3)) } AS this3
+            RETURN this3 AS var4
+            UNION
+            WITH *
+            MATCH (this1)-[this5:SEARCH]->(this6:Movie)
+            WITH this6 { __typename: "Movie", __id: toString(id(this6)) } AS this6
+            RETURN this6 AS var4
+        }
+        WITH var4
+        RETURN collect(var4) AS var4
+    }
+    WITH this1 { .title, search: var4, __typename: "Movie", __id: toString(id(this1)) } AS this1
+    RETURN this1 AS this
+}
+WITH this
+RETURN this AS this
+----
diff --git a/core/src/test/resources/tck-test-files/cypher/v2/issues/1348.adoc b/core/src/test/resources/tck-test-files/cypher/v2/issues/1348.adoc
index 7955f0e9..330fb5f2 100644
--- a/core/src/test/resources/tck-test-files/cypher/v2/issues/1348.adoc
+++ b/core/src/test/resources/tck-test-files/cypher/v2/issues/1348.adoc
@@ -36,7 +36,7 @@ type ProgrammeItem implements Product {
 == should also return node with no relationship in result set
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   programmeItems {
@@ -98,12 +98,10 @@ RETURN this {
 } AS this
 ----
 
-'''
-
 == should return node with no relationship (edge) in result set, as Relay connection
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   programmeItems {
@@ -185,6 +183,3 @@ RETURN this {
 	releatsToConnection: releatsToConnection
 } AS this
 ----
-
-'''
-
diff --git a/core/src/test/resources/tck-test-files/cypher/v2/issues/1348.js.adoc b/core/src/test/resources/tck-test-files/cypher/v2/issues/1348.js.adoc
new file mode 100644
index 00000000..358c1838
--- /dev/null
+++ b/core/src/test/resources/tck-test-files/cypher/v2/issues/1348.js.adoc
@@ -0,0 +1,149 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= https://github.com/neo4j/graphql/issues/1348
+
+== Setup
+
+.Schema
+[source,graphql,schema=true]
+----
+interface Product {
+  productTitle: String!
+  releatsTo: [Product!]!
+}
+
+type Series implements Product {
+  productTitle: String!
+  releatsTo: [Product!]! @relationship(type: "RELATES_TO", direction: OUT, queryDirection: DEFAULT_UNDIRECTED)
+  seasons: [Season!]!
+}
+
+type Season implements Product {
+  productTitle: String!
+  releatsTo: [Product!]! @relationship(type: "RELATES_TO", direction: OUT, queryDirection: DEFAULT_UNDIRECTED)
+  seasonNumber: Int
+  episodes: [ProgrammeItem!]!
+}
+
+type ProgrammeItem implements Product {
+  productTitle: String!
+  releatsTo: [Product!]! @relationship(type: "RELATES_TO", direction: OUT, queryDirection: DEFAULT_UNDIRECTED)
+  episodeNumber: Int
+}
+----
+
+== should also return node with no relationship in result set
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  programmeItems {
+    productTitle
+    episodeNumber
+    releatsTo {
+      __typename
+      productTitle
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:ProgrammeItem)
+CALL {
+    WITH this
+    CALL {
+        WITH *
+        MATCH (this)-[this0:RELATES_TO]-(this1:ProgrammeItem)
+        WITH this1 { .productTitle, __typename: "ProgrammeItem", __id: toString(id(this1)) } AS this1
+        RETURN this1 AS var2
+        UNION
+        WITH *
+        MATCH (this)-[this3:RELATES_TO]-(this4:Season)
+        WITH this4 { .productTitle, __typename: "Season", __id: toString(id(this4)) } AS this4
+        RETURN this4 AS var2
+        UNION
+        WITH *
+        MATCH (this)-[this5:RELATES_TO]-(this6:Series)
+        WITH this6 { .productTitle, __typename: "Series", __id: toString(id(this6)) } AS this6
+        RETURN this6 AS var2
+    }
+    WITH var2
+    RETURN collect(var2) AS var2
+}
+RETURN this { .productTitle, .episodeNumber, releatsTo: var2 } AS this
+----
+
+== should return node with no relationship (edge) in result set, as Relay connection
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  programmeItems {
+    productTitle
+    episodeNumber
+    releatsToConnection {
+      edges {
+        node {
+          ... on ProgrammeItem {
+            productTitle
+          }
+          ... on Season {
+            productTitle
+          }
+          ... on Series {
+            productTitle
+          }
+        }
+      }
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:ProgrammeItem)
+CALL {
+    WITH this
+    CALL {
+        WITH this
+        MATCH (this)-[this0:RELATES_TO]-(this1:ProgrammeItem)
+        WITH { node: { __typename: "ProgrammeItem", __id: toString(id(this1)), productTitle: this1.productTitle } } AS edge
+        RETURN edge
+        UNION
+        WITH this
+        MATCH (this)-[this2:RELATES_TO]-(this3:Season)
+        WITH { node: { __typename: "Season", __id: toString(id(this3)), productTitle: this3.productTitle } } AS edge
+        RETURN edge
+        UNION
+        WITH this
+        MATCH (this)-[this4:RELATES_TO]-(this5:Series)
+        WITH { node: { __typename: "Series", __id: toString(id(this5)), productTitle: this5.productTitle } } AS edge
+        RETURN edge
+    }
+    WITH collect(edge) AS edges
+    WITH edges, size(edges) AS totalCount
+    RETURN { edges: edges, totalCount: totalCount } AS var6
+}
+RETURN this { .productTitle, .episodeNumber, releatsToConnection: var6 } AS this
+----
diff --git a/core/src/test/resources/tck-test-files/cypher/v2/issues/1687.adoc b/core/src/test/resources/tck-test-files/cypher/v2/issues/1687.adoc
index 0c2c5f10..2ea7a7c0 100644
--- a/core/src/test/resources/tck-test-files/cypher/v2/issues/1687.adoc
+++ b/core/src/test/resources/tck-test-files/cypher/v2/issues/1687.adoc
@@ -29,7 +29,7 @@ type Genre {
 == should be able to return all the genres related to the Matrix movie using connection fields
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query Genres {
   genres(where: {moviesConnection_ALL: {node: {title: "Matrix"}}}) {
@@ -64,6 +64,3 @@ RETURN this {
 	.name
 } AS this
 ----
-
-'''
-
diff --git a/core/src/test/resources/tck-test-files/cypher/v2/issues/1687.js.adoc b/core/src/test/resources/tck-test-files/cypher/v2/issues/1687.js.adoc
new file mode 100644
index 00000000..f937b347
--- /dev/null
+++ b/core/src/test/resources/tck-test-files/cypher/v2/issues/1687.js.adoc
@@ -0,0 +1,62 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= https://github.com/neo4j/graphql/issues/1687
+
+== Setup
+
+.Schema
+[source,graphql,schema=true]
+----
+interface Production {
+  id: ID
+  title: String
+}
+
+type Movie implements Production {
+  id: ID
+  title: String
+  actorCount: Int
+  genres: [Genre!]! @relationship(type: "HAS_GENRE", direction: OUT)
+}
+
+type Genre {
+  name: String
+  movies: [Production!]! @relationship(type: "HAS_GENRE", direction: IN)
+}
+----
+
+== should be able to return all the genres related to the Matrix movie using connection fields
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+query Genres {
+  genres(where: {moviesConnection_ALL: {node: {title: "Matrix"}}}) {
+    name
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "Matrix"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Genre)
+WHERE (EXISTS {
+    MATCH (this)<-[this0:HAS_GENRE]-(this1)
+    WHERE (this1.title = $param0 AND this1:Movie)
+} AND NOT (EXISTS {
+    MATCH (this)<-[this0:HAS_GENRE]-(this1)
+    WHERE NOT (this1.title = $param0 AND this1:Movie)
+}))
+RETURN this { .name } AS this
+----
diff --git a/core/src/test/resources/tck-test-files/cypher/v2/issues/1779.adoc b/core/src/test/resources/tck-test-files/cypher/v2/issues/1779.adoc
index 312aca3e..66f33db4 100644
--- a/core/src/test/resources/tck-test-files/cypher/v2/issues/1779.adoc
+++ b/core/src/test/resources/tck-test-files/cypher/v2/issues/1779.adoc
@@ -23,7 +23,7 @@ type School {
 == EXISTS should not be within return clause
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   people {
@@ -68,6 +68,3 @@ RETURN this {
 	attends: attends
 } AS this
 ----
-
-'''
-
diff --git a/core/src/test/resources/tck-test-files/cypher/v2/issues/1779.js.adoc b/core/src/test/resources/tck-test-files/cypher/v2/issues/1779.js.adoc
new file mode 100644
index 00000000..1cdd5d0d
--- /dev/null
+++ b/core/src/test/resources/tck-test-files/cypher/v2/issues/1779.js.adoc
@@ -0,0 +1,65 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= https://github.com/neo4j/graphql/issues/1779
+
+== Setup
+
+.Schema
+[source,graphql,schema=true]
+----
+type Person {
+  name: String
+  age: Int
+  attends: [School!]! @relationship(type: "attends", direction: OUT)
+}
+
+type School {
+  name: String
+  students: [Person!]! @relationship(type: "attends", direction: IN)
+}
+----
+
+== EXISTS should not be within return clause
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  people {
+    name
+    attends(where: {students_ALL: {age_GT: 23}}) {
+      name
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": 23
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Person)
+CALL {
+    WITH this
+    MATCH (this)-[this0:attends]->(this1:School)
+    WHERE (EXISTS {
+        MATCH (this1)<-[:attends]-(this2:Person)
+        WHERE this2.age > $param0
+    } AND NOT (EXISTS {
+        MATCH (this1)<-[:attends]-(this2:Person)
+        WHERE NOT (this2.age > $param0)
+    }))
+    WITH this1 { .name } AS this1
+    RETURN collect(this1) AS var3
+}
+RETURN this { .name, attends: var3 } AS this
+----
diff --git a/core/src/test/resources/tck-test-files/cypher/v2/issues/2262.adoc b/core/src/test/resources/tck-test-files/cypher/v2/issues/2262.adoc
index e648baa2..ba4c081c 100644
--- a/core/src/test/resources/tck-test-files/cypher/v2/issues/2262.adoc
+++ b/core/src/test/resources/tck-test-files/cypher/v2/issues/2262.adoc
@@ -24,7 +24,7 @@ type Process {
 == query nested relations under a root connection field
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query ComponentsProcesses {
   components(where: {uuid: "c1"}) {
@@ -114,6 +114,3 @@ RETURN this {
 	upstreamProcessConnection: upstreamProcessConnection
 } AS this
 ----
-
-'''
-
diff --git a/core/src/test/resources/tck-test-files/cypher/v2/issues/2262.js.adoc b/core/src/test/resources/tck-test-files/cypher/v2/issues/2262.js.adoc
new file mode 100644
index 00000000..8802c852
--- /dev/null
+++ b/core/src/test/resources/tck-test-files/cypher/v2/issues/2262.js.adoc
@@ -0,0 +1,93 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= https://github.com/neo4j/graphql/issues/2262
+
+== Setup
+
+.Schema
+[source,graphql,schema=true]
+----
+type Component {
+  uuid: String
+  upstreamProcess: Process @relationship(type: "OUTPUT", direction: IN)
+  downstreamProcesses: [Process!]! @relationship(type: "INPUT", direction: OUT)
+}
+
+type Process {
+  uuid: String
+  componentOutputs: [Component!]! @relationship(type: "OUTPUT", direction: OUT)
+  componentInputs: [Component!]! @relationship(type: "INPUT", direction: IN)
+}
+----
+
+== query nested relations under a root connection field
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+query ComponentsProcesses {
+  components(where: {uuid: "c1"}) {
+    uuid
+    upstreamProcessConnection {
+      edges {
+        node {
+          uuid
+          componentInputsConnection(sort: [{node: {uuid: DESC}}]) {
+            edges {
+              node {
+                uuid
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "c1"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Component)
+WHERE this.uuid = $param0
+CALL {
+    WITH this
+    MATCH (this)<-[this0:OUTPUT]-(this1:Process)
+    WITH collect({ node: this1, relationship: this0 }) AS edges
+    WITH edges, size(edges) AS totalCount
+    CALL {
+        WITH edges
+        UNWIND edges AS edge
+        WITH edge.node AS this1, edge.relationship AS this0
+        CALL {
+            WITH this1
+            MATCH (this1)<-[this2:INPUT]-(this3:Component)
+            WITH collect({ node: this3, relationship: this2 }) AS edges
+            WITH edges, size(edges) AS totalCount
+            CALL {
+                WITH edges
+                UNWIND edges AS edge
+                WITH edge.node AS this3, edge.relationship AS this2
+                WITH *
+                ORDER BY this3.uuid DESC
+                RETURN collect({ node: { uuid: this3.uuid, __typename: "Component" } }) AS var4
+            }
+            RETURN { edges: var4, totalCount: totalCount } AS var5
+        }
+        RETURN collect({ node: { uuid: this1.uuid, componentInputsConnection: var5, __typename: "Process" } }) AS var6
+    }
+    RETURN { edges: var6, totalCount: totalCount } AS var7
+}
+RETURN this { .uuid, upstreamProcessConnection: var7 } AS this
+----
diff --git a/core/src/test/resources/tck-test-files/cypher/v2/issues/2614.adoc b/core/src/test/resources/tck-test-files/cypher/v2/issues/2614.adoc
index 379a2dd6..35f79a03 100644
--- a/core/src/test/resources/tck-test-files/cypher/v2/issues/2614.adoc
+++ b/core/src/test/resources/tck-test-files/cypher/v2/issues/2614.adoc
@@ -38,7 +38,7 @@ type Actor {
 == should use the provided node directive label in the call subquery
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query GetProductionsMovie {
   actors {
@@ -91,6 +91,3 @@ RETURN this {
 	actedIn: actedIn
 } AS this
 ----
-
-'''
-
diff --git a/core/src/test/resources/tck-test-files/cypher/v2/issues/2614.js.adoc b/core/src/test/resources/tck-test-files/cypher/v2/issues/2614.js.adoc
new file mode 100644
index 00000000..82ab093e
--- /dev/null
+++ b/core/src/test/resources/tck-test-files/cypher/v2/issues/2614.js.adoc
@@ -0,0 +1,85 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= https://github.com/neo4j/graphql/issues/2614
+
+== Setup
+
+.Schema
+[source,graphql,schema=true]
+----
+interface Production {
+  title: String!
+  actors: [Actor!]!
+}
+
+type Movie implements Production @node(labels: ["Film"]) {
+  title: String!
+  actors: [Actor!]! @relationship(type: "ACTED_IN", direction: IN, properties: "ActedIn")
+  runtime: Int!
+}
+
+type Series implements Production {
+  title: String!
+  actors: [Actor!]! @relationship(type: "ACTED_IN", direction: IN, properties: "ActedIn")
+  episodes: Int!
+}
+
+type ActedIn @relationshipProperties {
+  role: String!
+}
+
+type Actor {
+  name: String!
+  actedIn: [Production!]! @relationship(type: "ACTED_IN", direction: OUT, properties: "ActedIn")
+}
+----
+
+== should use the provided node directive label in the call subquery
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+query GetProductionsMovie {
+  actors {
+    actedIn(where: {title: "Test Movie"}) {
+      title
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "Test Movie",
+  "param1": "Test Movie"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Actor)
+CALL {
+    WITH this
+    CALL {
+        WITH *
+        MATCH (this)-[this0:ACTED_IN]->(this1:Film)
+        WHERE this1.title = $param0
+        WITH this1 { .title, __typename: "Movie", __id: toString(id(this1)) } AS this1
+        RETURN this1 AS var2
+        UNION
+        WITH *
+        MATCH (this)-[this3:ACTED_IN]->(this4:Series)
+        WHERE this4.title = $param1
+        WITH this4 { .title, __typename: "Series", __id: toString(id(this4)) } AS this4
+        RETURN this4 AS var2
+    }
+    WITH var2
+    RETURN collect(var2) AS var2
+}
+RETURN this { actedIn: var2 } AS this
+----
diff --git a/core/src/test/resources/tck-test-files/cypher/v2/issues/2713.adoc b/core/src/test/resources/tck-test-files/cypher/v2/issues/2713.adoc
index df61b56e..adb00fea 100644
--- a/core/src/test/resources/tck-test-files/cypher/v2/issues/2713.adoc
+++ b/core/src/test/resources/tck-test-files/cypher/v2/issues/2713.adoc
@@ -32,7 +32,7 @@ type InGenre @relationshipProperties {
 == should not find genresConnection_ALL by genre title
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies(where: {genresConnection_ALL: {node: {name: "Thriller"}}}) {
@@ -65,6 +65,3 @@ RETURN this {
 	.title
 } AS this
 ----
-
-'''
-
diff --git a/core/src/test/resources/tck-test-files/cypher/v2/issues/2713.js.adoc b/core/src/test/resources/tck-test-files/cypher/v2/issues/2713.js.adoc
new file mode 100644
index 00000000..2ea749d6
--- /dev/null
+++ b/core/src/test/resources/tck-test-files/cypher/v2/issues/2713.js.adoc
@@ -0,0 +1,65 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= https://github.com/neo4j/graphql/issues/2713
+
+== Setup
+
+.Schema
+[source,graphql,schema=true]
+----
+type Movie {
+  title: String
+  genres: [Genre!]! @relationship(type: "IN_GENRE", direction: OUT, properties: "InGenre")
+}
+
+type Genre {
+  name: String
+  movies: [Movie!]! @relationship(type: "IN_GENRE", direction: IN, properties: "InGenre")
+  series: [Series!]! @relationship(type: "IN_GENRE", direction: IN, properties: "InGenre")
+}
+
+type Series {
+  name: String!
+  genres: [Genre!]! @relationship(type: "IN_GENRE", direction: OUT, properties: "InGenre")
+}
+
+type InGenre @relationshipProperties {
+  intValue: Int!
+}
+----
+
+== should not find genresConnection_ALL by genre title
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies(where: {genresConnection_ALL: {node: {name: "Thriller"}}}) {
+    title
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "Thriller"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE (EXISTS {
+    MATCH (this)-[this0:IN_GENRE]->(this1:Genre)
+    WHERE this1.name = $param0
+} AND NOT (EXISTS {
+    MATCH (this)-[this0:IN_GENRE]->(this1:Genre)
+    WHERE NOT (this1.name = $param0)
+}))
+RETURN this { .title } AS this
+----
diff --git a/core/src/test/resources/tck-test-files/cypher/v2/issues/2925.adoc b/core/src/test/resources/tck-test-files/cypher/v2/issues/2925.adoc
index e1ea3ca0..ed5c9216 100644
--- a/core/src/test/resources/tck-test-files/cypher/v2/issues/2925.adoc
+++ b/core/src/test/resources/tck-test-files/cypher/v2/issues/2925.adoc
@@ -24,7 +24,7 @@ type User {
 == should query relationship
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query Query {
   users(where: {hasGroup: {name_IN: ["Group A"]}}) {
@@ -54,12 +54,10 @@ RETURN this {
 } AS this
 ----
 
-'''
-
 == should query required relationship
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query Query {
   users(where: {hasRequiredGroup: {name_IN: ["Group A"]}}) {
@@ -88,6 +86,3 @@ RETURN this {
 	.name
 } AS this
 ----
-
-'''
-
diff --git a/core/src/test/resources/tck-test-files/cypher/v2/issues/2925.js.adoc b/core/src/test/resources/tck-test-files/cypher/v2/issues/2925.js.adoc
new file mode 100644
index 00000000..f13c0938
--- /dev/null
+++ b/core/src/test/resources/tck-test-files/cypher/v2/issues/2925.js.adoc
@@ -0,0 +1,86 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= https://github.com/neo4j/graphql/issues/2925
+
+== Setup
+
+.Schema
+[source,graphql,schema=true]
+----
+type Group {
+  name: String
+  hasGroupUser: [User!]! @relationship(type: "HAS_GROUP", direction: IN)
+  hasRequiredGroupUser: [User!]! @relationship(type: "HAS_REQUIRED_GROUP", direction: IN)
+}
+
+type User {
+  name: String
+  hasGroup: Group @relationship(type: "HAS_GROUP", direction: OUT)
+  hasRequiredGroup: Group! @relationship(type: "HAS_REQUIRED_GROUP", direction: OUT)
+}
+----
+
+== should query relationship
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+query Query {
+  users(where: {hasGroup: {name_IN: ["Group A"]}}) {
+    name
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": [
+    "Group A"
+  ]
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:User)
+WHERE single(this0 IN [(this)-[:HAS_GROUP]->(this0:Group) WHERE this0.name IN $param0 | 1] WHERE true)
+RETURN this { .name } AS this
+----
+
+== should query required relationship
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+query Query {
+  users(where: {hasRequiredGroup: {name_IN: ["Group A"]}}) {
+    name
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": [
+    "Group A"
+  ]
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:User)
+OPTIONAL MATCH (this)-[:HAS_REQUIRED_GROUP]->(this0:Group)
+WITH *, count(this0) AS hasRequiredGroupCount
+WITH *
+WHERE (hasRequiredGroupCount <> 0 AND this0.name IN $param0)
+RETURN this { .name } AS this
+----
diff --git a/core/src/test/resources/tck-test-files/cypher/v2/issues/3215.adoc b/core/src/test/resources/tck-test-files/cypher/v2/issues/3215.adoc
index 276dcd52..defc7148 100644
--- a/core/src/test/resources/tck-test-files/cypher/v2/issues/3215.adoc
+++ b/core/src/test/resources/tck-test-files/cypher/v2/issues/3215.adoc
@@ -19,7 +19,7 @@ type Actor {
 === should ignore undefined parameters on boolean NOT
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query MyQuery($name: String) {
   actors(where: {age_GT: 25, NOT: {name: $name}}) {
@@ -47,6 +47,3 @@ RETURN this {
 	.age
 } AS this
 ----
-
-'''
-
diff --git a/core/src/test/resources/tck-test-files/cypher/v2/issues/3215.js.adoc b/core/src/test/resources/tck-test-files/cypher/v2/issues/3215.js.adoc
new file mode 100644
index 00000000..14273ee8
--- /dev/null
+++ b/core/src/test/resources/tck-test-files/cypher/v2/issues/3215.js.adoc
@@ -0,0 +1,47 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= https://github.com/neo4j/graphql/issues/3215
+
+== union
+
+=== Setup
+
+.Schema
+[source,graphql,schema=true]
+----
+type Actor {
+  name: String!
+  age: Int!
+}
+----
+
+=== should ignore undefined parameters on boolean NOT
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+query MyQuery($name: String) {
+  actors(where: {age_GT: 25, NOT: {name: $name}}) {
+    name
+    age
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": 25
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Actor)
+WHERE this.age > $param0
+RETURN this { .name, .age } AS this
+----
diff --git a/core/src/test/resources/tck-test-files/cypher/v2/issues/3394.adoc b/core/src/test/resources/tck-test-files/cypher/v2/issues/3394.adoc
index 0bf21d9d..badfcc30 100644
--- a/core/src/test/resources/tck-test-files/cypher/v2/issues/3394.adoc
+++ b/core/src/test/resources/tck-test-files/cypher/v2/issues/3394.adoc
@@ -22,7 +22,7 @@ type Product {
 == should sort by aliased field
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query listProducts {
   products(options: {sort: {partNumber: DESC}}) {
@@ -51,12 +51,10 @@ RETURN this {
 } AS this
 ----
 
-'''
-
 == should sort by aliased field in relationship
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query listProducts {
   employees {
@@ -94,14 +92,12 @@ RETURN this {
 } AS this
 ----
 
-'''
-
 == Connection sort
 
 === should sort by aliased field in connection
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query listProducts {
   productsConnection(sort: {partNumber: DESC}) {
@@ -150,12 +146,10 @@ RETURN {
 } AS this
 ----
 
-'''
-
 === should sort by aliased field in nested connection
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query listProducts {
   employees {
@@ -212,6 +206,3 @@ RETURN this {
 	productsConnection: productsConnection
 } AS this
 ----
-
-'''
-
diff --git a/core/src/test/resources/tck-test-files/cypher/v2/issues/3394.js.adoc b/core/src/test/resources/tck-test-files/cypher/v2/issues/3394.js.adoc
new file mode 100644
index 00000000..1fb9d97a
--- /dev/null
+++ b/core/src/test/resources/tck-test-files/cypher/v2/issues/3394.js.adoc
@@ -0,0 +1,177 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= https://github.com/neo4j/graphql/issues/3394
+
+== Setup
+
+.Schema
+[source,graphql,schema=true]
+----
+type Employee {
+  products: [Product!]! @relationship(type: "CAN_ACCESS", direction: OUT)
+}
+
+type Product {
+  id: String! @alias(property: "fg_item_id")
+  description: String!
+  partNumber: ID! @alias(property: "fg_item")
+}
+----
+
+== should sort by aliased field
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+query listProducts {
+  products(options: {sort: {partNumber: DESC}}) {
+    id
+    partNumber
+    description
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Product)
+WITH *
+ORDER BY this.fg_item DESC
+RETURN this { .description, id: this.fg_item_id, partNumber: this.fg_item } AS this
+----
+
+== should sort by aliased field in relationship
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+query listProducts {
+  employees {
+    products(options: {sort: {partNumber: DESC}}) {
+      id
+      partNumber
+      description
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Employee)
+CALL {
+    WITH this
+    MATCH (this)-[this0:CAN_ACCESS]->(this1:Product)
+    WITH this1 { .description, id: this1.fg_item_id, partNumber: this1.fg_item } AS this1
+    ORDER BY this1.partNumber DESC
+    RETURN collect(this1) AS var2
+}
+RETURN this { products: var2 } AS this
+----
+
+== Connection sort
+
+=== should sort by aliased field in connection
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+query listProducts {
+  productsConnection(sort: {partNumber: DESC}) {
+    edges {
+      node {
+        id
+        partNumber
+        description
+      }
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this0:Product)
+WITH collect({ node: this0 }) AS edges
+WITH edges, size(edges) AS totalCount
+CALL {
+    WITH edges
+    UNWIND edges AS edge
+    WITH edge.node AS this0
+    WITH *
+    ORDER BY this0.fg_item DESC
+    RETURN collect({ node: { id: this0.fg_item_id, partNumber: this0.fg_item, description: this0.description, __typename: "Product" } }) AS var1
+}
+RETURN { edges: var1, totalCount: totalCount } AS this
+----
+
+=== should sort by aliased field in nested connection
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+query listProducts {
+  employees {
+    productsConnection(sort: {node: {partNumber: DESC}}) {
+      edges {
+        node {
+          id
+          partNumber
+          description
+        }
+      }
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Employee)
+CALL {
+    WITH this
+    MATCH (this)-[this0:CAN_ACCESS]->(this1:Product)
+    WITH collect({ node: this1, relationship: this0 }) AS edges
+    WITH edges, size(edges) AS totalCount
+    CALL {
+        WITH edges
+        UNWIND edges AS edge
+        WITH edge.node AS this1, edge.relationship AS this0
+        WITH *
+        ORDER BY this1.fg_item DESC
+        RETURN collect({ node: { id: this1.fg_item_id, partNumber: this1.fg_item, description: this1.description, __typename: "Product" } }) AS var2
+    }
+    RETURN { edges: var2, totalCount: totalCount } AS var3
+}
+RETURN this { productsConnection: var3 } AS this
+----
diff --git a/core/src/test/resources/tck-test-files/cypher/v2/issues/360.adoc b/core/src/test/resources/tck-test-files/cypher/v2/issues/360.adoc
index 8d5e5141..eda373ab 100644
--- a/core/src/test/resources/tck-test-files/cypher/v2/issues/360.adoc
+++ b/core/src/test/resources/tck-test-files/cypher/v2/issues/360.adoc
@@ -20,7 +20,7 @@ type Event {
 == Should exclude undefined members in AND
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query ($rangeStart: DateTime, $rangeEnd: DateTime, $activity: String) {
   events(
@@ -36,8 +36,8 @@ query ($rangeStart: DateTime, $rangeEnd: DateTime, $activity: String) {
 [source,json,request=true]
 ----
 {
-  "rangeStart": "2021-07-18T00:00:00+0100",
-  "rangeEnd": "2021-07-18T23:59:59+0100"
+  "rangeEnd" : "2021-07-18T23:59:59+0100",
+  "rangeStart" : "2021-07-18T00:00:00+0100"
 }
 ----
 
@@ -62,12 +62,10 @@ RETURN this {
 } AS this
 ----
 
-'''
-
 == Should exclude undefined members in OR
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query ($rangeStart: DateTime, $rangeEnd: DateTime, $activity: String) {
   events(
@@ -83,8 +81,8 @@ query ($rangeStart: DateTime, $rangeEnd: DateTime, $activity: String) {
 [source,json,request=true]
 ----
 {
-  "rangeStart": "2021-07-18T00:00:00+0100",
-  "rangeEnd": "2021-07-18T23:59:59+0100"
+  "rangeEnd" : "2021-07-18T23:59:59+0100",
+  "rangeStart" : "2021-07-18T00:00:00+0100"
 }
 ----
 
@@ -108,6 +106,3 @@ RETURN this {
 	.activity
 } AS this
 ----
-
-'''
-
diff --git a/core/src/test/resources/tck-test-files/cypher/v2/issues/360.js.adoc b/core/src/test/resources/tck-test-files/cypher/v2/issues/360.js.adoc
new file mode 100644
index 00000000..6709d741
--- /dev/null
+++ b/core/src/test/resources/tck-test-files/cypher/v2/issues/360.js.adoc
@@ -0,0 +1,101 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= #360
+
+== Setup
+
+.Schema
+[source,graphql,schema=true]
+----
+type Event {
+  id: ID!
+  name: String
+  start: DateTime
+  end: DateTime
+  activity: String
+}
+----
+
+== Should exclude undefined members in AND
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+query ($rangeStart: DateTime, $rangeEnd: DateTime, $activity: String) {
+  events(
+    where: {AND: [{start_GTE: $rangeStart}, {start_LTE: $rangeEnd}, {activity: $activity}]}
+  ) {
+    start
+    activity
+  }
+}
+----
+
+.GraphQL params input
+[source,json,request=true]
+----
+{
+  "rangeStart": "2021-07-18T00:00:00+0100",
+  "rangeEnd": "2021-07-18T23:59:59+0100"
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "2021-07-17T23:00:00Z",
+  "param1": "2021-07-18T22:59:59Z"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Event)
+WHERE (this.start >= $param0 AND this.start <= $param1)
+RETURN this { .activity, start: apoc.date.convertFormat(toString(this.start), "iso_zoned_date_time", "iso_offset_date_time") } AS this
+----
+
+== Should exclude undefined members in OR
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+query ($rangeStart: DateTime, $rangeEnd: DateTime, $activity: String) {
+  events(
+    where: {OR: [{start_GTE: $rangeStart}, {start_LTE: $rangeEnd}, {activity: $activity}]}
+  ) {
+    start
+    activity
+  }
+}
+----
+
+.GraphQL params input
+[source,json,request=true]
+----
+{
+  "rangeStart": "2021-07-18T00:00:00+0100",
+  "rangeEnd": "2021-07-18T23:59:59+0100"
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "2021-07-17T23:00:00Z",
+  "param1": "2021-07-18T22:59:59Z"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Event)
+WHERE (this.start >= $param0 OR this.start <= $param1)
+RETURN this { .activity, start: apoc.date.convertFormat(toString(this.start), "iso_zoned_date_time", "iso_offset_date_time") } AS this
+----
diff --git a/core/src/test/resources/tck-test-files/cypher/v2/issues/3765.adoc b/core/src/test/resources/tck-test-files/cypher/v2/issues/3765.adoc
index cbfd0a0e..92e92f2d 100644
--- a/core/src/test/resources/tck-test-files/cypher/v2/issues/3765.adoc
+++ b/core/src/test/resources/tck-test-files/cypher/v2/issues/3765.adoc
@@ -29,7 +29,7 @@ type likesProperties @relationshipProperties {
 === implicit AND
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   posts(where: {content: "stuff", alternateContent: "stuff2"}) {
@@ -58,12 +58,10 @@ RETURN this {
 } AS this
 ----
 
-'''
-
 === explicit OR with an implicit AND
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   posts(
@@ -96,12 +94,10 @@ RETURN this {
 } AS this
 ----
 
-'''
-
 === explicit NOT with an implicit AND
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   posts(where: {NOT: {content: "stuff", alternateContent: "stuff2"}}) {
@@ -130,14 +126,12 @@ RETURN this {
 } AS this
 ----
 
-'''
-
 == relationship filters
 
 === implicit AND  inside relationship filter
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   posts(where: {likes_SOME: {name: "stuff", otherName: "stuff2"}}) {
@@ -169,12 +163,10 @@ RETURN this {
 } AS this
 ----
 
-'''
-
 === implicit AND outside relationship filters
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   posts(where: {likes_SOME: {name: "stuff"}, likes_ALL: {otherName: "stuff2"}}) {
@@ -213,12 +205,10 @@ RETURN this {
 } AS this
 ----
 
-'''
-
 === explicit OR outside relationship filters
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   posts(
@@ -263,6 +253,3 @@ RETURN this {
 	.content
 } AS this
 ----
-
-'''
-
diff --git a/core/src/test/resources/tck-test-files/cypher/v2/issues/3765.js.adoc b/core/src/test/resources/tck-test-files/cypher/v2/issues/3765.js.adoc
new file mode 100644
index 00000000..b439c10d
--- /dev/null
+++ b/core/src/test/resources/tck-test-files/cypher/v2/issues/3765.js.adoc
@@ -0,0 +1,234 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= https://github.com/neo4j/graphql/issues/3765
+
+== Setup
+
+.Schema
+[source,graphql,schema=true]
+----
+type User {
+  name: String!
+  otherName: String
+}
+
+type Post {
+  content: String!
+  alternateContent: String!
+  likes: [User!]! @relationship(type: "LIKES", direction: IN, properties: "likesProperties")
+}
+
+type likesProperties @relationshipProperties {
+  someProp: String!
+}
+----
+
+== property filters
+
+=== implicit AND
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  posts(where: {content: "stuff", alternateContent: "stuff2"}) {
+    content
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "stuff",
+  "param1": "stuff2"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Post)
+WHERE (this.content = $param0 AND this.alternateContent = $param1)
+RETURN this { .content } AS this
+----
+
+=== explicit OR with an implicit AND
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  posts(
+    where: {OR: [{content: "stuff", alternateContent: "stuff2"}, {content: "stuff3"}]}
+  ) {
+    content
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "stuff",
+  "param1": "stuff2",
+  "param2": "stuff3"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Post)
+WHERE ((this.content = $param0 AND this.alternateContent = $param1) OR this.content = $param2)
+RETURN this { .content } AS this
+----
+
+=== explicit NOT with an implicit AND
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  posts(where: {NOT: {content: "stuff", alternateContent: "stuff2"}}) {
+    content
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "stuff",
+  "param1": "stuff2"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Post)
+WHERE NOT (this.content = $param0 AND this.alternateContent = $param1)
+RETURN this { .content } AS this
+----
+
+== relationship filters
+
+=== implicit AND  inside relationship filter
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  posts(where: {likes_SOME: {name: "stuff", otherName: "stuff2"}}) {
+    content
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "stuff",
+  "param1": "stuff2"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Post)
+WHERE EXISTS {
+    MATCH (this)<-[:LIKES]-(this0:User)
+    WHERE (this0.name = $param0 AND this0.otherName = $param1)
+}
+RETURN this { .content } AS this
+----
+
+=== implicit AND outside relationship filters
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  posts(where: {likes_SOME: {name: "stuff"}, likes_ALL: {otherName: "stuff2"}}) {
+    content
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "stuff2",
+  "param1": "stuff"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Post)
+WHERE ((EXISTS {
+    MATCH (this)<-[:LIKES]-(this0:User)
+    WHERE this0.otherName = $param0
+} AND NOT (EXISTS {
+    MATCH (this)<-[:LIKES]-(this0:User)
+    WHERE NOT (this0.otherName = $param0)
+})) AND EXISTS {
+    MATCH (this)<-[:LIKES]-(this1:User)
+    WHERE this1.name = $param1
+})
+RETURN this { .content } AS this
+----
+
+=== explicit OR outside relationship filters
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  posts(
+    where: {OR: [{likes_SOME: {name: "stuff"}}, {likes_ALL: {otherName: "stuff2"}}, {likes_SOME: {otherName: "stuff3"}}]}
+  ) {
+    content
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "stuff",
+  "param1": "stuff2",
+  "param2": "stuff3"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Post)
+WHERE (EXISTS {
+    MATCH (this)<-[:LIKES]-(this0:User)
+    WHERE this0.name = $param0
+} OR (EXISTS {
+    MATCH (this)<-[:LIKES]-(this1:User)
+    WHERE this1.otherName = $param1
+} AND NOT (EXISTS {
+    MATCH (this)<-[:LIKES]-(this1:User)
+    WHERE NOT (this1.otherName = $param1)
+})) OR EXISTS {
+    MATCH (this)<-[:LIKES]-(this2:User)
+    WHERE this2.otherName = $param2
+})
+RETURN this { .content } AS this
+----
diff --git a/core/src/test/resources/tck-test-files/cypher/v2/issues/4007.adoc b/core/src/test/resources/tck-test-files/cypher/v2/issues/4007.adoc
index f74a9dab..e8024df1 100644
--- a/core/src/test/resources/tck-test-files/cypher/v2/issues/4007.adoc
+++ b/core/src/test/resources/tck-test-files/cypher/v2/issues/4007.adoc
@@ -22,7 +22,7 @@ type Actor {
 == should return name from aliased selection
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   m: movies {
@@ -75,6 +75,3 @@ RETURN this {
 	t: t
 } AS this
 ----
-
-'''
-
diff --git a/core/src/test/resources/tck-test-files/cypher/v2/issues/4007.js.adoc b/core/src/test/resources/tck-test-files/cypher/v2/issues/4007.js.adoc
new file mode 100644
index 00000000..3fc38e1e
--- /dev/null
+++ b/core/src/test/resources/tck-test-files/cypher/v2/issues/4007.js.adoc
@@ -0,0 +1,65 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= https://github.com/neo4j/graphql/issues/4007
+
+== Setup
+
+.Schema
+[source,graphql,schema=true]
+----
+type Movie {
+  title: String!
+  actors: [Actor!]! @relationship(type: "ACTED_IN", direction: IN)
+}
+
+type Actor {
+  name: String!
+  movies: [Movie!]! @relationship(type: "ACTED_IN", direction: OUT)
+}
+----
+
+== should return name from aliased selection
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  m: movies {
+    t: actorsConnection {
+      e: edges {
+        n: node {
+          na: name
+        }
+      }
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+CALL {
+    WITH this
+    MATCH (this)<-[this0:ACTED_IN]-(this1:Actor)
+    WITH collect({ node: this1, relationship: this0 }) AS edges
+    WITH edges, size(edges) AS totalCount
+    CALL {
+        WITH edges
+        UNWIND edges AS edge
+        WITH edge.node AS this1, edge.relationship AS this0
+        RETURN collect({ node: { na: this1.name, __typename: "Actor" } }) AS var2
+    }
+    RETURN { edges: var2, totalCount: totalCount } AS var3
+}
+RETURN this { t: var3 } AS this
+----
diff --git a/core/src/test/resources/tck-test-files/cypher/v2/issues/4015.adoc b/core/src/test/resources/tck-test-files/cypher/v2/issues/4015.adoc
index f179b785..51f240f9 100644
--- a/core/src/test/resources/tck-test-files/cypher/v2/issues/4015.adoc
+++ b/core/src/test/resources/tck-test-files/cypher/v2/issues/4015.adoc
@@ -23,7 +23,7 @@ type Actor {
 == should return all the selected node fields
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies {
@@ -83,6 +83,3 @@ RETURN this {
 	actorsConnection: actorsConnection
 } AS this
 ----
-
-'''
-
diff --git a/core/src/test/resources/tck-test-files/cypher/v2/issues/4015.js.adoc b/core/src/test/resources/tck-test-files/cypher/v2/issues/4015.js.adoc
new file mode 100644
index 00000000..cba20e4b
--- /dev/null
+++ b/core/src/test/resources/tck-test-files/cypher/v2/issues/4015.js.adoc
@@ -0,0 +1,69 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= https://github.com/neo4j/graphql/issues/4015
+
+== Setup
+
+.Schema
+[source,graphql,schema=true]
+----
+type Movie {
+  title: String!
+  actors: [Actor!]! @relationship(type: "ACTED_IN", direction: IN)
+}
+
+type Actor {
+  name: String!
+  surname: String
+  movies: [Movie!]! @relationship(type: "ACTED_IN", direction: OUT)
+}
+----
+
+== should return all the selected node fields
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies {
+    actorsConnection {
+      edges {
+        node {
+          surname
+        }
+        no: node {
+          name
+        }
+      }
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+CALL {
+    WITH this
+    MATCH (this)<-[this0:ACTED_IN]-(this1:Actor)
+    WITH collect({ node: this1, relationship: this0 }) AS edges
+    WITH edges, size(edges) AS totalCount
+    CALL {
+        WITH edges
+        UNWIND edges AS edge
+        WITH edge.node AS this1, edge.relationship AS this0
+        RETURN collect({ node: { surname: this1.surname, name: this1.name, __typename: "Actor" } }) AS var2
+    }
+    RETURN { edges: var2, totalCount: totalCount } AS var3
+}
+RETURN this { actorsConnection: var3 } AS this
+----
diff --git a/core/src/test/resources/tck-test-files/cypher/v2/issues/402.adoc b/core/src/test/resources/tck-test-files/cypher/v2/issues/402.adoc
index daafbecd..5ada160c 100644
--- a/core/src/test/resources/tck-test-files/cypher/v2/issues/402.adoc
+++ b/core/src/test/resources/tck-test-files/cypher/v2/issues/402.adoc
@@ -21,7 +21,7 @@ type Area {
 == Should ignore the empty array and not include any where
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query ($area: [ID!]) {
   events(where: {area: {id_IN: $area}}) {
@@ -56,6 +56,3 @@ RETURN this {
 	area: area
 } AS this
 ----
-
-'''
-
diff --git a/core/src/test/resources/tck-test-files/cypher/v2/issues/402.js.adoc b/core/src/test/resources/tck-test-files/cypher/v2/issues/402.js.adoc
new file mode 100644
index 00000000..48a24ad9
--- /dev/null
+++ b/core/src/test/resources/tck-test-files/cypher/v2/issues/402.js.adoc
@@ -0,0 +1,54 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= #402
+
+== Setup
+
+.Schema
+[source,graphql,schema=true]
+----
+type Event {
+  id: ID!
+  area: Area! @relationship(type: "HAPPENS_IN", direction: OUT)
+}
+
+type Area {
+  id: ID!
+}
+----
+
+== Should ignore the empty array and not include any where
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+query ($area: [ID!]) {
+  events(where: {area: {id_IN: $area}}) {
+    id
+    area {
+      id
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Event)
+CALL {
+    WITH this
+    MATCH (this)-[this0:HAPPENS_IN]->(this1:Area)
+    WITH this1 { .id } AS this1
+    RETURN head(collect(this1)) AS var2
+}
+RETURN this { .id, area: var2 } AS this
+----
diff --git a/core/src/test/resources/tck-test-files/cypher/v2/issues/4287.adoc b/core/src/test/resources/tck-test-files/cypher/v2/issues/4287.adoc
index 9ea9cb55..ed05a6db 100644
--- a/core/src/test/resources/tck-test-files/cypher/v2/issues/4287.adoc
+++ b/core/src/test/resources/tck-test-files/cypher/v2/issues/4287.adoc
@@ -33,7 +33,7 @@ type Series implements Production {
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   actors {
@@ -105,6 +105,3 @@ RETURN this {
 	actedInConnection: actedInConnection
 } AS this
 ----
-
-'''
-
diff --git a/core/src/test/resources/tck-test-files/cypher/v2/issues/4287.js.adoc b/core/src/test/resources/tck-test-files/cypher/v2/issues/4287.js.adoc
new file mode 100644
index 00000000..db409b33
--- /dev/null
+++ b/core/src/test/resources/tck-test-files/cypher/v2/issues/4287.js.adoc
@@ -0,0 +1,90 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= https://github.com/neo4j/graphql/issues/4287
+
+== filter by logical operator on interface connection
+
+.Schema
+[source,graphql,schema=true]
+----
+type Actor {
+  name: String
+  actedIn: [Production!]! @relationship(type: "ACTED_IN", properties: "actedIn", direction: OUT)
+}
+
+type actedIn @relationshipProperties {
+  role: String
+}
+
+interface Production {
+  title: String
+}
+
+type Movie implements Production {
+  title: String
+  runtime: Int
+}
+
+type Series implements Production {
+  title: String
+  episodes: Int
+}
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  actors {
+    actedInConnection(
+      where: {OR: [{node: {title: "something"}}, {node: {title: "whatever"}}]}
+    ) {
+      edges {
+        node {
+          __typename
+          title
+        }
+      }
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "something",
+  "param1": "whatever",
+  "param2": "something",
+  "param3": "whatever"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Actor)
+CALL {
+    WITH this
+    CALL {
+        WITH this
+        MATCH (this)-[this0:ACTED_IN]->(this1:Movie)
+        WHERE (this1.title = $param0 OR this1.title = $param1)
+        WITH { node: { __typename: "Movie", __id: toString(id(this1)), title: this1.title } } AS edge
+        RETURN edge
+        UNION
+        WITH this
+        MATCH (this)-[this2:ACTED_IN]->(this3:Series)
+        WHERE (this3.title = $param2 OR this3.title = $param3)
+        WITH { node: { __typename: "Series", __id: toString(id(this3)), title: this3.title } } AS edge
+        RETURN edge
+    }
+    WITH collect(edge) AS edges
+    WITH edges, size(edges) AS totalCount
+    RETURN { edges: edges, totalCount: totalCount } AS var4
+}
+RETURN this { actedInConnection: var4 } AS this
+----
diff --git a/core/src/test/resources/tck-test-files/cypher/v2/issues/433.adoc b/core/src/test/resources/tck-test-files/cypher/v2/issues/433.adoc
index e7f467ea..d5fdaa51 100644
--- a/core/src/test/resources/tck-test-files/cypher/v2/issues/433.adoc
+++ b/core/src/test/resources/tck-test-files/cypher/v2/issues/433.adoc
@@ -21,7 +21,7 @@ type Person {
 == Should not add where keyword if empty where
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies {
@@ -76,6 +76,3 @@ RETURN this {
 	actorsConnection: actorsConnection
 } AS this
 ----
-
-'''
-
diff --git a/core/src/test/resources/tck-test-files/cypher/v2/issues/433.js.adoc b/core/src/test/resources/tck-test-files/cypher/v2/issues/433.js.adoc
new file mode 100644
index 00000000..5e0a1a63
--- /dev/null
+++ b/core/src/test/resources/tck-test-files/cypher/v2/issues/433.js.adoc
@@ -0,0 +1,65 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= #413
+
+== Setup
+
+.Schema
+[source,graphql,schema=true]
+----
+type Movie {
+  title: String
+  actors: [Person!]! @relationship(type: "ACTED_IN", direction: OUT)
+}
+
+type Person {
+  name: String
+}
+----
+
+== Should not add where keyword if empty where
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies {
+    title
+    actorsConnection(where: {}) {
+      edges {
+        node {
+          name
+        }
+      }
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+CALL {
+    WITH this
+    MATCH (this)-[this0:ACTED_IN]->(this1:Person)
+    WITH collect({ node: this1, relationship: this0 }) AS edges
+    WITH edges, size(edges) AS totalCount
+    CALL {
+        WITH edges
+        UNWIND edges AS edge
+        WITH edge.node AS this1, edge.relationship AS this0
+        RETURN collect({ node: { name: this1.name, __typename: "Person" } }) AS var2
+    }
+    RETURN { edges: var2, totalCount: totalCount } AS var3
+}
+RETURN this { .title, actorsConnection: var3 } AS this
+----
diff --git a/core/src/test/resources/tck-test-files/cypher/v2/issues/4432.adoc b/core/src/test/resources/tck-test-files/cypher/v2/issues/4432.adoc
index 40e459f9..043384ec 100644
--- a/core/src/test/resources/tck-test-files/cypher/v2/issues/4432.adoc
+++ b/core/src/test/resources/tck-test-files/cypher/v2/issues/4432.adoc
@@ -31,7 +31,7 @@ type InventoryChildRelation @relationshipProperties {
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   inventories {
@@ -110,6 +110,3 @@ RETURN this {
 	childrenConnection: childrenConnection
 } AS this
 ----
-
-'''
-
diff --git a/core/src/test/resources/tck-test-files/cypher/v2/issues/4432.js.adoc b/core/src/test/resources/tck-test-files/cypher/v2/issues/4432.js.adoc
new file mode 100644
index 00000000..309c04f9
--- /dev/null
+++ b/core/src/test/resources/tck-test-files/cypher/v2/issues/4432.js.adoc
@@ -0,0 +1,89 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= https://github.com/neo4j/graphql/issues/4532
+
+== connections to interfaces with sort
+
+.Schema
+[source,graphql,schema=true]
+----
+type Inventory {
+  id: ID
+  children: [Scenario!]! @relationship(type: "HasChildren", properties: "InventoryChildRelation", direction: OUT)
+}
+
+interface Scenario {
+  id: ID
+}
+
+type Image implements Scenario {
+  id: ID
+}
+
+type Video implements Scenario {
+  id: ID
+}
+
+type InventoryChildRelation @relationshipProperties {
+  order: Int
+}
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  inventories {
+    id
+    childrenConnection(sort: {edge: {order: ASC}}) {
+      edges {
+        properties {
+          order
+        }
+        node {
+          id
+        }
+      }
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Inventory)
+CALL {
+    WITH this
+    CALL {
+        WITH this
+        MATCH (this)-[this0:HasChildren]->(this1:Image)
+        WITH { properties: { order: this0.order, __typename: "InventoryChildRelation" }, node: { __typename: "Image", __id: toString(id(this1)), id: this1.id } } AS edge
+        RETURN edge
+        UNION
+        WITH this
+        MATCH (this)-[this2:HasChildren]->(this3:Video)
+        WITH { properties: { order: this2.order, __typename: "InventoryChildRelation" }, node: { __typename: "Video", __id: toString(id(this3)), id: this3.id } } AS edge
+        RETURN edge
+    }
+    WITH collect(edge) AS edges
+    WITH edges, size(edges) AS totalCount
+    CALL {
+        WITH edges
+        UNWIND edges AS edge
+        WITH edge
+        ORDER BY edge.properties.order ASC
+        RETURN collect(edge) AS var4
+    }
+    RETURN { edges: var4, totalCount: totalCount } AS var5
+}
+RETURN this { .id, childrenConnection: var5 } AS this
+----
diff --git a/core/src/test/resources/tck-test-files/cypher/v2/issues/4450.adoc b/core/src/test/resources/tck-test-files/cypher/v2/issues/4450.adoc
index a668f0aa..a30eba6c 100644
--- a/core/src/test/resources/tck-test-files/cypher/v2/issues/4450.adoc
+++ b/core/src/test/resources/tck-test-files/cypher/v2/issues/4450.adoc
@@ -30,7 +30,7 @@ type ActorScene @relationshipProperties {
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   actors(
@@ -66,6 +66,3 @@ RETURN this {
 	.name
 } AS this
 ----
-
-'''
-
diff --git a/core/src/test/resources/tck-test-files/cypher/v2/issues/4450.js.adoc b/core/src/test/resources/tck-test-files/cypher/v2/issues/4450.js.adoc
new file mode 100644
index 00000000..da6c1ee3
--- /dev/null
+++ b/core/src/test/resources/tck-test-files/cypher/v2/issues/4450.js.adoc
@@ -0,0 +1,70 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= https://github.com/neo4j/graphql/issues/4450
+
+== filtering through a connection to a many-to-1 relationship should work
+
+.Schema
+[source,graphql,schema=true]
+----
+type Actor {
+  name: String
+  scene: [Scene!]! @relationship(type: "IN_SCENE", properties: "ActorScene", direction: OUT)
+}
+
+type Scene {
+  number: Int
+  actors: [Actor!]! @relationship(type: "IN_SCENE", properties: "ActorScene", direction: IN)
+  location: Location! @relationship(type: "AT_LOCATION", direction: OUT)
+}
+
+type Location {
+  city: String
+  scenes: [Scene!]! @relationship(type: "AT_LOCATION", direction: IN)
+}
+
+type ActorScene @relationshipProperties {
+  cut: Boolean
+}
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  actors(
+    where: {sceneConnection_SOME: {edge: {cut: true}, node: {location: {city: "test"}}}}
+  ) {
+    name
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "test",
+  "param1": true
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Actor)
+CALL {
+    WITH this
+    MATCH (this)-[this0:IN_SCENE]->(this1:Scene)
+    OPTIONAL MATCH (this1)-[:AT_LOCATION]->(this2:Location)
+    WITH *, count(this2) AS locationCount
+    WITH *
+    WHERE ((locationCount <> 0 AND this2.city = $param0) AND this0.cut = $param1)
+    RETURN count(this1) > 0 AS var3
+}
+WITH *
+WHERE var3 = true
+RETURN this { .name } AS this
+----
diff --git a/core/src/test/resources/tck-test-files/cypher/v2/issues/4667.adoc b/core/src/test/resources/tck-test-files/cypher/v2/issues/4667.adoc
index 1b82dc9b..2b839096 100644
--- a/core/src/test/resources/tck-test-files/cypher/v2/issues/4667.adoc
+++ b/core/src/test/resources/tck-test-files/cypher/v2/issues/4667.adoc
@@ -20,7 +20,7 @@ type MyStuff {
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   myThings(where: {stuff: null}) {
@@ -46,6 +46,3 @@ RETURN this {
 	.id
 } AS this
 ----
-
-'''
-
diff --git a/core/src/test/resources/tck-test-files/cypher/v2/issues/4667.js.adoc b/core/src/test/resources/tck-test-files/cypher/v2/issues/4667.js.adoc
new file mode 100644
index 00000000..62062318
--- /dev/null
+++ b/core/src/test/resources/tck-test-files/cypher/v2/issues/4667.js.adoc
@@ -0,0 +1,47 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= https://github.com/neo4j/graphql/issues/4667
+
+== when passed null as an argument of a relationship filter should check that a relationship does not exist
+
+.Schema
+[source,graphql,schema=true]
+----
+type MyThing {
+  id: ID! @id
+  stuff: MyStuff @relationship(type: "THE_STUFF", direction: OUT)
+}
+
+type MyStuff {
+  id: ID! @id
+  thing: MyThing @relationship(type: "THE_STUFF", direction: IN)
+}
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  myThings(where: {stuff: null}) {
+    id
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:MyThing)
+WHERE NOT (EXISTS {
+    MATCH (this)-[:THE_STUFF]->(this0:MyStuff)
+})
+RETURN this { .id } AS this
+----
diff --git a/core/src/test/resources/tck-test-files/cypher/v2/issues/583.adoc b/core/src/test/resources/tck-test-files/cypher/v2/issues/583.adoc
index a3b175fc..6a35d05e 100644
--- a/core/src/test/resources/tck-test-files/cypher/v2/issues/583.adoc
+++ b/core/src/test/resources/tck-test-files/cypher/v2/issues/583.adoc
@@ -40,7 +40,7 @@ type ShortFilm implements Show {
 == Should resolve properties from common interface
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query shows {
   actors {
@@ -104,6 +104,3 @@ RETURN this {
 	actedIn: actedIn
 } AS this
 ----
-
-'''
-
diff --git a/core/src/test/resources/tck-test-files/cypher/v2/issues/583.js.adoc b/core/src/test/resources/tck-test-files/cypher/v2/issues/583.js.adoc
new file mode 100644
index 00000000..5e8548d3
--- /dev/null
+++ b/core/src/test/resources/tck-test-files/cypher/v2/issues/583.js.adoc
@@ -0,0 +1,92 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= https://github.com/neo4j/graphql/issues/583
+
+== Setup
+
+.Schema
+[source,graphql,schema=true]
+----
+interface Show {
+  title: String
+}
+
+interface Awardable {
+  awardsGiven: Int!
+}
+
+type Actor implements Awardable {
+  name: String
+  awardsGiven: Int!
+  actedIn: [Show!]! @relationship(type: "ACTED_IN", direction: OUT)
+}
+
+type Movie implements Show & Awardable {
+  title: String
+  awardsGiven: Int!
+}
+
+type Series implements Show & Awardable {
+  title: String
+  awardsGiven: Int!
+}
+
+type ShortFilm implements Show {
+  title: String
+}
+----
+
+== Should resolve properties from common interface
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+query shows {
+  actors {
+    name
+    __typename
+    actedIn {
+      title
+      ... on Awardable {
+        awardsGiven
+      }
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Actor)
+CALL {
+    WITH this
+    CALL {
+        WITH *
+        MATCH (this)-[this0:ACTED_IN]->(this1:Movie)
+        WITH this1 { .title, .awardsGiven, __typename: "Movie", __id: toString(id(this1)) } AS this1
+        RETURN this1 AS var2
+        UNION
+        WITH *
+        MATCH (this)-[this3:ACTED_IN]->(this4:Series)
+        WITH this4 { .title, .awardsGiven, __typename: "Series", __id: toString(id(this4)) } AS this4
+        RETURN this4 AS var2
+        UNION
+        WITH *
+        MATCH (this)-[this5:ACTED_IN]->(this6:ShortFilm)
+        WITH this6 { .title, __typename: "ShortFilm", __id: toString(id(this6)) } AS this6
+        RETURN this6 AS var2
+    }
+    WITH var2
+    RETURN collect(var2) AS var2
+}
+RETURN this { .name, actedIn: var2 } AS this
+----
diff --git a/core/src/test/resources/tck-test-files/cypher/v2/null.adoc b/core/src/test/resources/tck-test-files/cypher/v2/null.adoc
index 62d6ed8d..a0859563 100644
--- a/core/src/test/resources/tck-test-files/cypher/v2/null.adoc
+++ b/core/src/test/resources/tck-test-files/cypher/v2/null.adoc
@@ -24,7 +24,7 @@ type Movie {
 == Simple IS NULL
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies(where: {title: null}) {
@@ -48,6 +48,3 @@ RETURN this {
 	.title
 } AS this
 ----
-
-'''
-
diff --git a/core/src/test/resources/tck-test-files/cypher/v2/null.js.adoc b/core/src/test/resources/tck-test-files/cypher/v2/null.js.adoc
new file mode 100644
index 00000000..661e4ac3
--- /dev/null
+++ b/core/src/test/resources/tck-test-files/cypher/v2/null.js.adoc
@@ -0,0 +1,49 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= Cypher NULL
+
+== Setup
+
+.Schema
+[source,graphql,schema=true]
+----
+type Actor {
+  name: String
+  movies: [Movie!]! @relationship(type: "ACTED_IN", direction: OUT)
+}
+
+type Movie {
+  id: ID
+  title: String
+  actors: [Actor!]! @relationship(type: "ACTED_IN", direction: IN)
+  isFavorite: Boolean
+}
+----
+
+== Simple IS NULL
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies(where: {title: null}) {
+    title
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE this.title IS NULL
+RETURN this { .title } AS this
+----
diff --git a/core/src/test/resources/tck-test-files/cypher/v2/pagination.adoc b/core/src/test/resources/tck-test-files/cypher/v2/pagination.adoc
index 5ffcf28c..f56cd21f 100644
--- a/core/src/test/resources/tck-test-files/cypher/v2/pagination.adoc
+++ b/core/src/test/resources/tck-test-files/cypher/v2/pagination.adoc
@@ -17,7 +17,7 @@ type Movie {
 == Skipping
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies(options: {offset: 1}) {
@@ -44,12 +44,10 @@ RETURN this {
 } AS this
 ----
 
-'''
-
 == Limit
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies(options: {limit: 1}) {
@@ -76,12 +74,10 @@ RETURN this {
 } AS this
 ----
 
-'''
-
 == Skip + Limit
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies(options: {limit: 1, offset: 2}) {
@@ -109,12 +105,10 @@ RETURN this {
 } AS this
 ----
 
-'''
-
 == Skip + Limit as variables
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query ($offset: Int, $limit: Int) {
   movies(options: {limit: $limit, offset: $offset}) {
@@ -127,8 +121,8 @@ query ($offset: Int, $limit: Int) {
 [source,json,request=true]
 ----
 {
-  "offset": 0,
-  "limit": 0
+  "limit" : 0,
+  "offset" : 0
 }
 ----
 
@@ -151,12 +145,10 @@ RETURN this {
 } AS this
 ----
 
-'''
-
 == Skip + Limit with other variables
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query ($offset: Int, $limit: Int, $title: String) {
   movies(options: {limit: $limit, offset: $offset}, where: {title: $title}) {
@@ -169,9 +161,9 @@ query ($offset: Int, $limit: Int, $title: String) {
 [source,json,request=true]
 ----
 {
-  "limit": 1,
-  "offset": 2,
-  "title": "some title"
+  "limit" : 1,
+  "offset" : 2,
+  "title" : "some title"
 }
 ----
 
@@ -195,6 +187,3 @@ RETURN this {
 	.title
 } AS this
 ----
-
-'''
-
diff --git a/core/src/test/resources/tck-test-files/cypher/v2/pagination.js.adoc b/core/src/test/resources/tck-test-files/cypher/v2/pagination.js.adoc
new file mode 100644
index 00000000..2c852ea6
--- /dev/null
+++ b/core/src/test/resources/tck-test-files/cypher/v2/pagination.js.adoc
@@ -0,0 +1,193 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= Cypher pagination tests
+
+== Setup
+
+.Schema
+[source,graphql,schema=true]
+----
+type Movie {
+  id: ID
+  title: String
+}
+----
+
+== Skipping
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies(options: {offset: 1}) {
+    title
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": 1
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WITH *
+
+SKIP $param0
+RETURN this { .title } AS this
+----
+
+== Limit
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies(options: {limit: 1}) {
+    title
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": 1
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WITH *
+
+LIMIT $param0
+RETURN this { .title } AS this
+----
+
+== Skip + Limit
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies(options: {limit: 1, offset: 2}) {
+    title
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": 2,
+  "param1": 1
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WITH *
+
+SKIP $param0
+LIMIT $param1
+RETURN this { .title } AS this
+----
+
+== Skip + Limit as variables
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+query ($offset: Int, $limit: Int) {
+  movies(options: {limit: $limit, offset: $offset}) {
+    title
+  }
+}
+----
+
+.GraphQL params input
+[source,json,request=true]
+----
+{
+  "offset": 0,
+  "limit": 0
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": 0,
+  "param1": 0
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WITH *
+
+SKIP $param0
+LIMIT $param1
+RETURN this { .title } AS this
+----
+
+== Skip + Limit with other variables
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+query ($offset: Int, $limit: Int, $title: String) {
+  movies(options: {limit: $limit, offset: $offset}, where: {title: $title}) {
+    title
+  }
+}
+----
+
+.GraphQL params input
+[source,json,request=true]
+----
+{
+  "limit": 1,
+  "offset": 2,
+  "title": "some title"
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "some title",
+  "param1": 2,
+  "param2": 1
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE this.title = $param0
+WITH *
+
+SKIP $param1
+LIMIT $param2
+RETURN this { .title } AS this
+----
diff --git a/core/src/test/resources/tck-test-files/cypher/v2/rfcs/query-limits.adoc b/core/src/test/resources/tck-test-files/cypher/v2/rfcs/query-limits.adoc
index 0a1798c9..ffee324d 100644
--- a/core/src/test/resources/tck-test-files/cypher/v2/rfcs/query-limits.adoc
+++ b/core/src/test/resources/tck-test-files/cypher/v2/rfcs/query-limits.adoc
@@ -32,7 +32,7 @@ type Festival {
 === should limit the top level query with default value
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies {
@@ -59,12 +59,10 @@ RETURN this {
 } AS this
 ----
 
-'''
-
 === should limit the top level query with max value if not default is available
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   shows {
@@ -91,12 +89,10 @@ RETURN this {
 } AS this
 ----
 
-'''
-
 === should limit the top level query with max value the option given is higher
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   shows(options: {limit: 5}) {
@@ -123,14 +119,12 @@ RETURN this {
 } AS this
 ----
 
-'''
-
 == Field Level Query Limits
 
 === should limit the normal field level query
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies {
@@ -170,12 +164,10 @@ RETURN this {
 } AS this
 ----
 
-'''
-
 === should limit the connection field level query
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies {
@@ -235,12 +227,10 @@ RETURN this {
 } AS this
 ----
 
-'''
-
 === should extend the limit to the connection field if `first` provided
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies {
@@ -300,12 +290,10 @@ RETURN this {
 } AS this
 ----
 
-'''
-
 === should extend the limit to the connection field if `first` provided, honouring the `max` argument
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   festivals {
@@ -363,12 +351,10 @@ RETURN this {
 } AS this
 ----
 
-'''
-
 === should limit the relationship field level query
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies {
@@ -407,6 +393,3 @@ RETURN this {
 	actors: actors
 } AS this
 ----
-
-'''
-
diff --git a/core/src/test/resources/tck-test-files/cypher/v2/rfcs/query-limits.js.adoc b/core/src/test/resources/tck-test-files/cypher/v2/rfcs/query-limits.js.adoc
new file mode 100644
index 00000000..79e260af
--- /dev/null
+++ b/core/src/test/resources/tck-test-files/cypher/v2/rfcs/query-limits.js.adoc
@@ -0,0 +1,365 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= tck/rfcs/query-limits
+
+== Setup
+
+.Schema
+[source,graphql,schema=true]
+----
+type Movie @limit(default: 3, max: 5) {
+  id: ID!
+  actors: [Person!]! @relationship(type: "ACTED_IN", direction: IN)
+}
+
+type Person @limit(default: 2) {
+  id: ID!
+}
+
+type Show @limit(max: 2) {
+  id: ID!
+}
+
+type Festival {
+  name: String!
+  shows: [Show!]! @relationship(type: "PART_OF", direction: IN)
+}
+----
+
+== Top Level Query Limits
+
+=== should limit the top level query with default value
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies {
+    id
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": 3
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WITH *
+
+LIMIT $param0
+RETURN this { .id } AS this
+----
+
+=== should limit the top level query with max value if not default is available
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  shows {
+    id
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": 2
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Show)
+WITH *
+
+LIMIT $param0
+RETURN this { .id } AS this
+----
+
+=== should limit the top level query with max value the option given is higher
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  shows(options: {limit: 5}) {
+    id
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": 2
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Show)
+WITH *
+
+LIMIT $param0
+RETURN this { .id } AS this
+----
+
+== Field Level Query Limits
+
+=== should limit the normal field level query
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies {
+    id
+    actors {
+      id
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": 3,
+  "param1": 2
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WITH *
+
+LIMIT $param0
+CALL {
+    WITH this
+    MATCH (this)<-[this0:ACTED_IN]-(this1:Person)
+    WITH this1 { .id } AS this1
+    
+    LIMIT $param1
+    RETURN collect(this1) AS var2
+}
+RETURN this { .id, actors: var2 } AS this
+----
+
+=== should limit the connection field level query
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies {
+    id
+    actorsConnection {
+      edges {
+        node {
+          id
+        }
+      }
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": 3,
+  "param1": 2
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WITH *
+
+LIMIT $param0
+CALL {
+    WITH this
+    MATCH (this)<-[this0:ACTED_IN]-(this1:Person)
+    WITH collect({ node: this1, relationship: this0 }) AS edges
+    WITH edges, size(edges) AS totalCount
+    CALL {
+        WITH edges
+        UNWIND edges AS edge
+        WITH edge.node AS this1, edge.relationship AS this0
+        WITH *
+        
+        LIMIT $param1
+        RETURN collect({ node: { id: this1.id, __typename: "Person" } }) AS var2
+    }
+    RETURN { edges: var2, totalCount: totalCount } AS var3
+}
+RETURN this { .id, actorsConnection: var3 } AS this
+----
+
+=== should extend the limit to the connection field if `first` provided
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies {
+    id
+    actorsConnection(first: 4) {
+      edges {
+        node {
+          id
+        }
+      }
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": 3,
+  "param1": 4
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WITH *
+
+LIMIT $param0
+CALL {
+    WITH this
+    MATCH (this)<-[this0:ACTED_IN]-(this1:Person)
+    WITH collect({ node: this1, relationship: this0 }) AS edges
+    WITH edges, size(edges) AS totalCount
+    CALL {
+        WITH edges
+        UNWIND edges AS edge
+        WITH edge.node AS this1, edge.relationship AS this0
+        WITH *
+        
+        LIMIT $param1
+        RETURN collect({ node: { id: this1.id, __typename: "Person" } }) AS var2
+    }
+    RETURN { edges: var2, totalCount: totalCount } AS var3
+}
+RETURN this { .id, actorsConnection: var3 } AS this
+----
+
+=== should extend the limit to the connection field if `first` provided, honouring the `max` argument
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  festivals {
+    name
+    showsConnection(first: 3) {
+      edges {
+        node {
+          id
+        }
+      }
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": 2
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Festival)
+CALL {
+    WITH this
+    MATCH (this)<-[this0:PART_OF]-(this1:Show)
+    WITH collect({ node: this1, relationship: this0 }) AS edges
+    WITH edges, size(edges) AS totalCount
+    CALL {
+        WITH edges
+        UNWIND edges AS edge
+        WITH edge.node AS this1, edge.relationship AS this0
+        WITH *
+        
+        LIMIT $param0
+        RETURN collect({ node: { id: this1.id, __typename: "Show" } }) AS var2
+    }
+    RETURN { edges: var2, totalCount: totalCount } AS var3
+}
+RETURN this { .name, showsConnection: var3 } AS this
+----
+
+=== should limit the relationship field level query
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies {
+    id
+    actors {
+      id
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": 3,
+  "param1": 2
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WITH *
+
+LIMIT $param0
+CALL {
+    WITH this
+    MATCH (this)<-[this0:ACTED_IN]-(this1:Person)
+    WITH this1 { .id } AS this1
+    
+    LIMIT $param1
+    RETURN collect(this1) AS var2
+}
+RETURN this { .id, actors: var2 } AS this
+----
diff --git a/core/src/test/resources/tck-test-files/cypher/v2/rfcs/rfc-022.adoc b/core/src/test/resources/tck-test-files/cypher/v2/rfcs/rfc-022.adoc
index 5fa0ecb7..f9bea486 100644
--- a/core/src/test/resources/tck-test-files/cypher/v2/rfcs/rfc-022.adoc
+++ b/core/src/test/resources/tck-test-files/cypher/v2/rfcs/rfc-022.adoc
@@ -31,7 +31,7 @@ type ActedIn @relationshipProperties {
 === Nested query
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query Query {
   movies(where: {released: 1999}) {
@@ -72,12 +72,10 @@ RETURN this {
 } AS this
 ----
 
-'''
-
 === Double nested query
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query Query {
   movies(where: {released: 1999}) {
@@ -131,6 +129,3 @@ RETURN this {
 	actors: actors
 } AS this
 ----
-
-'''
-
diff --git a/core/src/test/resources/tck-test-files/cypher/v2/rfcs/rfc-022.js.adoc b/core/src/test/resources/tck-test-files/cypher/v2/rfcs/rfc-022.js.adoc
new file mode 100644
index 00000000..81d89dfa
--- /dev/null
+++ b/core/src/test/resources/tck-test-files/cypher/v2/rfcs/rfc-022.js.adoc
@@ -0,0 +1,118 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= tck/rfs/022 subquery projection
+
+== no auth
+
+=== Setup
+
+.Schema
+[source,graphql,schema=true]
+----
+type Movie {
+  title: String!
+  released: Int
+  actors: [Person!]! @relationship(type: "ACTED_IN", direction: IN, properties: "ActedIn")
+  directors: [Person!]! @relationship(type: "DIRECTED", direction: IN)
+}
+
+type Person {
+  name: String!
+  movies: [Movie!]! @relationship(type: "ACTED_IN", direction: OUT, properties: "ActedIn")
+  directed: [Movie!]! @relationship(type: "DIRECTED", direction: OUT)
+}
+
+type ActedIn @relationshipProperties {
+  year: Int
+}
+----
+
+=== Nested query
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+query Query {
+  movies(where: {released: 1999}) {
+    title
+    actors(where: {name: "Keanu Reeves"}) {
+      name
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": 1999,
+  "param1": "Keanu Reeves"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE this.released = $param0
+CALL {
+    WITH this
+    MATCH (this)<-[this0:ACTED_IN]-(this1:Person)
+    WHERE this1.name = $param1
+    WITH this1 { .name } AS this1
+    RETURN collect(this1) AS var2
+}
+RETURN this { .title, actors: var2 } AS this
+----
+
+=== Double nested query
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+query Query {
+  movies(where: {released: 1999}) {
+    title
+    actors(where: {name: "Keanu Reeves"}) {
+      name
+      directed {
+        title
+        released
+      }
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": 1999,
+  "param1": "Keanu Reeves"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE this.released = $param0
+CALL {
+    WITH this
+    MATCH (this)<-[this0:ACTED_IN]-(this1:Person)
+    WHERE this1.name = $param1
+    CALL {
+        WITH this1
+        MATCH (this1)-[this2:DIRECTED]->(this3:Movie)
+        WITH this3 { .title, .released } AS this3
+        RETURN collect(this3) AS var4
+    }
+    WITH this1 { .name, directed: var4 } AS this1
+    RETURN collect(this1) AS var5
+}
+RETURN this { .title, actors: var5 } AS this
+----
diff --git a/core/src/test/resources/tck-test-files/cypher/v2/root-connection.adoc b/core/src/test/resources/tck-test-files/cypher/v2/root-connection.adoc
index c8718ca4..b801fb44 100644
--- a/core/src/test/resources/tck-test-files/cypher/v2/root-connection.adoc
+++ b/core/src/test/resources/tck-test-files/cypher/v2/root-connection.adoc
@@ -23,7 +23,7 @@ type Actor {
 == Simple selection, Movie by title
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   moviesConnection(where: {title: "River Runs Through It, A"}) {
@@ -71,12 +71,10 @@ RETURN {
 } AS this
 ----
 
-'''
-
 == should apply limit and sort before return
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   moviesConnection(first: 20, sort: [{title: ASC}]) {
@@ -123,12 +121,10 @@ RETURN {
 } AS this
 ----
 
-'''
-
 == should apply limit, sort, and filter correctly when all three are used
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   moviesConnection(
@@ -181,12 +177,10 @@ RETURN {
 } AS this
 ----
 
-'''
-
 == should correctly place any connection strings
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   moviesConnection(first: 20, sort: [{title: ASC}]) {
@@ -265,6 +259,3 @@ RETURN {
 	totalCount: totalCount
 } AS this
 ----
-
-'''
-
diff --git a/core/src/test/resources/tck-test-files/cypher/v2/root-connection.js.adoc b/core/src/test/resources/tck-test-files/cypher/v2/root-connection.js.adoc
new file mode 100644
index 00000000..8a195006
--- /dev/null
+++ b/core/src/test/resources/tck-test-files/cypher/v2/root-connection.js.adoc
@@ -0,0 +1,216 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= Root Connection Query tests
+
+== Setup
+
+.Schema
+[source,graphql,schema=true]
+----
+type Movie {
+  id: ID
+  title: String
+  actors: [Actor!]! @relationship(type: "ACTED_IN", direction: IN)
+}
+
+type Actor {
+  name: String
+  movies: [Movie!]! @relationship(type: "ACTED_IN", direction: OUT)
+}
+----
+
+== Simple selection, Movie by title
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  moviesConnection(where: {title: "River Runs Through It, A"}) {
+    totalCount
+    edges {
+      node {
+        title
+      }
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "River Runs Through It, A"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this0:Movie)
+WHERE this0.title = $param0
+WITH collect({ node: this0 }) AS edges
+WITH edges, size(edges) AS totalCount
+CALL {
+    WITH edges
+    UNWIND edges AS edge
+    WITH edge.node AS this0
+    RETURN collect({ node: { title: this0.title, __typename: "Movie" } }) AS var1
+}
+RETURN { edges: var1, totalCount: totalCount } AS this
+----
+
+== should apply limit and sort before return
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  moviesConnection(first: 20, sort: [{title: ASC}]) {
+    edges {
+      node {
+        title
+      }
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": 20
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this0:Movie)
+WITH collect({ node: this0 }) AS edges
+WITH edges, size(edges) AS totalCount
+CALL {
+    WITH edges
+    UNWIND edges AS edge
+    WITH edge.node AS this0
+    WITH *
+    ORDER BY this0.title ASC
+    LIMIT $param0
+    RETURN collect({ node: { title: this0.title, __typename: "Movie" } }) AS var1
+}
+RETURN { edges: var1, totalCount: totalCount } AS this
+----
+
+== should apply limit, sort, and filter correctly when all three are used
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  moviesConnection(
+    first: 20
+    where: {title_CONTAINS: "Matrix"}
+    sort: [{title: ASC}]
+  ) {
+    edges {
+      node {
+        title
+      }
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "Matrix",
+  "param1": 20
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this0:Movie)
+WHERE this0.title CONTAINS $param0
+WITH collect({ node: this0 }) AS edges
+WITH edges, size(edges) AS totalCount
+CALL {
+    WITH edges
+    UNWIND edges AS edge
+    WITH edge.node AS this0
+    WITH *
+    ORDER BY this0.title ASC
+    LIMIT $param1
+    RETURN collect({ node: { title: this0.title, __typename: "Movie" } }) AS var1
+}
+RETURN { edges: var1, totalCount: totalCount } AS this
+----
+
+== should correctly place any connection strings
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  moviesConnection(first: 20, sort: [{title: ASC}]) {
+    edges {
+      node {
+        title
+        actorsConnection {
+          totalCount
+          edges {
+            node {
+              name
+            }
+          }
+        }
+      }
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": 20
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this0:Movie)
+WITH collect({ node: this0 }) AS edges
+WITH edges, size(edges) AS totalCount
+CALL {
+    WITH edges
+    UNWIND edges AS edge
+    WITH edge.node AS this0
+    WITH *
+    ORDER BY this0.title ASC
+    LIMIT $param0
+    CALL {
+        WITH this0
+        MATCH (this0)<-[this1:ACTED_IN]-(this2:Actor)
+        WITH collect({ node: this2, relationship: this1 }) AS edges
+        WITH edges, size(edges) AS totalCount
+        CALL {
+            WITH edges
+            UNWIND edges AS edge
+            WITH edge.node AS this2, edge.relationship AS this1
+            RETURN collect({ node: { name: this2.name, __typename: "Actor" } }) AS var3
+        }
+        RETURN { edges: var3, totalCount: totalCount } AS var4
+    }
+    RETURN collect({ node: { title: this0.title, actorsConnection: var4, __typename: "Movie" } }) AS var5
+}
+RETURN { edges: var5, totalCount: totalCount } AS this
+----
diff --git a/core/src/test/resources/tck-test-files/cypher/v2/simple.adoc b/core/src/test/resources/tck-test-files/cypher/v2/simple.adoc
index 81b83553..347657b9 100644
--- a/core/src/test/resources/tck-test-files/cypher/v2/simple.adoc
+++ b/core/src/test/resources/tck-test-files/cypher/v2/simple.adoc
@@ -17,7 +17,7 @@ type Movie {
 == Single selection, Movie by title
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies(where: {title: "River Runs Through It, A"}) {
@@ -44,12 +44,10 @@ RETURN this {
 } AS this
 ----
 
-'''
-
 == Multi selection, Movie by title
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies(where: {title: "River Runs Through It, A"}) {
@@ -78,12 +76,10 @@ RETURN this {
 } AS this
 ----
 
-'''
-
 == Multi selection, Movie by title via variable
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query ($title: String) {
   movies(where: {title: $title}) {
@@ -97,7 +93,7 @@ query ($title: String) {
 [source,json,request=true]
 ----
 {
-  "title": "some title"
+  "title" : "some title"
 }
 ----
 
@@ -119,6 +115,3 @@ RETURN this {
 	.title
 } AS this
 ----
-
-'''
-
diff --git a/core/src/test/resources/tck-test-files/cypher/v2/simple.js.adoc b/core/src/test/resources/tck-test-files/cypher/v2/simple.js.adoc
new file mode 100644
index 00000000..e39d3268
--- /dev/null
+++ b/core/src/test/resources/tck-test-files/cypher/v2/simple.js.adoc
@@ -0,0 +1,110 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= Simple Cypher tests
+
+== Setup
+
+.Schema
+[source,graphql,schema=true]
+----
+type Movie {
+  id: ID
+  title: String
+}
+----
+
+== Single selection, Movie by title
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies(where: {title: "River Runs Through It, A"}) {
+    title
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "River Runs Through It, A"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE this.title = $param0
+RETURN this { .title } AS this
+----
+
+== Multi selection, Movie by title
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies(where: {title: "River Runs Through It, A"}) {
+    id
+    title
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "River Runs Through It, A"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE this.title = $param0
+RETURN this { .id, .title } AS this
+----
+
+== Multi selection, Movie by title via variable
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+query ($title: String) {
+  movies(where: {title: $title}) {
+    id
+    title
+  }
+}
+----
+
+.GraphQL params input
+[source,json,request=true]
+----
+{
+  "title": "some title"
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "some title"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE this.title = $param0
+RETURN this { .id, .title } AS this
+----
diff --git a/core/src/test/resources/tck-test-files/cypher/v2/types/bigint.adoc b/core/src/test/resources/tck-test-files/cypher/v2/types/bigint.adoc
index 54b86673..03465c5c 100644
--- a/core/src/test/resources/tck-test-files/cypher/v2/types/bigint.adoc
+++ b/core/src/test/resources/tck-test-files/cypher/v2/types/bigint.adoc
@@ -17,7 +17,7 @@ type File {
 == Querying with native BigInt in AST
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   files(where: {size: 9223372036854775807}) {
@@ -30,10 +30,7 @@ type File {
 [source,json]
 ----
 {
-  "param0" : {
-    "low" : -1,
-    "high" : 2147483647
-  }
+  "param0" : 9223372036854775807
 }
 ----
 
@@ -47,12 +44,10 @@ RETURN this {
 } AS this
 ----
 
-'''
-
 == Querying with BigInt as string in AST
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   files(where: {size: "9223372036854775807"}) {
@@ -65,10 +60,7 @@ RETURN this {
 [source,json]
 ----
 {
-  "param0" : {
-    "low" : -1,
-    "high" : 2147483647
-  }
+  "param0" : 9223372036854775807
 }
 ----
 
@@ -82,12 +74,10 @@ RETURN this {
 } AS this
 ----
 
-'''
-
 == Querying with BigInt as string in variables
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query Files($size: BigInt) {
   files(where: {size: $size}) {
@@ -100,7 +90,7 @@ query Files($size: BigInt) {
 [source,json,request=true]
 ----
 {
-  "size": "9223372036854775807"
+  "size" : "9223372036854775807"
 }
 ----
 
@@ -108,10 +98,7 @@ query Files($size: BigInt) {
 [source,json]
 ----
 {
-  "param0" : {
-    "low" : -1,
-    "high" : 2147483647
-  }
+  "param0" : 9223372036854775807
 }
 ----
 
@@ -124,6 +111,3 @@ RETURN this {
 	.name
 } AS this
 ----
-
-'''
-
diff --git a/core/src/test/resources/tck-test-files/cypher/v2/types/bigint.js.adoc b/core/src/test/resources/tck-test-files/cypher/v2/types/bigint.js.adoc
new file mode 100644
index 00000000..7c4ee328
--- /dev/null
+++ b/core/src/test/resources/tck-test-files/cypher/v2/types/bigint.js.adoc
@@ -0,0 +1,108 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= Cypher BigInt
+
+== Setup
+
+.Schema
+[source,graphql,schema=true]
+----
+type File {
+  name: String!
+  size: BigInt!
+}
+----
+
+== Querying with native BigInt in AST
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  files(where: {size: 9223372036854775807}) {
+    name
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": 9223372036854775807
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:File)
+WHERE this.size = $param0
+RETURN this { .name } AS this
+----
+
+== Querying with BigInt as string in AST
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  files(where: {size: "9223372036854775807"}) {
+    name
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": 9223372036854775807
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:File)
+WHERE this.size = $param0
+RETURN this { .name } AS this
+----
+
+== Querying with BigInt as string in variables
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+query Files($size: BigInt) {
+  files(where: {size: $size}) {
+    name
+  }
+}
+----
+
+.GraphQL params input
+[source,json,request=true]
+----
+{
+  "size": "9223372036854775807"
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": 9223372036854775807
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:File)
+WHERE this.size = $param0
+RETURN this { .name } AS this
+----
diff --git a/core/src/test/resources/tck-test-files/cypher/v2/types/date.adoc b/core/src/test/resources/tck-test-files/cypher/v2/types/date.adoc
index 2a8c602d..52e1bb2f 100644
--- a/core/src/test/resources/tck-test-files/cypher/v2/types/date.adoc
+++ b/core/src/test/resources/tck-test-files/cypher/v2/types/date.adoc
@@ -17,7 +17,7 @@ type Movie {
 == Simple Read
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies(where: {date: "1970-01-01"}) {
@@ -44,12 +44,10 @@ RETURN this {
 } AS this
 ----
 
-'''
-
 == GTE Read
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies(where: {date_GTE: "1980-04-08"}) {
@@ -75,6 +73,3 @@ RETURN this {
 	.date
 } AS this
 ----
-
-'''
-
diff --git a/core/src/test/resources/tck-test-files/cypher/v2/types/date.js.adoc b/core/src/test/resources/tck-test-files/cypher/v2/types/date.js.adoc
new file mode 100644
index 00000000..e5ca3d7c
--- /dev/null
+++ b/core/src/test/resources/tck-test-files/cypher/v2/types/date.js.adoc
@@ -0,0 +1,72 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= Cypher Date
+
+== Setup
+
+.Schema
+[source,graphql,schema=true]
+----
+type Movie {
+  id: ID
+  date: Date
+}
+----
+
+== Simple Read
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies(where: {date: "1970-01-01"}) {
+    date
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "1970-01-01"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE this.date = $param0
+RETURN this { .date } AS this
+----
+
+== GTE Read
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies(where: {date_GTE: "1980-04-08"}) {
+    date
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "1980-04-08"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE this.date >= $param0
+RETURN this { .date } AS this
+----
diff --git a/core/src/test/resources/tck-test-files/cypher/v2/types/datetime.adoc b/core/src/test/resources/tck-test-files/cypher/v2/types/datetime.adoc
index 40ac7afc..548dd93e 100644
--- a/core/src/test/resources/tck-test-files/cypher/v2/types/datetime.adoc
+++ b/core/src/test/resources/tck-test-files/cypher/v2/types/datetime.adoc
@@ -17,7 +17,7 @@ type Movie {
 == Simple Read
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies(where: {datetime: "1970-01-01T00:00:00.000Z"}) {
@@ -43,6 +43,3 @@ RETURN this {
 	datetime: apoc.date.convertFormat(toString(this.datetime), 'iso_zoned_date_time', 'iso_offset_date_time')
 } AS this
 ----
-
-'''
-
diff --git a/core/src/test/resources/tck-test-files/cypher/v2/types/datetime.js.adoc b/core/src/test/resources/tck-test-files/cypher/v2/types/datetime.js.adoc
new file mode 100644
index 00000000..d1180df9
--- /dev/null
+++ b/core/src/test/resources/tck-test-files/cypher/v2/types/datetime.js.adoc
@@ -0,0 +1,44 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= Cypher DateTime
+
+== Setup
+
+.Schema
+[source,graphql,schema=true]
+----
+type Movie {
+  id: ID
+  datetime: DateTime
+}
+----
+
+== Simple Read
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies(where: {datetime: "1970-01-01T00:00:00.000Z"}) {
+    datetime
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "1970-01-01T00:00:00Z"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE this.datetime = $param0
+RETURN this { datetime: apoc.date.convertFormat(toString(this.datetime), "iso_zoned_date_time", "iso_offset_date_time") } AS this
+----
diff --git a/core/src/test/resources/tck-test-files/cypher/v2/types/duration.adoc b/core/src/test/resources/tck-test-files/cypher/v2/types/duration.adoc
index 625b3b52..4879b08e 100644
--- a/core/src/test/resources/tck-test-files/cypher/v2/types/duration.adoc
+++ b/core/src/test/resources/tck-test-files/cypher/v2/types/duration.adoc
@@ -17,7 +17,7 @@ type Movie {
 == Simple Read
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies(where: {duration: "P1Y"}) {
@@ -44,12 +44,10 @@ RETURN this {
 } AS this
 ----
 
-'''
-
 == GTE Read
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies(where: {duration_GTE: "P3Y4M"}) {
@@ -75,6 +73,3 @@ RETURN this {
 	.duration
 } AS this
 ----
-
-'''
-
diff --git a/core/src/test/resources/tck-test-files/cypher/v2/types/duration.js.adoc b/core/src/test/resources/tck-test-files/cypher/v2/types/duration.js.adoc
new file mode 100644
index 00000000..96176a5f
--- /dev/null
+++ b/core/src/test/resources/tck-test-files/cypher/v2/types/duration.js.adoc
@@ -0,0 +1,72 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= Cypher Duration
+
+== Setup
+
+.Schema
+[source,graphql,schema=true]
+----
+type Movie {
+  id: ID
+  duration: Duration
+}
+----
+
+== Simple Read
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies(where: {duration: "P1Y"}) {
+    duration
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "P12M0DT0S"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE this.duration = $param0
+RETURN this { .duration } AS this
+----
+
+== GTE Read
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies(where: {duration_GTE: "P3Y4M"}) {
+    duration
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "P40M0DT0S"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE (datetime() + this.duration) >= (datetime() + $param0)
+RETURN this { .duration } AS this
+----
diff --git a/core/src/test/resources/tck-test-files/cypher/v2/types/localdatetime.adoc b/core/src/test/resources/tck-test-files/cypher/v2/types/localdatetime.adoc
index 3589d8b8..6f327a33 100644
--- a/core/src/test/resources/tck-test-files/cypher/v2/types/localdatetime.adoc
+++ b/core/src/test/resources/tck-test-files/cypher/v2/types/localdatetime.adoc
@@ -17,7 +17,7 @@ type Movie {
 == Simple Read
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies(where: {localDT: "2003-09-14T12:00:00"}) {
@@ -44,12 +44,10 @@ RETURN this {
 } AS this
 ----
 
-'''
-
 == GTE Read
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies(where: {localDT_GTE: "2010-08-23T13:45:33.250"}) {
@@ -75,6 +73,3 @@ RETURN this {
 	.localDT
 } AS this
 ----
-
-'''
-
diff --git a/core/src/test/resources/tck-test-files/cypher/v2/types/localdatetime.js.adoc b/core/src/test/resources/tck-test-files/cypher/v2/types/localdatetime.js.adoc
new file mode 100644
index 00000000..dccc4f1d
--- /dev/null
+++ b/core/src/test/resources/tck-test-files/cypher/v2/types/localdatetime.js.adoc
@@ -0,0 +1,72 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= Cypher LocalDateTime
+
+== Setup
+
+.Schema
+[source,graphql,schema=true]
+----
+type Movie {
+  id: ID
+  localDT: LocalDateTime
+}
+----
+
+== Simple Read
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies(where: {localDT: "2003-09-14T12:00:00"}) {
+    localDT
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "2003-09-14T12:00:00"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE this.localDT = $param0
+RETURN this { .localDT } AS this
+----
+
+== GTE Read
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies(where: {localDT_GTE: "2010-08-23T13:45:33.250"}) {
+    localDT
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "2010-08-23T13:45:33.250000000"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE this.localDT >= $param0
+RETURN this { .localDT } AS this
+----
diff --git a/core/src/test/resources/tck-test-files/cypher/v2/types/localtime.adoc b/core/src/test/resources/tck-test-files/cypher/v2/types/localtime.adoc
index 27dd36f9..9ab6df2d 100644
--- a/core/src/test/resources/tck-test-files/cypher/v2/types/localtime.adoc
+++ b/core/src/test/resources/tck-test-files/cypher/v2/types/localtime.adoc
@@ -17,7 +17,7 @@ type Movie {
 == Simple Read
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies(where: {time: "12:00:00"}) {
@@ -44,12 +44,10 @@ RETURN this {
 } AS this
 ----
 
-'''
-
 == GTE Read
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies(where: {time_GTE: "13:45:33.250"}) {
@@ -75,6 +73,3 @@ RETURN this {
 	.time
 } AS this
 ----
-
-'''
-
diff --git a/core/src/test/resources/tck-test-files/cypher/v2/types/localtime.js.adoc b/core/src/test/resources/tck-test-files/cypher/v2/types/localtime.js.adoc
new file mode 100644
index 00000000..d37145a6
--- /dev/null
+++ b/core/src/test/resources/tck-test-files/cypher/v2/types/localtime.js.adoc
@@ -0,0 +1,72 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= Cypher LocalTime
+
+== Setup
+
+.Schema
+[source,graphql,schema=true]
+----
+type Movie {
+  id: ID
+  time: LocalTime
+}
+----
+
+== Simple Read
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies(where: {time: "12:00:00"}) {
+    time
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "12:00:00"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE this.time = $param0
+RETURN this { .time } AS this
+----
+
+== GTE Read
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies(where: {time_GTE: "13:45:33.250"}) {
+    time
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "13:45:33.250000000"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE this.time >= $param0
+RETURN this { .time } AS this
+----
diff --git a/core/src/test/resources/tck-test-files/cypher/v2/types/point.adoc b/core/src/test/resources/tck-test-files/cypher/v2/types/point.adoc
index 7898ee18..be885cfb 100644
--- a/core/src/test/resources/tck-test-files/cypher/v2/types/point.adoc
+++ b/core/src/test/resources/tck-test-files/cypher/v2/types/point.adoc
@@ -17,7 +17,7 @@ type PointContainer {
 == Simple Point query
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   pointContainers(where: {point: {longitude: 1.0, latitude: 2.0}}) {
@@ -55,12 +55,10 @@ RETURN this {
 } AS this
 ----
 
-'''
-
 == Simple Point IN query
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   pointContainers(where: {point_IN: [{longitude: 1.0, latitude: 2.0}]}) {
@@ -98,14 +96,12 @@ RETURN this {
 } AS this
 ----
 
-'''
-
 == tests using describe or point.describe
 
 === Simple Point LT query
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   pointContainers(
@@ -146,12 +142,10 @@ RETURN this {
 } AS this
 ----
 
-'''
-
 === Simple Point LTE query
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   pointContainers(
@@ -192,12 +186,10 @@ RETURN this {
 } AS this
 ----
 
-'''
-
 === Simple Point GT query
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   pointContainers(
@@ -238,12 +230,10 @@ RETURN this {
 } AS this
 ----
 
-'''
-
 === Simple Point GTE query
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   pointContainers(
@@ -284,12 +274,10 @@ RETURN this {
 } AS this
 ----
 
-'''
-
 === Simple Point DISTANCE query
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   pointContainers(
@@ -329,6 +317,3 @@ RETURN this {
 	} ELSE NULL END
 } AS this
 ----
-
-'''
-
diff --git a/core/src/test/resources/tck-test-files/cypher/v2/types/point.js.adoc b/core/src/test/resources/tck-test-files/cypher/v2/types/point.js.adoc
new file mode 100644
index 00000000..e6ca9eb5
--- /dev/null
+++ b/core/src/test/resources/tck-test-files/cypher/v2/types/point.js.adoc
@@ -0,0 +1,306 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= Cypher Points
+
+== Setup
+
+.Schema
+[source,graphql,schema=true]
+----
+type PointContainer {
+  id: String
+  point: Point
+}
+----
+
+== Simple Point query
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  pointContainers(where: {point: {longitude: 1.0, latitude: 2.0}}) {
+    point {
+      longitude
+      latitude
+      crs
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": {
+    "longitude": 1,
+    "latitude": 2
+  }
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:PointContainer)
+WHERE this.point = point($param0)
+RETURN this { point: CASE
+    WHEN this.point IS NOT NULL THEN { point: this.point, crs: this.point.crs }
+    ELSE NULL
+END } AS this
+----
+
+== Simple Point IN query
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  pointContainers(where: {point_IN: [{longitude: 1.0, latitude: 2.0}]}) {
+    point {
+      longitude
+      latitude
+      crs
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": [
+    {
+      "longitude": 1,
+      "latitude": 2
+    }
+  ]
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:PointContainer)
+WHERE this.point IN [var0 IN $param0 | point(var0)]
+RETURN this { point: CASE
+    WHEN this.point IS NOT NULL THEN { point: this.point, crs: this.point.crs }
+    ELSE NULL
+END } AS this
+----
+
+== tests using describe or point.describe
+
+=== Simple Point LT query
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  pointContainers(
+    where: {point_LT: {point: {longitude: 1.1, latitude: 2.2}, distance: 3.3}}
+  ) {
+    point {
+      longitude
+      latitude
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": {
+    "point": {
+      "longitude": 1.1,
+      "latitude": 2.2
+    },
+    "distance": 3.3
+  }
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:PointContainer)
+WHERE point.distance(this.point, point($param0.point)) < $param0.distance
+RETURN this { point: CASE
+    WHEN this.point IS NOT NULL THEN { point: this.point }
+    ELSE NULL
+END } AS this
+----
+
+=== Simple Point LTE query
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  pointContainers(
+    where: {point_LTE: {point: {longitude: 1.1, latitude: 2.2}, distance: 3.3}}
+  ) {
+    point {
+      longitude
+      latitude
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": {
+    "point": {
+      "longitude": 1.1,
+      "latitude": 2.2
+    },
+    "distance": 3.3
+  }
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:PointContainer)
+WHERE point.distance(this.point, point($param0.point)) <= $param0.distance
+RETURN this { point: CASE
+    WHEN this.point IS NOT NULL THEN { point: this.point }
+    ELSE NULL
+END } AS this
+----
+
+=== Simple Point GT query
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  pointContainers(
+    where: {point_GT: {point: {longitude: 1.1, latitude: 2.2}, distance: 3.3}}
+  ) {
+    point {
+      longitude
+      latitude
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": {
+    "point": {
+      "longitude": 1.1,
+      "latitude": 2.2
+    },
+    "distance": 3.3
+  }
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:PointContainer)
+WHERE point.distance(this.point, point($param0.point)) > $param0.distance
+RETURN this { point: CASE
+    WHEN this.point IS NOT NULL THEN { point: this.point }
+    ELSE NULL
+END } AS this
+----
+
+=== Simple Point GTE query
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  pointContainers(
+    where: {point_GTE: {point: {longitude: 1.1, latitude: 2.2}, distance: 3.3}}
+  ) {
+    point {
+      longitude
+      latitude
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": {
+    "point": {
+      "longitude": 1.1,
+      "latitude": 2.2
+    },
+    "distance": 3.3
+  }
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:PointContainer)
+WHERE point.distance(this.point, point($param0.point)) >= $param0.distance
+RETURN this { point: CASE
+    WHEN this.point IS NOT NULL THEN { point: this.point }
+    ELSE NULL
+END } AS this
+----
+
+=== Simple Point DISTANCE query
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  pointContainers(
+    where: {point_DISTANCE: {point: {longitude: 1.1, latitude: 2.2}, distance: 3.3}}
+  ) {
+    point {
+      longitude
+      latitude
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": {
+    "point": {
+      "longitude": 1.1,
+      "latitude": 2.2
+    },
+    "distance": 3.3
+  }
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:PointContainer)
+WHERE point.distance(this.point, point($param0.point)) = $param0.distance
+RETURN this { point: CASE
+    WHEN this.point IS NOT NULL THEN { point: this.point }
+    ELSE NULL
+END } AS this
+----
diff --git a/core/src/test/resources/tck-test-files/cypher/v2/types/points.adoc b/core/src/test/resources/tck-test-files/cypher/v2/types/points.adoc
index c552f45d..1da2111c 100644
--- a/core/src/test/resources/tck-test-files/cypher/v2/types/points.adoc
+++ b/core/src/test/resources/tck-test-files/cypher/v2/types/points.adoc
@@ -17,7 +17,7 @@ type PointContainer {
 == Simple Points query
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   pointContainers(where: {points: [{longitude: 1.0, latitude: 2.0}]}) {
@@ -55,12 +55,10 @@ RETURN this {
 } AS this
 ----
 
-'''
-
 == Simple Points INCLUDES query
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   pointContainers(where: {points_INCLUDES: {longitude: 1.0, latitude: 2.0}}) {
@@ -97,6 +95,3 @@ RETURN this {
 	}] ELSE NULL END
 } AS this
 ----
-
-'''
-
diff --git a/core/src/test/resources/tck-test-files/cypher/v2/types/points.js.adoc b/core/src/test/resources/tck-test-files/cypher/v2/types/points.js.adoc
new file mode 100644
index 00000000..f97697bf
--- /dev/null
+++ b/core/src/test/resources/tck-test-files/cypher/v2/types/points.js.adoc
@@ -0,0 +1,94 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= Cypher Points
+
+== Setup
+
+.Schema
+[source,graphql,schema=true]
+----
+type PointContainer {
+  id: String
+  points: [Point]
+}
+----
+
+== Simple Points query
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  pointContainers(where: {points: [{longitude: 1.0, latitude: 2.0}]}) {
+    points {
+      longitude
+      latitude
+      crs
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": [
+    {
+      "longitude": 1,
+      "latitude": 2
+    }
+  ]
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:PointContainer)
+WHERE this.points = [var0 IN $param0 | point(var0)]
+RETURN this { points: CASE
+    WHEN this.points IS NOT NULL THEN [var1 IN this.points | { point: var1, crs: var1.crs }]
+    ELSE NULL
+END } AS this
+----
+
+== Simple Points INCLUDES query
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  pointContainers(where: {points_INCLUDES: {longitude: 1.0, latitude: 2.0}}) {
+    points {
+      longitude
+      latitude
+      crs
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": {
+    "longitude": 1,
+    "latitude": 2
+  }
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:PointContainer)
+WHERE point($param0) IN this.points
+RETURN this { points: CASE
+    WHEN this.points IS NOT NULL THEN [var0 IN this.points | { point: var0, crs: var0.crs }]
+    ELSE NULL
+END } AS this
+----
diff --git a/core/src/test/resources/tck-test-files/cypher/v2/types/time.adoc b/core/src/test/resources/tck-test-files/cypher/v2/types/time.adoc
index b69e71b0..deb3adc2 100644
--- a/core/src/test/resources/tck-test-files/cypher/v2/types/time.adoc
+++ b/core/src/test/resources/tck-test-files/cypher/v2/types/time.adoc
@@ -17,7 +17,7 @@ type Movie {
 == Simple Read
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies(where: {time: "12:00:00"}) {
@@ -44,12 +44,10 @@ RETURN this {
 } AS this
 ----
 
-'''
-
 == GTE Read
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies(where: {time_GTE: "13:45:33.250"}) {
@@ -75,6 +73,3 @@ RETURN this {
 	.time
 } AS this
 ----
-
-'''
-
diff --git a/core/src/test/resources/tck-test-files/cypher/v2/types/time.js.adoc b/core/src/test/resources/tck-test-files/cypher/v2/types/time.js.adoc
new file mode 100644
index 00000000..70d28c39
--- /dev/null
+++ b/core/src/test/resources/tck-test-files/cypher/v2/types/time.js.adoc
@@ -0,0 +1,72 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= Cypher Time
+
+== Setup
+
+.Schema
+[source,graphql,schema=true]
+----
+type Movie {
+  id: ID
+  time: Time
+}
+----
+
+== Simple Read
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies(where: {time: "12:00:00"}) {
+    time
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "12:00:00Z"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE this.time = $param0
+RETURN this { .time } AS this
+----
+
+== GTE Read
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies(where: {time_GTE: "13:45:33.250"}) {
+    time
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "13:45:33.250000000Z"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE this.time >= $param0
+RETURN this { .time } AS this
+----
diff --git a/core/src/test/resources/tck-test-files/cypher/v2/undirected-relationships/query-direction-connection.adoc b/core/src/test/resources/tck-test-files/cypher/v2/undirected-relationships/query-direction-connection.adoc
index a5e3ee7d..d7fca255 100644
--- a/core/src/test/resources/tck-test-files/cypher/v2/undirected-relationships/query-direction-connection.adoc
+++ b/core/src/test/resources/tck-test-files/cypher/v2/undirected-relationships/query-direction-connection.adoc
@@ -15,7 +15,7 @@ type User {
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query FriendsAggregate {
   users {
@@ -65,8 +65,6 @@ RETURN this {
 } AS this
 ----
 
-'''
-
 == query connection with a DIRECTED_ONLY relationship
 
 .Schema
@@ -79,7 +77,7 @@ type User {
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query FriendsAggregate {
   users {
@@ -129,8 +127,6 @@ RETURN this {
 } AS this
 ----
 
-'''
-
 == query with a UNDIRECTED_ONLY relationship
 
 .Schema
@@ -143,7 +139,7 @@ type User {
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query FriendsAggregate {
   users {
@@ -192,6 +188,3 @@ RETURN this {
 	friendsConnection: friendsConnection
 } AS this
 ----
-
-'''
-
diff --git a/core/src/test/resources/tck-test-files/cypher/v2/undirected-relationships/query-direction-connection.js.adoc b/core/src/test/resources/tck-test-files/cypher/v2/undirected-relationships/query-direction-connection.js.adoc
new file mode 100644
index 00000000..e9521d69
--- /dev/null
+++ b/core/src/test/resources/tck-test-files/cypher/v2/undirected-relationships/query-direction-connection.js.adoc
@@ -0,0 +1,152 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= QueryDirection in relationships connection
+
+== query with directed and undirected relationships with a DEFAULT_UNDIRECTED
+
+.Schema
+[source,graphql,schema=true]
+----
+type User {
+  name: String!
+  friends: [User!]! @relationship(type: "FRIENDS_WITH", direction: OUT, queryDirection: DEFAULT_UNDIRECTED)
+}
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+query FriendsAggregate {
+  users {
+    friendsConnection {
+      totalCount
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:User)
+CALL {
+    WITH this
+    MATCH (this)-[this0:FRIENDS_WITH]-(this1:User)
+    WITH collect({ node: this1, relationship: this0 }) AS edges
+    WITH edges, size(edges) AS totalCount
+    CALL {
+        WITH edges
+        UNWIND edges AS edge
+        WITH edge.node AS this1, edge.relationship AS this0
+        RETURN collect({ node: { __id: toString(id(this1)), __typename: "User" } }) AS var2
+    }
+    RETURN { edges: var2, totalCount: totalCount } AS var3
+}
+RETURN this { friendsConnection: var3 } AS this
+----
+
+== query connection with a DIRECTED_ONLY relationship
+
+.Schema
+[source,graphql,schema=true]
+----
+type User {
+  name: String!
+  friends: [User!]! @relationship(type: "FRIENDS_WITH", direction: OUT, queryDirection: DIRECTED_ONLY)
+}
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+query FriendsAggregate {
+  users {
+    friendsConnection {
+      totalCount
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:User)
+CALL {
+    WITH this
+    MATCH (this)-[this0:FRIENDS_WITH]->(this1:User)
+    WITH collect({ node: this1, relationship: this0 }) AS edges
+    WITH edges, size(edges) AS totalCount
+    CALL {
+        WITH edges
+        UNWIND edges AS edge
+        WITH edge.node AS this1, edge.relationship AS this0
+        RETURN collect({ node: { __id: toString(id(this1)), __typename: "User" } }) AS var2
+    }
+    RETURN { edges: var2, totalCount: totalCount } AS var3
+}
+RETURN this { friendsConnection: var3 } AS this
+----
+
+== query with a UNDIRECTED_ONLY relationship
+
+.Schema
+[source,graphql,schema=true]
+----
+type User {
+  name: String!
+  friends: [User!]! @relationship(type: "FRIENDS_WITH", direction: OUT, queryDirection: UNDIRECTED_ONLY)
+}
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+query FriendsAggregate {
+  users {
+    friendsConnection {
+      totalCount
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:User)
+CALL {
+    WITH this
+    MATCH (this)-[this0:FRIENDS_WITH]-(this1:User)
+    WITH collect({ node: this1, relationship: this0 }) AS edges
+    WITH edges, size(edges) AS totalCount
+    CALL {
+        WITH edges
+        UNWIND edges AS edge
+        WITH edge.node AS this1, edge.relationship AS this0
+        RETURN collect({ node: { __id: toString(id(this1)), __typename: "User" } }) AS var2
+    }
+    RETURN { edges: var2, totalCount: totalCount } AS var3
+}
+RETURN this { friendsConnection: var3 } AS this
+----
diff --git a/core/src/test/resources/tck-test-files/cypher/v2/undirected-relationships/query-direction.adoc b/core/src/test/resources/tck-test-files/cypher/v2/undirected-relationships/query-direction.adoc
index 210a4fb8..bbf64c8a 100644
--- a/core/src/test/resources/tck-test-files/cypher/v2/undirected-relationships/query-direction.adoc
+++ b/core/src/test/resources/tck-test-files/cypher/v2/undirected-relationships/query-direction.adoc
@@ -15,7 +15,7 @@ type User {
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   users {
@@ -63,8 +63,6 @@ RETURN this {
 } AS this
 ----
 
-'''
-
 == query with directed and undirected relationships with a DEFAULT_DIRECTED
 
 .Schema
@@ -77,7 +75,7 @@ type User {
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   users {
@@ -125,8 +123,6 @@ RETURN this {
 } AS this
 ----
 
-'''
-
 == query with a DIRECTED_ONLY relationship
 
 .Schema
@@ -139,7 +135,7 @@ type User {
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   users {
@@ -175,8 +171,6 @@ RETURN this {
 } AS this
 ----
 
-'''
-
 == query with a UNDIRECTED_ONLY relationship
 
 .Schema
@@ -189,7 +183,7 @@ type User {
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   users {
@@ -224,6 +218,3 @@ RETURN this {
 	friends: friends
 } AS this
 ----
-
-'''
-
diff --git a/core/src/test/resources/tck-test-files/cypher/v2/undirected-relationships/query-direction.js.adoc b/core/src/test/resources/tck-test-files/cypher/v2/undirected-relationships/query-direction.js.adoc
new file mode 100644
index 00000000..e8f7d707
--- /dev/null
+++ b/core/src/test/resources/tck-test-files/cypher/v2/undirected-relationships/query-direction.js.adoc
@@ -0,0 +1,195 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= QueryDirection in relationships
+
+== query with directed and undirected relationships with DEFAULT_UNDIRECTED
+
+.Schema
+[source,graphql,schema=true]
+----
+type User {
+  name: String!
+  friends: [User!]! @relationship(type: "FRIENDS_WITH", direction: OUT, queryDirection: DEFAULT_UNDIRECTED)
+}
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  users {
+    name
+    friends: friends {
+      name
+    }
+    directedFriends: friends(directed: true) {
+      name
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:User)
+CALL {
+    WITH this
+    MATCH (this)-[this0:FRIENDS_WITH]-(this1:User)
+    WITH this1 { .name } AS this1
+    RETURN collect(this1) AS var2
+}
+CALL {
+    WITH this
+    MATCH (this)-[this3:FRIENDS_WITH]->(this4:User)
+    WITH this4 { .name } AS this4
+    RETURN collect(this4) AS var5
+}
+RETURN this { .name, friends: var2, directedFriends: var5 } AS this
+----
+
+== query with directed and undirected relationships with a DEFAULT_DIRECTED
+
+.Schema
+[source,graphql,schema=true]
+----
+type User {
+  name: String!
+  friends: [User!]! @relationship(type: "FRIENDS_WITH", direction: OUT, queryDirection: DEFAULT_DIRECTED)
+}
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  users {
+    name
+    friends: friends {
+      name
+    }
+    undirectedFriends: friends(directed: false) {
+      name
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:User)
+CALL {
+    WITH this
+    MATCH (this)-[this0:FRIENDS_WITH]->(this1:User)
+    WITH this1 { .name } AS this1
+    RETURN collect(this1) AS var2
+}
+CALL {
+    WITH this
+    MATCH (this)-[this3:FRIENDS_WITH]-(this4:User)
+    WITH this4 { .name } AS this4
+    RETURN collect(this4) AS var5
+}
+RETURN this { .name, friends: var2, undirectedFriends: var5 } AS this
+----
+
+== query with a DIRECTED_ONLY relationship
+
+.Schema
+[source,graphql,schema=true]
+----
+type User {
+  name: String!
+  friends: [User!]! @relationship(type: "FRIENDS_WITH", direction: OUT, queryDirection: DIRECTED_ONLY)
+}
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  users {
+    name
+    friends: friends {
+      name
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:User)
+CALL {
+    WITH this
+    MATCH (this)-[this0:FRIENDS_WITH]->(this1:User)
+    WITH this1 { .name } AS this1
+    RETURN collect(this1) AS var2
+}
+RETURN this { .name, friends: var2 } AS this
+----
+
+== query with a UNDIRECTED_ONLY relationship
+
+.Schema
+[source,graphql,schema=true]
+----
+type User {
+  name: String!
+  friends: [User!]! @relationship(type: "FRIENDS_WITH", direction: OUT, queryDirection: UNDIRECTED_ONLY)
+}
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  users {
+    name
+    friends: friends {
+      name
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:User)
+CALL {
+    WITH this
+    MATCH (this)-[this0:FRIENDS_WITH]-(this1:User)
+    WITH this1 { .name } AS this1
+    RETURN collect(this1) AS var2
+}
+RETURN this { .name, friends: var2 } AS this
+----
diff --git a/core/src/test/resources/tck-test-files/cypher/v2/undirected-relationships/undirected-connection.adoc b/core/src/test/resources/tck-test-files/cypher/v2/undirected-relationships/undirected-connection.adoc
index bfad5043..8fe2e6e9 100644
--- a/core/src/test/resources/tck-test-files/cypher/v2/undirected-relationships/undirected-connection.adoc
+++ b/core/src/test/resources/tck-test-files/cypher/v2/undirected-relationships/undirected-connection.adoc
@@ -15,7 +15,7 @@ type User {
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query FriendsAggregate {
   users {
@@ -64,6 +64,3 @@ RETURN this {
 	friendsConnection: friendsConnection
 } AS this
 ----
-
-'''
-
diff --git a/core/src/test/resources/tck-test-files/cypher/v2/undirected-relationships/undirected-connection.js.adoc b/core/src/test/resources/tck-test-files/cypher/v2/undirected-relationships/undirected-connection.js.adoc
new file mode 100644
index 00000000..e1bb5c43
--- /dev/null
+++ b/core/src/test/resources/tck-test-files/cypher/v2/undirected-relationships/undirected-connection.js.adoc
@@ -0,0 +1,54 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= Undirected connections
+
+== query with undirected aggregation
+
+.Schema
+[source,graphql,schema=true]
+----
+type User {
+  name: String!
+  friends: [User!]! @relationship(type: "FRIENDS_WITH", direction: OUT)
+}
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+query FriendsAggregate {
+  users {
+    friendsConnection(directed: false) {
+      totalCount
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:User)
+CALL {
+    WITH this
+    MATCH (this)-[this0:FRIENDS_WITH]-(this1:User)
+    WITH collect({ node: this1, relationship: this0 }) AS edges
+    WITH edges, size(edges) AS totalCount
+    CALL {
+        WITH edges
+        UNWIND edges AS edge
+        WITH edge.node AS this1, edge.relationship AS this0
+        RETURN collect({ node: { __id: toString(id(this1)), __typename: "User" } }) AS var2
+    }
+    RETURN { edges: var2, totalCount: totalCount } AS var3
+}
+RETURN this { friendsConnection: var3 } AS this
+----
diff --git a/core/src/test/resources/tck-test-files/cypher/v2/undirected-relationships/undirected-relationships.adoc b/core/src/test/resources/tck-test-files/cypher/v2/undirected-relationships/undirected-relationships.adoc
index d8edcd8e..aef7a3dd 100644
--- a/core/src/test/resources/tck-test-files/cypher/v2/undirected-relationships/undirected-relationships.adoc
+++ b/core/src/test/resources/tck-test-files/cypher/v2/undirected-relationships/undirected-relationships.adoc
@@ -15,7 +15,7 @@ type User {
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   users {
@@ -63,8 +63,6 @@ RETURN this {
 } AS this
 ----
 
-'''
-
 == undirected with unions
 
 .Schema
@@ -88,7 +86,7 @@ type User {
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query Users {
   users {
@@ -142,8 +140,6 @@ RETURN this {
 } AS this
 ----
 
-'''
-
 == undirected with interfaces
 
 .Schema
@@ -177,7 +173,7 @@ type Actor {
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query Actors {
   actors {
@@ -225,6 +221,3 @@ RETURN this {
 	actedIn: actedIn
 } AS this
 ----
-
-'''
-
diff --git a/core/src/test/resources/tck-test-files/cypher/v2/undirected-relationships/undirected-relationships.js.adoc b/core/src/test/resources/tck-test-files/cypher/v2/undirected-relationships/undirected-relationships.js.adoc
new file mode 100644
index 00000000..ee139d90
--- /dev/null
+++ b/core/src/test/resources/tck-test-files/cypher/v2/undirected-relationships/undirected-relationships.js.adoc
@@ -0,0 +1,198 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= Undirected relationships
+
+== query with directed and undirected relationships
+
+.Schema
+[source,graphql,schema=true]
+----
+type User {
+  name: String!
+  friends: [User!]! @relationship(type: "FRIENDS_WITH", direction: OUT)
+}
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  users {
+    name
+    friends: friends(directed: false) {
+      name
+    }
+    directedFriends: friends {
+      name
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:User)
+CALL {
+    WITH this
+    MATCH (this)-[this0:FRIENDS_WITH]-(this1:User)
+    WITH this1 { .name } AS this1
+    RETURN collect(this1) AS var2
+}
+CALL {
+    WITH this
+    MATCH (this)-[this3:FRIENDS_WITH]->(this4:User)
+    WITH this4 { .name } AS this4
+    RETURN collect(this4) AS var5
+}
+RETURN this { .name, friends: var2, directedFriends: var5 } AS this
+----
+
+== undirected with unions
+
+.Schema
+[source,graphql,schema=true]
+----
+union Content = Blog | Post
+
+type Blog {
+  title: String
+  posts: [Post!]! @relationship(type: "HAS_POST", direction: OUT)
+}
+
+type Post {
+  content: String
+}
+
+type User {
+  name: String
+  content: [Content!]! @relationship(type: "HAS_CONTENT", direction: OUT)
+}
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+query Users {
+  users {
+    content(directed: false) {
+      ... on Blog {
+        title
+      }
+      ... on Post {
+        content
+      }
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:User)
+CALL {
+    WITH this
+    CALL {
+        WITH *
+        MATCH (this)-[this0:HAS_CONTENT]-(this1:Blog)
+        WITH this1 { .title, __typename: "Blog", __id: toString(id(this1)) } AS this1
+        RETURN this1 AS var2
+        UNION
+        WITH *
+        MATCH (this)-[this3:HAS_CONTENT]-(this4:Post)
+        WITH this4 { .content, __typename: "Post", __id: toString(id(this4)) } AS this4
+        RETURN this4 AS var2
+    }
+    WITH var2
+    RETURN collect(var2) AS var2
+}
+RETURN this { content: var2 } AS this
+----
+
+== undirected with interfaces
+
+.Schema
+[source,graphql,schema=true]
+----
+interface Production {
+  title: String!
+  actors: [Actor!]!
+}
+
+type Movie implements Production {
+  title: String!
+  actors: [Actor!]! @relationship(type: "ACTED_IN", direction: IN, properties: "ActedIn")
+  runtime: Int!
+}
+
+type Series implements Production {
+  title: String!
+  actors: [Actor!]! @relationship(type: "ACTED_IN", direction: IN, properties: "ActedIn")
+  episodes: Int!
+}
+
+type ActedIn @relationshipProperties {
+  role: String!
+}
+
+type Actor {
+  name: String!
+  actedIn: [Production!]! @relationship(type: "ACTED_IN", direction: OUT, properties: "ActedIn")
+}
+----
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+query Actors {
+  actors {
+    actedIn(directed: false) {
+      title
+    }
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Actor)
+CALL {
+    WITH this
+    CALL {
+        WITH *
+        MATCH (this)-[this0:ACTED_IN]-(this1:Movie)
+        WITH this1 { .title, __typename: "Movie", __id: toString(id(this1)) } AS this1
+        RETURN this1 AS var2
+        UNION
+        WITH *
+        MATCH (this)-[this3:ACTED_IN]-(this4:Series)
+        WITH this4 { .title, __typename: "Series", __id: toString(id(this4)) } AS this4
+        RETURN this4 AS var2
+    }
+    WITH var2
+    RETURN collect(var2) AS var2
+}
+RETURN this { actedIn: var2 } AS this
+----
diff --git a/core/src/test/resources/tck-test-files/cypher/v2/where.adoc b/core/src/test/resources/tck-test-files/cypher/v2/where.adoc
index d6fa176c..59e30b4b 100644
--- a/core/src/test/resources/tck-test-files/cypher/v2/where.adoc
+++ b/core/src/test/resources/tck-test-files/cypher/v2/where.adoc
@@ -24,7 +24,7 @@ type Movie {
 == Simple
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query ($title: String, $isFavorite: Boolean) {
   movies(where: {title: $title, isFavorite: $isFavorite}) {
@@ -37,8 +37,8 @@ query ($title: String, $isFavorite: Boolean) {
 [source,json,request=true]
 ----
 {
-  "title": "some title",
-  "isFavorite": true
+  "isFavorite" : true,
+  "title" : "some title"
 }
 ----
 
@@ -62,12 +62,10 @@ RETURN this {
 } AS this
 ----
 
-'''
-
 == Simple AND
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies(where: {AND: [{title: "some title"}]}) {
@@ -94,12 +92,10 @@ RETURN this {
 } AS this
 ----
 
-'''
-
 == Simple AND with multiple parameters
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies(where: {AND: [{title: "some title"}, {isFavorite: true}]}) {
@@ -128,12 +124,10 @@ RETURN this {
 } AS this
 ----
 
-'''
-
 == Nested AND
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies(where: {AND: [{AND: [{title: "some title"}]}]}) {
@@ -160,12 +154,10 @@ RETURN this {
 } AS this
 ----
 
-'''
-
 == Nested AND with multiple properties
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies(where: {AND: [{AND: [{title: "some title"}, {title: "another title"}]}]}) {
@@ -194,12 +186,10 @@ RETURN this {
 } AS this
 ----
 
-'''
-
 == Nested AND and OR
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies(where: {AND: [{OR: [{title: "some title"}, {isFavorite: true}], id: 2}]}) {
@@ -230,12 +220,10 @@ RETURN this {
 } AS this
 ----
 
-'''
-
 == Super Nested AND
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies(where: {AND: [{AND: [{AND: [{title: "some title"}]}]}]}) {
@@ -262,12 +250,10 @@ RETURN this {
 } AS this
 ----
 
-'''
-
 == Simple OR
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies(where: {OR: [{title: "some title"}]}) {
@@ -294,12 +280,10 @@ RETURN this {
 } AS this
 ----
 
-'''
-
 == Nested OR
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies(where: {OR: [{OR: [{title: "some title"}]}]}) {
@@ -326,12 +310,10 @@ RETURN this {
 } AS this
 ----
 
-'''
-
 == Super Nested OR
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies(where: {OR: [{OR: [{OR: [{title: "some title"}]}]}]}) {
@@ -358,14 +340,12 @@ RETURN this {
 } AS this
 ----
 
-'''
-
 == Where with null
 
 === Match with NULL in where
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies(where: {title: null}) {
@@ -390,12 +370,10 @@ RETURN this {
 } AS this
 ----
 
-'''
-
 == Simple NOT
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies(where: {NOT: {title: "some title"}}) {
@@ -422,12 +400,10 @@ RETURN this {
 } AS this
 ----
 
-'''
-
 == Simple NOT, implicit AND
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movies(where: {NOT: {title: "some title", isFavorite: false}}) {
@@ -455,6 +431,3 @@ RETURN this {
 	.title
 } AS this
 ----
-
-'''
-
diff --git a/core/src/test/resources/tck-test-files/cypher/v2/where.js.adoc b/core/src/test/resources/tck-test-files/cypher/v2/where.js.adoc
new file mode 100644
index 00000000..4812e98d
--- /dev/null
+++ b/core/src/test/resources/tck-test-files/cypher/v2/where.js.adoc
@@ -0,0 +1,402 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= Cypher WHERE
+
+== Setup
+
+.Schema
+[source,graphql,schema=true]
+----
+type Actor {
+  name: String
+  movies: [Movie!]! @relationship(type: "ACTED_IN", direction: OUT)
+}
+
+type Movie {
+  id: ID
+  title: String
+  actors: [Actor!]! @relationship(type: "ACTED_IN", direction: IN)
+  isFavorite: Boolean
+}
+----
+
+== Simple
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+query ($title: String, $isFavorite: Boolean) {
+  movies(where: {title: $title, isFavorite: $isFavorite}) {
+    title
+  }
+}
+----
+
+.GraphQL params input
+[source,json,request=true]
+----
+{
+  "title": "some title",
+  "isFavorite": true
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "some title",
+  "param1": true
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE (this.title = $param0 AND this.isFavorite = $param1)
+RETURN this { .title } AS this
+----
+
+== Simple AND
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies(where: {AND: [{title: "some title"}]}) {
+    title
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "some title"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE this.title = $param0
+RETURN this { .title } AS this
+----
+
+== Simple AND with multiple parameters
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies(where: {AND: [{title: "some title"}, {isFavorite: true}]}) {
+    title
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "some title",
+  "param1": true
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE (this.title = $param0 AND this.isFavorite = $param1)
+RETURN this { .title } AS this
+----
+
+== Nested AND
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies(where: {AND: [{AND: [{title: "some title"}]}]}) {
+    title
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "some title"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE this.title = $param0
+RETURN this { .title } AS this
+----
+
+== Nested AND with multiple properties
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies(where: {AND: [{AND: [{title: "some title"}, {title: "another title"}]}]}) {
+    title
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "some title",
+  "param1": "another title"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE (this.title = $param0 AND this.title = $param1)
+RETURN this { .title } AS this
+----
+
+== Nested AND and OR
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies(where: {AND: [{OR: [{title: "some title"}, {isFavorite: true}], id: 2}]}) {
+    title
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "2",
+  "param1": "some title",
+  "param2": true
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE (this.id = $param0 AND (this.title = $param1 OR this.isFavorite = $param2))
+RETURN this { .title } AS this
+----
+
+== Super Nested AND
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies(where: {AND: [{AND: [{AND: [{title: "some title"}]}]}]}) {
+    title
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "some title"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE this.title = $param0
+RETURN this { .title } AS this
+----
+
+== Simple OR
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies(where: {OR: [{title: "some title"}]}) {
+    title
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "some title"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE this.title = $param0
+RETURN this { .title } AS this
+----
+
+== Nested OR
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies(where: {OR: [{OR: [{title: "some title"}]}]}) {
+    title
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "some title"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE this.title = $param0
+RETURN this { .title } AS this
+----
+
+== Super Nested OR
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies(where: {OR: [{OR: [{OR: [{title: "some title"}]}]}]}) {
+    title
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "some title"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE this.title = $param0
+RETURN this { .title } AS this
+----
+
+== Where with null
+
+=== Match with NULL in where
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies(where: {title: null}) {
+    title
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE this.title IS NULL
+RETURN this { .title } AS this
+----
+
+== Simple NOT
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies(where: {NOT: {title: "some title"}}) {
+    title
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "some title"
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE NOT (this.title = $param0)
+RETURN this { .title } AS this
+----
+
+== Simple NOT, implicit AND
+
+.GraphQL-Query
+[source,graphql,request=true]
+----
+{
+  movies(where: {NOT: {title: "some title", isFavorite: false}}) {
+    title
+  }
+}
+----
+
+.Expected Cypher params
+[source,json]
+----
+{
+  "param0": "some title",
+  "param1": false
+}
+----
+
+.Expected Cypher output
+[source,cypher]
+----
+MATCH (this:Movie)
+WHERE NOT (this.title = $param0 AND this.isFavorite = $param1)
+RETURN this { .title } AS this
+----
diff --git a/core/src/test/resources/tck-test-files/cypher/where.adoc b/core/src/test/resources/tck-test-files/cypher/where.adoc
index b5b2c8a2..7bd826d2 100644
--- a/core/src/test/resources/tck-test-files/cypher/where.adoc
+++ b/core/src/test/resources/tck-test-files/cypher/where.adoc
@@ -36,7 +36,7 @@ type Movie {
 === Simple
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query($title: String, $isFavorite: Boolean) {
     movie(where: { title: $title, isFavorite: $isFavorite }) {
@@ -76,7 +76,7 @@ RETURN movie {
 === Simple AND
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
     movie(where: { AND: [{ title: "some title" }] }) {
@@ -108,7 +108,7 @@ RETURN movie {
 === Nested AND
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
     movie(where: { AND: [{ AND: [{ title: "some title" }] }] }) {
@@ -140,7 +140,7 @@ RETURN movie {
 === Super Nested AND
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
     movie(where: { AND: [{ AND: [{ AND: [{ title: "some title" }] }] }] }) {
@@ -172,7 +172,7 @@ RETURN movie {
 === Simple OR
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
     movie(where: { OR: [{ title: "some title" }] }) {
@@ -204,7 +204,7 @@ RETURN movie {
 === Nested OR
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
     movie(where: { OR: [{ OR: [{ title: "some title" }] }] }) {
@@ -236,7 +236,7 @@ RETURN movie {
 === Super Nested OR
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
     movie(where: { OR: [{ OR: [{ OR: [{ title: "some title" }] }] }] }) {
@@ -268,7 +268,7 @@ RETURN movie {
 === Simple IN
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
     movie(where: { title_in: ["some title"] }) {
diff --git a/core/src/test/resources/tck-test-files/schema/directives/ignore.adoc b/core/src/test/resources/tck-test-files/schema/directives/ignore.adoc
index 844b5ff1..5a31733c 100644
--- a/core/src/test/resources/tck-test-files/schema/directives/ignore.adoc
+++ b/core/src/test/resources/tck-test-files/schema/directives/ignore.adoc
@@ -30,7 +30,7 @@ type User {
 == Output
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
diff --git a/core/src/test/resources/tck-test-files/schema/relationship.adoc b/core/src/test/resources/tck-test-files/schema/relationship.adoc
index 46893427..8715bdc8 100644
--- a/core/src/test/resources/tck-test-files/schema/relationship.adoc
+++ b/core/src/test/resources/tck-test-files/schema/relationship.adoc
@@ -32,7 +32,7 @@ type Movie {
 == Output
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
diff --git a/core/src/test/resources/tck-test-files/schema/simple.adoc b/core/src/test/resources/tck-test-files/schema/simple.adoc
index ce90be9b..06f86eb8 100644
--- a/core/src/test/resources/tck-test-files/schema/simple.adoc
+++ b/core/src/test/resources/tck-test-files/schema/simple.adoc
@@ -30,7 +30,7 @@ type Movie {
 == Output
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
diff --git a/core/src/test/resources/tck-test-files/schema/types/arrays.adoc b/core/src/test/resources/tck-test-files/schema/types/arrays.adoc
index bf9cd9d1..933b8ef0 100644
--- a/core/src/test/resources/tck-test-files/schema/types/arrays.adoc
+++ b/core/src/test/resources/tck-test-files/schema/types/arrays.adoc
@@ -31,7 +31,7 @@ type Movie {
 == Output
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
diff --git a/core/src/test/resources/tck-test-files/schema/types/datetime.adoc b/core/src/test/resources/tck-test-files/schema/types/datetime.adoc
index 48b7e731..817389fc 100644
--- a/core/src/test/resources/tck-test-files/schema/types/datetime.adoc
+++ b/core/src/test/resources/tck-test-files/schema/types/datetime.adoc
@@ -31,7 +31,7 @@ type Movie {
 == Output
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
diff --git a/core/src/test/resources/tck-test-files/schema/v2/aggregations.adoc b/core/src/test/resources/tck-test-files/schema/v2/aggregations.adoc
index c9e68818..5d6b3d83 100644
--- a/core/src/test/resources/tck-test-files/schema/v2/aggregations.adoc
+++ b/core/src/test/resources/tck-test-files/schema/v2/aggregations.adoc
@@ -24,7 +24,7 @@ type Movie {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -187,8 +187,6 @@ input MovieWhere {
 
 ----
 
-'''
-
 == Where Level Aggregations
 
 .Schema
@@ -227,7 +225,7 @@ type Likes @relationshipProperties {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -559,6 +557,3 @@ input UserWhere {
 }
 
 ----
-
-'''
-
diff --git a/core/src/test/resources/tck-test-files/schema/v2/aggregations.js.adoc b/core/src/test/resources/tck-test-files/schema/v2/aggregations.js.adoc
new file mode 100644
index 00000000..c9a10e1b
--- /dev/null
+++ b/core/src/test/resources/tck-test-files/schema/v2/aggregations.js.adoc
@@ -0,0 +1,586 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= Aggregations
+
+== Top Level Aggregations
+
+.Schema
+[source,graphql,schema=true]
+----
+type Movie {
+  id: ID
+  isbn: String!
+  title: String
+  createdAt: DateTime
+  someTime: Time
+  someLocalTime: LocalTime
+  someLocalDateTime: LocalDateTime
+  imdbRating: Float
+  someInt: Int
+  someBigInt: BigInt
+  screenTime: Duration
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+"""
+A BigInt value up to 64 bits in size, which can be a number or a string if used inline, or a string only if used as a variable. Always returned as a string.
+"""
+scalar BigInt
+
+"""A date and time, represented as an ISO-8601 string"""
+scalar DateTime
+
+"""A duration, represented as an ISO 8601 duration string"""
+scalar Duration
+
+"""A local datetime, represented as 'YYYY-MM-DDTHH:MM:SS'"""
+scalar LocalDateTime
+
+"""
+A local time, represented as a time string without timezone information
+"""
+scalar LocalTime
+
+type Movie {
+  createdAt: DateTime
+  id: ID
+  imdbRating: Float
+  isbn: String!
+  screenTime: Duration
+  someBigInt: BigInt
+  someInt: Int
+  someLocalDateTime: LocalDateTime
+  someLocalTime: LocalTime
+  someTime: Time
+  title: String
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MovieSort!]
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
+"""
+input MovieSort {
+  createdAt: SortDirection
+  id: SortDirection
+  imdbRating: SortDirection
+  isbn: SortDirection
+  screenTime: SortDirection
+  someBigInt: SortDirection
+  someInt: SortDirection
+  someLocalDateTime: SortDirection
+  someLocalTime: SortDirection
+  someTime: SortDirection
+  title: SortDirection
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  createdAt: DateTime
+  createdAt_GT: DateTime
+  createdAt_GTE: DateTime
+  createdAt_IN: [DateTime]
+  createdAt_LT: DateTime
+  createdAt_LTE: DateTime
+  id: ID
+  id_CONTAINS: ID
+  id_ENDS_WITH: ID
+  id_IN: [ID]
+  id_STARTS_WITH: ID
+  imdbRating: Float
+  imdbRating_GT: Float
+  imdbRating_GTE: Float
+  imdbRating_IN: [Float]
+  imdbRating_LT: Float
+  imdbRating_LTE: Float
+  isbn: String
+  isbn_CONTAINS: String
+  isbn_ENDS_WITH: String
+  isbn_IN: [String!]
+  isbn_STARTS_WITH: String
+  screenTime: Duration
+  screenTime_GT: Duration
+  screenTime_GTE: Duration
+  screenTime_IN: [Duration]
+  screenTime_LT: Duration
+  screenTime_LTE: Duration
+  someBigInt: BigInt
+  someBigInt_GT: BigInt
+  someBigInt_GTE: BigInt
+  someBigInt_IN: [BigInt]
+  someBigInt_LT: BigInt
+  someBigInt_LTE: BigInt
+  someInt: Int
+  someInt_GT: Int
+  someInt_GTE: Int
+  someInt_IN: [Int]
+  someInt_LT: Int
+  someInt_LTE: Int
+  someLocalDateTime: LocalDateTime
+  someLocalDateTime_GT: LocalDateTime
+  someLocalDateTime_GTE: LocalDateTime
+  someLocalDateTime_IN: [LocalDateTime]
+  someLocalDateTime_LT: LocalDateTime
+  someLocalDateTime_LTE: LocalDateTime
+  someLocalTime: LocalTime
+  someLocalTime_GT: LocalTime
+  someLocalTime_GTE: LocalTime
+  someLocalTime_IN: [LocalTime]
+  someLocalTime_LT: LocalTime
+  someLocalTime_LTE: LocalTime
+  someTime: Time
+  someTime_GT: Time
+  someTime_GTE: Time
+  someTime_IN: [Time]
+  someTime_LT: Time
+  someTime_LTE: Time
+  title: String
+  title_CONTAINS: String
+  title_ENDS_WITH: String
+  title_IN: [String]
+  title_STARTS_WITH: String
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+type Query {
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+
+"""A time, represented as an RFC3339 time string"""
+scalar Time
+----
+
+== Where Level Aggregations
+
+.Schema
+[source,graphql,schema=true]
+----
+type User {
+  someId: ID
+  someString: String
+  someFloat: Float
+  someInt: Int
+  someBigInt: BigInt
+  someDateTime: DateTime
+  someLocalDateTime: LocalDateTime
+  someLocalTime: LocalTime
+  someTime: Time
+  someDuration: Duration
+}
+
+type Post {
+  title: String
+  likes: [User!]! @relationship(type: "LIKES", direction: IN, properties: "Likes")
+}
+
+type Likes @relationshipProperties {
+  someId: ID
+  someString: String
+  someFloat: Float
+  someInt: Int
+  someBigInt: BigInt
+  someDateTime: DateTime
+  someLocalDateTime: LocalDateTime
+  someLocalTime: LocalTime
+  someTime: Time
+  someDuration: Duration
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+"""
+A BigInt value up to 64 bits in size, which can be a number or a string if used inline, or a string only if used as a variable. Always returned as a string.
+"""
+scalar BigInt
+
+"""A date and time, represented as an ISO-8601 string"""
+scalar DateTime
+
+"""A duration, represented as an ISO 8601 duration string"""
+scalar Duration
+
+"""
+The edge properties for the following fields:
+* Post.likes
+"""
+type Likes {
+  someBigInt: BigInt
+  someDateTime: DateTime
+  someDuration: Duration
+  someFloat: Float
+  someId: ID
+  someInt: Int
+  someLocalDateTime: LocalDateTime
+  someLocalTime: LocalTime
+  someString: String
+  someTime: Time
+}
+
+input LikesSort {
+  someBigInt: SortDirection
+  someDateTime: SortDirection
+  someDuration: SortDirection
+  someFloat: SortDirection
+  someId: SortDirection
+  someInt: SortDirection
+  someLocalDateTime: SortDirection
+  someLocalTime: SortDirection
+  someString: SortDirection
+  someTime: SortDirection
+}
+
+input LikesWhere {
+  AND: [LikesWhere!]
+  NOT: LikesWhere
+  OR: [LikesWhere!]
+  someBigInt: BigInt
+  someBigInt_GT: BigInt
+  someBigInt_GTE: BigInt
+  someBigInt_IN: [BigInt]
+  someBigInt_LT: BigInt
+  someBigInt_LTE: BigInt
+  someDateTime: DateTime
+  someDateTime_GT: DateTime
+  someDateTime_GTE: DateTime
+  someDateTime_IN: [DateTime]
+  someDateTime_LT: DateTime
+  someDateTime_LTE: DateTime
+  someDuration: Duration
+  someDuration_GT: Duration
+  someDuration_GTE: Duration
+  someDuration_IN: [Duration]
+  someDuration_LT: Duration
+  someDuration_LTE: Duration
+  someFloat: Float
+  someFloat_GT: Float
+  someFloat_GTE: Float
+  someFloat_IN: [Float]
+  someFloat_LT: Float
+  someFloat_LTE: Float
+  someId: ID
+  someId_CONTAINS: ID
+  someId_ENDS_WITH: ID
+  someId_IN: [ID]
+  someId_STARTS_WITH: ID
+  someInt: Int
+  someInt_GT: Int
+  someInt_GTE: Int
+  someInt_IN: [Int]
+  someInt_LT: Int
+  someInt_LTE: Int
+  someLocalDateTime: LocalDateTime
+  someLocalDateTime_GT: LocalDateTime
+  someLocalDateTime_GTE: LocalDateTime
+  someLocalDateTime_IN: [LocalDateTime]
+  someLocalDateTime_LT: LocalDateTime
+  someLocalDateTime_LTE: LocalDateTime
+  someLocalTime: LocalTime
+  someLocalTime_GT: LocalTime
+  someLocalTime_GTE: LocalTime
+  someLocalTime_IN: [LocalTime]
+  someLocalTime_LT: LocalTime
+  someLocalTime_LTE: LocalTime
+  someString: String
+  someString_CONTAINS: String
+  someString_ENDS_WITH: String
+  someString_IN: [String]
+  someString_STARTS_WITH: String
+  someTime: Time
+  someTime_GT: Time
+  someTime_GTE: Time
+  someTime_IN: [Time]
+  someTime_LT: Time
+  someTime_LTE: Time
+}
+
+"""A local datetime, represented as 'YYYY-MM-DDTHH:MM:SS'"""
+scalar LocalDateTime
+
+"""
+A local time, represented as a time string without timezone information
+"""
+scalar LocalTime
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+type Post {
+  likes(directed: Boolean = true, options: UserOptions, where: UserWhere): [User!]!
+  likesConnection(after: String, directed: Boolean = true, first: Int, sort: [PostLikesConnectionSort!], where: PostLikesConnectionWhere): PostLikesConnection!
+  title: String
+}
+
+type PostEdge {
+  cursor: String!
+  node: Post!
+}
+
+type PostLikesConnection {
+  edges: [PostLikesRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input PostLikesConnectionSort {
+  edge: LikesSort
+  node: UserSort
+}
+
+input PostLikesConnectionWhere {
+  AND: [PostLikesConnectionWhere!]
+  NOT: PostLikesConnectionWhere
+  OR: [PostLikesConnectionWhere!]
+  edge: LikesWhere
+  node: UserWhere
+}
+
+type PostLikesRelationship {
+  cursor: String!
+  node: User!
+  properties: Likes!
+}
+
+input PostOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more PostSort objects to sort Posts by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [PostSort!]
+}
+
+"""
+Fields to sort Posts by. The order in which sorts are applied is not guaranteed when specifying many fields in one PostSort object.
+"""
+input PostSort {
+  title: SortDirection
+}
+
+input PostWhere {
+  AND: [PostWhere!]
+  NOT: PostWhere
+  OR: [PostWhere!]
+  """
+  Return Posts where all of the related PostLikesConnections match this filter
+  """
+  likesConnection_ALL: PostLikesConnectionWhere
+  """
+  Return Posts where none of the related PostLikesConnections match this filter
+  """
+  likesConnection_NONE: PostLikesConnectionWhere
+  """
+  Return Posts where one of the related PostLikesConnections match this filter
+  """
+  likesConnection_SINGLE: PostLikesConnectionWhere
+  """
+  Return Posts where some of the related PostLikesConnections match this filter
+  """
+  likesConnection_SOME: PostLikesConnectionWhere
+  """Return Posts where all of the related Users match this filter"""
+  likes_ALL: UserWhere
+  """Return Posts where none of the related Users match this filter"""
+  likes_NONE: UserWhere
+  """Return Posts where one of the related Users match this filter"""
+  likes_SINGLE: UserWhere
+  """Return Posts where some of the related Users match this filter"""
+  likes_SOME: UserWhere
+  title: String
+  title_CONTAINS: String
+  title_ENDS_WITH: String
+  title_IN: [String]
+  title_STARTS_WITH: String
+}
+
+type PostsConnection {
+  edges: [PostEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+type Query {
+  posts(options: PostOptions, where: PostWhere): [Post!]!
+  postsConnection(after: String, first: Int, sort: [PostSort], where: PostWhere): PostsConnection!
+  users(options: UserOptions, where: UserWhere): [User!]!
+  usersConnection(after: String, first: Int, sort: [UserSort], where: UserWhere): UsersConnection!
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+
+"""A time, represented as an RFC3339 time string"""
+scalar Time
+
+type User {
+  someBigInt: BigInt
+  someDateTime: DateTime
+  someDuration: Duration
+  someFloat: Float
+  someId: ID
+  someInt: Int
+  someLocalDateTime: LocalDateTime
+  someLocalTime: LocalTime
+  someString: String
+  someTime: Time
+}
+
+type UserEdge {
+  cursor: String!
+  node: User!
+}
+
+input UserOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more UserSort objects to sort Users by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [UserSort!]
+}
+
+"""
+Fields to sort Users by. The order in which sorts are applied is not guaranteed when specifying many fields in one UserSort object.
+"""
+input UserSort {
+  someBigInt: SortDirection
+  someDateTime: SortDirection
+  someDuration: SortDirection
+  someFloat: SortDirection
+  someId: SortDirection
+  someInt: SortDirection
+  someLocalDateTime: SortDirection
+  someLocalTime: SortDirection
+  someString: SortDirection
+  someTime: SortDirection
+}
+
+input UserWhere {
+  AND: [UserWhere!]
+  NOT: UserWhere
+  OR: [UserWhere!]
+  someBigInt: BigInt
+  someBigInt_GT: BigInt
+  someBigInt_GTE: BigInt
+  someBigInt_IN: [BigInt]
+  someBigInt_LT: BigInt
+  someBigInt_LTE: BigInt
+  someDateTime: DateTime
+  someDateTime_GT: DateTime
+  someDateTime_GTE: DateTime
+  someDateTime_IN: [DateTime]
+  someDateTime_LT: DateTime
+  someDateTime_LTE: DateTime
+  someDuration: Duration
+  someDuration_GT: Duration
+  someDuration_GTE: Duration
+  someDuration_IN: [Duration]
+  someDuration_LT: Duration
+  someDuration_LTE: Duration
+  someFloat: Float
+  someFloat_GT: Float
+  someFloat_GTE: Float
+  someFloat_IN: [Float]
+  someFloat_LT: Float
+  someFloat_LTE: Float
+  someId: ID
+  someId_CONTAINS: ID
+  someId_ENDS_WITH: ID
+  someId_IN: [ID]
+  someId_STARTS_WITH: ID
+  someInt: Int
+  someInt_GT: Int
+  someInt_GTE: Int
+  someInt_IN: [Int]
+  someInt_LT: Int
+  someInt_LTE: Int
+  someLocalDateTime: LocalDateTime
+  someLocalDateTime_GT: LocalDateTime
+  someLocalDateTime_GTE: LocalDateTime
+  someLocalDateTime_IN: [LocalDateTime]
+  someLocalDateTime_LT: LocalDateTime
+  someLocalDateTime_LTE: LocalDateTime
+  someLocalTime: LocalTime
+  someLocalTime_GT: LocalTime
+  someLocalTime_GTE: LocalTime
+  someLocalTime_IN: [LocalTime]
+  someLocalTime_LT: LocalTime
+  someLocalTime_LTE: LocalTime
+  someString: String
+  someString_CONTAINS: String
+  someString_ENDS_WITH: String
+  someString_IN: [String]
+  someString_STARTS_WITH: String
+  someTime: Time
+  someTime_GT: Time
+  someTime_GTE: Time
+  someTime_IN: [Time]
+  someTime_LT: Time
+  someTime_LTE: Time
+}
+
+type UsersConnection {
+  edges: [UserEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+----
diff --git a/core/src/test/resources/tck-test-files/schema/v2/array-methods.adoc b/core/src/test/resources/tck-test-files/schema/v2/array-methods.adoc
index 5e496779..7021e621 100644
--- a/core/src/test/resources/tck-test-files/schema/v2/array-methods.adoc
+++ b/core/src/test/resources/tck-test-files/schema/v2/array-methods.adoc
@@ -26,7 +26,7 @@ type ActedIn @relationshipProperties {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -250,6 +250,3 @@ input MovieWhere {
 }
 
 ----
-
-'''
-
diff --git a/core/src/test/resources/tck-test-files/schema/v2/array-methods.js.adoc b/core/src/test/resources/tck-test-files/schema/v2/array-methods.js.adoc
new file mode 100644
index 00000000..0073560d
--- /dev/null
+++ b/core/src/test/resources/tck-test-files/schema/v2/array-methods.js.adoc
@@ -0,0 +1,276 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= Arrays Methods
+
+== Array of Float and Array of Actor relationships
+
+.Schema
+[source,graphql,schema=true]
+----
+type Actor {
+  name: String
+  actedIn: [Movie!]! @relationship(type: "ACTED_IN", properties: "ActedIn", direction: OUT)
+}
+
+type Movie {
+  id: ID!
+  ratings: [Float!]!
+  actors: [Actor!]! @relationship(type: "ACTED_IN", properties: "ActedIn", direction: IN)
+  averageRating: Float!
+}
+
+type ActedIn @relationshipProperties {
+  pay: [Float]
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+"""
+The edge properties for the following fields:
+* Actor.actedIn
+* Movie.actors
+"""
+type ActedIn {
+  pay: [Float]
+}
+
+input ActedInSort {
+  pay: SortDirection
+}
+
+input ActedInWhere {
+  AND: [ActedInWhere!]
+  NOT: ActedInWhere
+  OR: [ActedInWhere!]
+  pay: [Float]
+  pay_INCLUDES: Float
+}
+
+type Actor {
+  actedIn(directed: Boolean = true, options: MovieOptions, where: MovieWhere): [Movie!]!
+  actedInConnection(after: String, directed: Boolean = true, first: Int, sort: [ActorActedInConnectionSort!], where: ActorActedInConnectionWhere): ActorActedInConnection!
+  name: String
+}
+
+type ActorActedInConnection {
+  edges: [ActorActedInRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input ActorActedInConnectionSort {
+  edge: ActedInSort
+  node: MovieSort
+}
+
+input ActorActedInConnectionWhere {
+  AND: [ActorActedInConnectionWhere!]
+  NOT: ActorActedInConnectionWhere
+  OR: [ActorActedInConnectionWhere!]
+  edge: ActedInWhere
+  node: MovieWhere
+}
+
+type ActorActedInRelationship {
+  cursor: String!
+  node: Movie!
+  properties: ActedIn!
+}
+
+type ActorEdge {
+  cursor: String!
+  node: Actor!
+}
+
+input ActorOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more ActorSort objects to sort Actors by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [ActorSort!]
+}
+
+"""
+Fields to sort Actors by. The order in which sorts are applied is not guaranteed when specifying many fields in one ActorSort object.
+"""
+input ActorSort {
+  name: SortDirection
+}
+
+input ActorWhere {
+  AND: [ActorWhere!]
+  NOT: ActorWhere
+  OR: [ActorWhere!]
+  """
+  Return Actors where all of the related ActorActedInConnections match this filter
+  """
+  actedInConnection_ALL: ActorActedInConnectionWhere
+  """
+  Return Actors where none of the related ActorActedInConnections match this filter
+  """
+  actedInConnection_NONE: ActorActedInConnectionWhere
+  """
+  Return Actors where one of the related ActorActedInConnections match this filter
+  """
+  actedInConnection_SINGLE: ActorActedInConnectionWhere
+  """
+  Return Actors where some of the related ActorActedInConnections match this filter
+  """
+  actedInConnection_SOME: ActorActedInConnectionWhere
+  """Return Actors where all of the related Movies match this filter"""
+  actedIn_ALL: MovieWhere
+  """Return Actors where none of the related Movies match this filter"""
+  actedIn_NONE: MovieWhere
+  """Return Actors where one of the related Movies match this filter"""
+  actedIn_SINGLE: MovieWhere
+  """Return Actors where some of the related Movies match this filter"""
+  actedIn_SOME: MovieWhere
+  name: String
+  name_CONTAINS: String
+  name_ENDS_WITH: String
+  name_IN: [String]
+  name_STARTS_WITH: String
+}
+
+type ActorsConnection {
+  edges: [ActorEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+type Movie {
+  actors(directed: Boolean = true, options: ActorOptions, where: ActorWhere): [Actor!]!
+  actorsConnection(after: String, directed: Boolean = true, first: Int, sort: [MovieActorsConnectionSort!], where: MovieActorsConnectionWhere): MovieActorsConnection!
+  averageRating: Float!
+  id: ID!
+  ratings: [Float!]!
+}
+
+type MovieActorsConnection {
+  edges: [MovieActorsRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input MovieActorsConnectionSort {
+  edge: ActedInSort
+  node: ActorSort
+}
+
+input MovieActorsConnectionWhere {
+  AND: [MovieActorsConnectionWhere!]
+  NOT: MovieActorsConnectionWhere
+  OR: [MovieActorsConnectionWhere!]
+  edge: ActedInWhere
+  node: ActorWhere
+}
+
+type MovieActorsRelationship {
+  cursor: String!
+  node: Actor!
+  properties: ActedIn!
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MovieSort!]
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
+"""
+input MovieSort {
+  averageRating: SortDirection
+  id: SortDirection
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  """
+  Return Movies where all of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_ALL: MovieActorsConnectionWhere
+  """
+  Return Movies where none of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_NONE: MovieActorsConnectionWhere
+  """
+  Return Movies where one of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SINGLE: MovieActorsConnectionWhere
+  """
+  Return Movies where some of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SOME: MovieActorsConnectionWhere
+  """Return Movies where all of the related Actors match this filter"""
+  actors_ALL: ActorWhere
+  """Return Movies where none of the related Actors match this filter"""
+  actors_NONE: ActorWhere
+  """Return Movies where one of the related Actors match this filter"""
+  actors_SINGLE: ActorWhere
+  """Return Movies where some of the related Actors match this filter"""
+  actors_SOME: ActorWhere
+  averageRating: Float
+  averageRating_GT: Float
+  averageRating_GTE: Float
+  averageRating_IN: [Float!]
+  averageRating_LT: Float
+  averageRating_LTE: Float
+  id: ID
+  id_CONTAINS: ID
+  id_ENDS_WITH: ID
+  id_IN: [ID!]
+  id_STARTS_WITH: ID
+  ratings: [Float!]
+  ratings_INCLUDES: Float
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+type Query {
+  actors(options: ActorOptions, where: ActorWhere): [Actor!]!
+  actorsConnection(after: String, first: Int, sort: [ActorSort], where: ActorWhere): ActorsConnection!
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
diff --git a/core/src/test/resources/tck-test-files/schema/v2/arrays.adoc b/core/src/test/resources/tck-test-files/schema/v2/arrays.adoc
index 7acd7f24..c058e029 100644
--- a/core/src/test/resources/tck-test-files/schema/v2/arrays.adoc
+++ b/core/src/test/resources/tck-test-files/schema/v2/arrays.adoc
@@ -16,7 +16,7 @@ type Movie {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -93,6 +93,3 @@ input MovieWhere {
 }
 
 ----
-
-'''
-
diff --git a/core/src/test/resources/tck-test-files/schema/v2/arrays.js.adoc b/core/src/test/resources/tck-test-files/schema/v2/arrays.js.adoc
new file mode 100644
index 00000000..32e8c06b
--- /dev/null
+++ b/core/src/test/resources/tck-test-files/schema/v2/arrays.js.adoc
@@ -0,0 +1,99 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= Arrays
+
+== Arrays
+
+.Schema
+[source,graphql,schema=true]
+----
+type Movie {
+  id: ID!
+  ratings: [Float!]!
+  averageRating: Float!
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+type Movie {
+  averageRating: Float!
+  id: ID!
+  ratings: [Float!]!
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MovieSort!]
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
+"""
+input MovieSort {
+  averageRating: SortDirection
+  id: SortDirection
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  averageRating: Float
+  averageRating_GT: Float
+  averageRating_GTE: Float
+  averageRating_IN: [Float!]
+  averageRating_LT: Float
+  averageRating_LTE: Float
+  id: ID
+  id_CONTAINS: ID
+  id_ENDS_WITH: ID
+  id_IN: [ID!]
+  id_STARTS_WITH: ID
+  ratings: [Float!]
+  ratings_INCLUDES: Float
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+type Query {
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
diff --git a/core/src/test/resources/tck-test-files/schema/v2/comments.adoc b/core/src/test/resources/tck-test-files/schema/v2/comments.adoc
index 50ec009b..bd8001ee 100644
--- a/core/src/test/resources/tck-test-files/schema/v2/comments.adoc
+++ b/core/src/test/resources/tck-test-files/schema/v2/comments.adoc
@@ -27,7 +27,7 @@ type Movie {
   averageRating: Float
   """
   Is the movie active?
-  
+
   This is measured based on annual profit.
   """
   isActive: Boolean
@@ -37,7 +37,7 @@ type Movie {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -149,8 +149,6 @@ input MovieWhere {
 
 ----
 
-'''
-
 == Relationship
 
 === Simple
@@ -170,7 +168,7 @@ type Movie {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -318,8 +316,6 @@ input MovieWhere {
 
 ----
 
-'''
-
 === Interface
 
 .Schema
@@ -351,7 +347,7 @@ type Actor {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -628,8 +624,6 @@ input SeriesWhere {
 
 ----
 
-'''
-
 === Unions
 
 .Schema
@@ -649,7 +643,7 @@ type Movie {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -818,6 +812,3 @@ input SearchWhere {
 }
 
 ----
-
-'''
-
diff --git a/core/src/test/resources/tck-test-files/schema/v2/comments.js.adoc b/core/src/test/resources/tck-test-files/schema/v2/comments.js.adoc
new file mode 100644
index 00000000..7b088b12
--- /dev/null
+++ b/core/src/test/resources/tck-test-files/schema/v2/comments.js.adoc
@@ -0,0 +1,871 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= Comments
+
+== Simple
+
+.Schema
+[source,graphql,schema=true]
+----
+"A custom scalar."
+scalar CustomScalar
+
+"An enumeration of movie genres."
+enum Genre {
+  ACTION
+  DRAMA
+  ROMANCE
+}
+
+"""A type describing a movie."""
+type Movie {
+  id: ID
+  "The number of actors who acted in the movie."
+  actorCount: Int
+  """The average rating for the movie."""
+  averageRating: Float
+  """
+  Is the movie active?
+  
+  This is measured based on annual profit.
+  """
+  isActive: Boolean
+  genre: Genre
+  customScalar: CustomScalar
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+"""A custom scalar."""
+scalar CustomScalar
+
+"""An enumeration of movie genres."""
+enum Genre {
+  ACTION
+  DRAMA
+  ROMANCE
+}
+
+"""A type describing a movie."""
+type Movie {
+  """The number of actors who acted in the movie."""
+  actorCount: Int
+  """The average rating for the movie."""
+  averageRating: Float
+  customScalar: CustomScalar
+  genre: Genre
+  id: ID
+  """
+  Is the movie active?
+  
+  This is measured based on annual profit.
+  """
+  isActive: Boolean
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MovieSort!]
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
+"""
+input MovieSort {
+  actorCount: SortDirection
+  averageRating: SortDirection
+  customScalar: SortDirection
+  genre: SortDirection
+  id: SortDirection
+  isActive: SortDirection
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  actorCount: Int
+  actorCount_GT: Int
+  actorCount_GTE: Int
+  actorCount_IN: [Int]
+  actorCount_LT: Int
+  actorCount_LTE: Int
+  averageRating: Float
+  averageRating_GT: Float
+  averageRating_GTE: Float
+  averageRating_IN: [Float]
+  averageRating_LT: Float
+  averageRating_LTE: Float
+  customScalar: CustomScalar
+  customScalar_IN: [CustomScalar]
+  genre: Genre
+  genre_IN: [Genre]
+  id: ID
+  id_CONTAINS: ID
+  id_ENDS_WITH: ID
+  id_IN: [ID]
+  id_STARTS_WITH: ID
+  isActive: Boolean
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+type Query {
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
+
+== Relationship
+
+=== Simple
+
+.Schema
+[source,graphql,schema=true]
+----
+type Actor {
+  name: String
+}
+
+type Movie {
+  id: ID
+  "Actors in Movie"
+  actors: [Actor!]! @relationship(type: "ACTED_IN", direction: IN)
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+type Actor {
+  name: String
+}
+
+type ActorEdge {
+  cursor: String!
+  node: Actor!
+}
+
+input ActorOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more ActorSort objects to sort Actors by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [ActorSort!]
+}
+
+"""
+Fields to sort Actors by. The order in which sorts are applied is not guaranteed when specifying many fields in one ActorSort object.
+"""
+input ActorSort {
+  name: SortDirection
+}
+
+input ActorWhere {
+  AND: [ActorWhere!]
+  NOT: ActorWhere
+  OR: [ActorWhere!]
+  name: String
+  name_CONTAINS: String
+  name_ENDS_WITH: String
+  name_IN: [String]
+  name_STARTS_WITH: String
+}
+
+type ActorsConnection {
+  edges: [ActorEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+type Movie {
+  """Actors in Movie"""
+  actors(directed: Boolean = true, options: ActorOptions, where: ActorWhere): [Actor!]!
+  actorsConnection(after: String, directed: Boolean = true, first: Int, sort: [MovieActorsConnectionSort!], where: MovieActorsConnectionWhere): MovieActorsConnection!
+  id: ID
+}
+
+type MovieActorsConnection {
+  edges: [MovieActorsRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input MovieActorsConnectionSort {
+  node: ActorSort
+}
+
+input MovieActorsConnectionWhere {
+  AND: [MovieActorsConnectionWhere!]
+  NOT: MovieActorsConnectionWhere
+  OR: [MovieActorsConnectionWhere!]
+  node: ActorWhere
+}
+
+type MovieActorsRelationship {
+  cursor: String!
+  node: Actor!
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MovieSort!]
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
+"""
+input MovieSort {
+  id: SortDirection
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  """
+  Return Movies where all of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_ALL: MovieActorsConnectionWhere
+  """
+  Return Movies where none of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_NONE: MovieActorsConnectionWhere
+  """
+  Return Movies where one of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SINGLE: MovieActorsConnectionWhere
+  """
+  Return Movies where some of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SOME: MovieActorsConnectionWhere
+  """Return Movies where all of the related Actors match this filter"""
+  actors_ALL: ActorWhere
+  """Return Movies where none of the related Actors match this filter"""
+  actors_NONE: ActorWhere
+  """Return Movies where one of the related Actors match this filter"""
+  actors_SINGLE: ActorWhere
+  """Return Movies where some of the related Actors match this filter"""
+  actors_SOME: ActorWhere
+  id: ID
+  id_CONTAINS: ID
+  id_ENDS_WITH: ID
+  id_IN: [ID]
+  id_STARTS_WITH: ID
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+type Query {
+  actors(options: ActorOptions, where: ActorWhere): [Actor!]!
+  actorsConnection(after: String, first: Int, sort: [ActorSort], where: ActorWhere): ActorsConnection!
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
+
+=== Interface
+
+.Schema
+[source,graphql,schema=true]
+----
+interface Production {
+  title: String!
+}
+
+type Movie implements Production {
+  title: String!
+  runtime: Int!
+}
+
+type Series implements Production {
+  title: String!
+  episodes: Int!
+}
+
+type ActedIn @relationshipProperties {
+  screenTime: Int!
+}
+
+type Actor {
+  name: String!
+  "Acted in Production"
+  actedIn: [Production!]! @relationship(type: "ACTED_IN", direction: OUT, properties: "ActedIn")
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+"""
+The edge properties for the following fields:
+* Actor.actedIn
+"""
+type ActedIn {
+  screenTime: Int!
+}
+
+input ActedInSort {
+  screenTime: SortDirection
+}
+
+input ActedInWhere {
+  AND: [ActedInWhere!]
+  NOT: ActedInWhere
+  OR: [ActedInWhere!]
+  screenTime: Int
+  screenTime_GT: Int
+  screenTime_GTE: Int
+  screenTime_IN: [Int!]
+  screenTime_LT: Int
+  screenTime_LTE: Int
+}
+
+type Actor {
+  """Acted in Production"""
+  actedIn(directed: Boolean = true, options: ProductionOptions, where: ProductionWhere): [Production!]!
+  actedInConnection(after: String, directed: Boolean = true, first: Int, sort: [ActorActedInConnectionSort!], where: ActorActedInConnectionWhere): ActorActedInConnection!
+  name: String!
+}
+
+type ActorActedInConnection {
+  edges: [ActorActedInRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input ActorActedInConnectionSort {
+  edge: ActedInSort
+  node: ProductionSort
+}
+
+input ActorActedInConnectionWhere {
+  AND: [ActorActedInConnectionWhere!]
+  NOT: ActorActedInConnectionWhere
+  OR: [ActorActedInConnectionWhere!]
+  edge: ActedInWhere
+  node: ProductionWhere
+}
+
+type ActorActedInRelationship {
+  cursor: String!
+  node: Production!
+  properties: ActedIn!
+}
+
+type ActorEdge {
+  cursor: String!
+  node: Actor!
+}
+
+input ActorOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more ActorSort objects to sort Actors by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [ActorSort!]
+}
+
+"""
+Fields to sort Actors by. The order in which sorts are applied is not guaranteed when specifying many fields in one ActorSort object.
+"""
+input ActorSort {
+  name: SortDirection
+}
+
+input ActorWhere {
+  AND: [ActorWhere!]
+  NOT: ActorWhere
+  OR: [ActorWhere!]
+  """
+  Return Actors where all of the related ActorActedInConnections match this filter
+  """
+  actedInConnection_ALL: ActorActedInConnectionWhere
+  """
+  Return Actors where none of the related ActorActedInConnections match this filter
+  """
+  actedInConnection_NONE: ActorActedInConnectionWhere
+  """
+  Return Actors where one of the related ActorActedInConnections match this filter
+  """
+  actedInConnection_SINGLE: ActorActedInConnectionWhere
+  """
+  Return Actors where some of the related ActorActedInConnections match this filter
+  """
+  actedInConnection_SOME: ActorActedInConnectionWhere
+  """Return Actors where all of the related Productions match this filter"""
+  actedIn_ALL: ProductionWhere
+  """Return Actors where none of the related Productions match this filter"""
+  actedIn_NONE: ProductionWhere
+  """Return Actors where one of the related Productions match this filter"""
+  actedIn_SINGLE: ProductionWhere
+  """Return Actors where some of the related Productions match this filter"""
+  actedIn_SOME: ProductionWhere
+  name: String
+  name_CONTAINS: String
+  name_ENDS_WITH: String
+  name_IN: [String!]
+  name_STARTS_WITH: String
+}
+
+type ActorsConnection {
+  edges: [ActorEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+type Movie implements Production {
+  runtime: Int!
+  title: String!
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MovieSort!]
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
+"""
+input MovieSort {
+  runtime: SortDirection
+  title: SortDirection
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  runtime: Int
+  runtime_GT: Int
+  runtime_GTE: Int
+  runtime_IN: [Int!]
+  runtime_LT: Int
+  runtime_LTE: Int
+  title: String
+  title_CONTAINS: String
+  title_ENDS_WITH: String
+  title_IN: [String!]
+  title_STARTS_WITH: String
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+interface Production {
+  title: String!
+}
+
+type ProductionEdge {
+  cursor: String!
+  node: Production!
+}
+
+enum ProductionImplementation {
+  Movie
+  Series
+}
+
+input ProductionOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more ProductionSort objects to sort Productions by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [ProductionSort]
+}
+
+"""
+Fields to sort Productions by. The order in which sorts are applied is not guaranteed when specifying many fields in one ProductionSort object.
+"""
+input ProductionSort {
+  title: SortDirection
+}
+
+input ProductionWhere {
+  AND: [ProductionWhere!]
+  NOT: ProductionWhere
+  OR: [ProductionWhere!]
+  title: String
+  title_CONTAINS: String
+  title_ENDS_WITH: String
+  title_IN: [String!]
+  title_STARTS_WITH: String
+  typename_IN: [ProductionImplementation!]
+}
+
+type ProductionsConnection {
+  edges: [ProductionEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+type Query {
+  actors(options: ActorOptions, where: ActorWhere): [Actor!]!
+  actorsConnection(after: String, first: Int, sort: [ActorSort], where: ActorWhere): ActorsConnection!
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+  productions(options: ProductionOptions, where: ProductionWhere): [Production!]!
+  productionsConnection(after: String, first: Int, sort: [ProductionSort], where: ProductionWhere): ProductionsConnection!
+  series(options: SeriesOptions, where: SeriesWhere): [Series!]!
+  seriesConnection(after: String, first: Int, sort: [SeriesSort], where: SeriesWhere): SeriesConnection!
+}
+
+type Series implements Production {
+  episodes: Int!
+  title: String!
+}
+
+type SeriesConnection {
+  edges: [SeriesEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+type SeriesEdge {
+  cursor: String!
+  node: Series!
+}
+
+input SeriesOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more SeriesSort objects to sort Series by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [SeriesSort!]
+}
+
+"""
+Fields to sort Series by. The order in which sorts are applied is not guaranteed when specifying many fields in one SeriesSort object.
+"""
+input SeriesSort {
+  episodes: SortDirection
+  title: SortDirection
+}
+
+input SeriesWhere {
+  AND: [SeriesWhere!]
+  NOT: SeriesWhere
+  OR: [SeriesWhere!]
+  episodes: Int
+  episodes_GT: Int
+  episodes_GTE: Int
+  episodes_IN: [Int!]
+  episodes_LT: Int
+  episodes_LTE: Int
+  title: String
+  title_CONTAINS: String
+  title_ENDS_WITH: String
+  title_IN: [String!]
+  title_STARTS_WITH: String
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
+
+=== Unions
+
+.Schema
+[source,graphql,schema=true]
+----
+union Search = Movie | Genre
+
+type Genre {
+  id: ID
+}
+
+type Movie {
+  id: ID
+  search: [Search!]! @relationship(type: "SEARCH", direction: OUT)
+  searchNoDirective: Search
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+type Genre {
+  id: ID
+}
+
+type GenreEdge {
+  cursor: String!
+  node: Genre!
+}
+
+input GenreOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more GenreSort objects to sort Genres by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [GenreSort!]
+}
+
+"""
+Fields to sort Genres by. The order in which sorts are applied is not guaranteed when specifying many fields in one GenreSort object.
+"""
+input GenreSort {
+  id: SortDirection
+}
+
+input GenreWhere {
+  AND: [GenreWhere!]
+  NOT: GenreWhere
+  OR: [GenreWhere!]
+  id: ID
+  id_CONTAINS: ID
+  id_ENDS_WITH: ID
+  id_IN: [ID]
+  id_STARTS_WITH: ID
+}
+
+type GenresConnection {
+  edges: [GenreEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+type Movie {
+  id: ID
+  search(directed: Boolean = true, options: QueryOptions, where: SearchWhere): [Search!]!
+  searchConnection(after: String, directed: Boolean = true, first: Int, where: MovieSearchConnectionWhere): MovieSearchConnection!
+  searchNoDirective: Search
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MovieSort!]
+}
+
+type MovieSearchConnection {
+  edges: [MovieSearchRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input MovieSearchConnectionWhere {
+  Genre: MovieSearchGenreConnectionWhere
+  Movie: MovieSearchMovieConnectionWhere
+}
+
+input MovieSearchGenreConnectionWhere {
+  AND: [MovieSearchGenreConnectionWhere!]
+  NOT: MovieSearchGenreConnectionWhere
+  OR: [MovieSearchGenreConnectionWhere!]
+  node: GenreWhere
+}
+
+input MovieSearchMovieConnectionWhere {
+  AND: [MovieSearchMovieConnectionWhere!]
+  NOT: MovieSearchMovieConnectionWhere
+  OR: [MovieSearchMovieConnectionWhere!]
+  node: MovieWhere
+}
+
+type MovieSearchRelationship {
+  cursor: String!
+  node: Search!
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
+"""
+input MovieSort {
+  id: SortDirection
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  id: ID
+  id_CONTAINS: ID
+  id_ENDS_WITH: ID
+  id_IN: [ID]
+  id_STARTS_WITH: ID
+  """
+  Return Movies where all of the related MovieSearchConnections match this filter
+  """
+  searchConnection_ALL: MovieSearchConnectionWhere
+  """
+  Return Movies where none of the related MovieSearchConnections match this filter
+  """
+  searchConnection_NONE: MovieSearchConnectionWhere
+  """
+  Return Movies where one of the related MovieSearchConnections match this filter
+  """
+  searchConnection_SINGLE: MovieSearchConnectionWhere
+  """
+  Return Movies where some of the related MovieSearchConnections match this filter
+  """
+  searchConnection_SOME: MovieSearchConnectionWhere
+  """Return Movies where all of the related Searches match this filter"""
+  search_ALL: SearchWhere
+  """Return Movies where none of the related Searches match this filter"""
+  search_NONE: SearchWhere
+  """Return Movies where one of the related Searches match this filter"""
+  search_SINGLE: SearchWhere
+  """Return Movies where some of the related Searches match this filter"""
+  search_SOME: SearchWhere
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+type Query {
+  genres(options: GenreOptions, where: GenreWhere): [Genre!]!
+  genresConnection(after: String, first: Int, sort: [GenreSort], where: GenreWhere): GenresConnection!
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+  searches(options: QueryOptions, where: SearchWhere): [Search!]!
+}
+
+"""Input type for options that can be specified on a query operation."""
+input QueryOptions {
+  limit: Int
+  offset: Int
+}
+
+union Search = Genre | Movie
+
+input SearchWhere {
+  Genre: GenreWhere
+  Movie: MovieWhere
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
diff --git a/core/src/test/resources/tck-test-files/schema/v2/connections/enums.adoc b/core/src/test/resources/tck-test-files/schema/v2/connections/enums.adoc
index ee7f46cb..91162098 100644
--- a/core/src/test/resources/tck-test-files/schema/v2/connections/enums.adoc
+++ b/core/src/test/resources/tck-test-files/schema/v2/connections/enums.adoc
@@ -29,7 +29,7 @@ type ActedIn @relationshipProperties {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -247,6 +247,3 @@ input MovieWhere {
 }
 
 ----
-
-'''
-
diff --git a/core/src/test/resources/integration-test-files/relationship-properties/error-if-missing-relationship-properties.adoc b/core/src/test/resources/tck-test-files/schema/v2/connections/enums.js.adoc
similarity index 92%
rename from core/src/test/resources/integration-test-files/relationship-properties/error-if-missing-relationship-properties.adoc
rename to core/src/test/resources/tck-test-files/schema/v2/connections/enums.js.adoc
index 8a5a8690..76581161 100644
--- a/core/src/test/resources/integration-test-files/relationship-properties/error-if-missing-relationship-properties.adoc
+++ b/core/src/test/resources/tck-test-files/schema/v2/connections/enums.js.adoc
@@ -1,30 +1,36 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
 :toc:
 :toclevels: 42
 
-= Throw error if missing @relationshipProperties
+= Enums
 
-== should not throw error if the @relationshipProperties directive is used
+== Enum Relationship Properties
 
 .Schema
 [source,graphql,schema=true]
 ----
+type Actor {
+  name: String!
+  movies: [Movie!]! @relationship(type: "ACTED_IN", direction: OUT, properties: "ActedIn")
+}
+
 type Movie {
   title: String!
-  actors: [Actor!]! @relationship(type: "ACTED_IN", properties: "ActedIn", direction: IN)
+  actors: [Actor!]! @relationship(type: "ACTED_IN", direction: IN, properties: "ActedIn")
 }
 
-type Actor {
-  name: String!
-  movies: [Movie!]! @relationship(type: "ACTED_IN", properties: "ActedIn", direction: OUT)
+enum RoleType {
+  LEADING
+  SUPPORTING
 }
 
 type ActedIn @relationshipProperties {
-  screenTime: Int!
+  roleType: RoleType!
 }
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -32,27 +38,23 @@ schema {
 
 """
 The edge properties for the following fields:
-* Movie.actors
 * Actor.movies
+* Movie.actors
 """
 type ActedIn {
-  screenTime: Int!
+  roleType: RoleType!
 }
 
 input ActedInSort {
-  screenTime: SortDirection
+  roleType: SortDirection
 }
 
 input ActedInWhere {
   AND: [ActedInWhere!]
   NOT: ActedInWhere
   OR: [ActedInWhere!]
-  screenTime: Int
-  screenTime_GT: Int
-  screenTime_GTE: Int
-  screenTime_IN: [Int!]
-  screenTime_LT: Int
-  screenTime_LTE: Int
+  roleType: RoleType
+  roleType_IN: [RoleType!]
 }
 
 type Actor {
@@ -256,6 +258,11 @@ type Query {
   moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
 }
 
+enum RoleType {
+  LEADING
+  SUPPORTING
+}
+
 """An enum for sorting in either ascending or descending order."""
 enum SortDirection {
   """Sort by field values in ascending order."""
@@ -264,6 +271,3 @@ enum SortDirection {
   DESC
 }
 ----
-
-'''
-
diff --git a/core/src/test/resources/tck-test-files/schema/v2/connections/sort.adoc b/core/src/test/resources/tck-test-files/schema/v2/connections/sort.adoc
index 12717512..5997162f 100644
--- a/core/src/test/resources/tck-test-files/schema/v2/connections/sort.adoc
+++ b/core/src/test/resources/tck-test-files/schema/v2/connections/sort.adoc
@@ -19,7 +19,7 @@ type Node2 {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -188,6 +188,3 @@ input Node2Where {
 }
 
 ----
-
-'''
-
diff --git a/core/src/test/resources/tck-test-files/schema/v2/connections/sort.js.adoc b/core/src/test/resources/tck-test-files/schema/v2/connections/sort.js.adoc
new file mode 100644
index 00000000..e4ba1234
--- /dev/null
+++ b/core/src/test/resources/tck-test-files/schema/v2/connections/sort.js.adoc
@@ -0,0 +1,210 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= Sort
+
+== sort argument is not present when nothing to sort
+
+.Schema
+[source,graphql,schema=true]
+----
+type Node1 {
+  property: String!
+  relatedTo: [Node2!]! @relationship(type: "RELATED_TO", direction: OUT)
+}
+
+type Node2 {
+  relatedTo: [Node1!]! @relationship(type: "RELATED_TO", direction: OUT)
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+type Node1 {
+  property: String!
+  relatedTo(directed: Boolean = true, options: Node2Options, where: Node2Where): [Node2!]!
+  relatedToConnection(after: String, directed: Boolean = true, first: Int, where: Node1RelatedToConnectionWhere): Node1RelatedToConnection!
+}
+
+type Node1Edge {
+  cursor: String!
+  node: Node1!
+}
+
+input Node1Options {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more Node1Sort objects to sort Node1s by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [Node1Sort!]
+}
+
+type Node1RelatedToConnection {
+  edges: [Node1RelatedToRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input Node1RelatedToConnectionWhere {
+  AND: [Node1RelatedToConnectionWhere!]
+  NOT: Node1RelatedToConnectionWhere
+  OR: [Node1RelatedToConnectionWhere!]
+  node: Node2Where
+}
+
+type Node1RelatedToRelationship {
+  cursor: String!
+  node: Node2!
+}
+
+"""
+Fields to sort Node1s by. The order in which sorts are applied is not guaranteed when specifying many fields in one Node1Sort object.
+"""
+input Node1Sort {
+  property: SortDirection
+}
+
+input Node1Where {
+  AND: [Node1Where!]
+  NOT: Node1Where
+  OR: [Node1Where!]
+  property: String
+  property_CONTAINS: String
+  property_ENDS_WITH: String
+  property_IN: [String!]
+  property_STARTS_WITH: String
+  """
+  Return Node1s where all of the related Node1RelatedToConnections match this filter
+  """
+  relatedToConnection_ALL: Node1RelatedToConnectionWhere
+  """
+  Return Node1s where none of the related Node1RelatedToConnections match this filter
+  """
+  relatedToConnection_NONE: Node1RelatedToConnectionWhere
+  """
+  Return Node1s where one of the related Node1RelatedToConnections match this filter
+  """
+  relatedToConnection_SINGLE: Node1RelatedToConnectionWhere
+  """
+  Return Node1s where some of the related Node1RelatedToConnections match this filter
+  """
+  relatedToConnection_SOME: Node1RelatedToConnectionWhere
+  """Return Node1s where all of the related Node2s match this filter"""
+  relatedTo_ALL: Node2Where
+  """Return Node1s where none of the related Node2s match this filter"""
+  relatedTo_NONE: Node2Where
+  """Return Node1s where one of the related Node2s match this filter"""
+  relatedTo_SINGLE: Node2Where
+  """Return Node1s where some of the related Node2s match this filter"""
+  relatedTo_SOME: Node2Where
+}
+
+type Node1sConnection {
+  edges: [Node1Edge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+type Node2 {
+  relatedTo(directed: Boolean = true, options: Node1Options, where: Node1Where): [Node1!]!
+  relatedToConnection(after: String, directed: Boolean = true, first: Int, sort: [Node2RelatedToConnectionSort!], where: Node2RelatedToConnectionWhere): Node2RelatedToConnection!
+}
+
+type Node2Edge {
+  cursor: String!
+  node: Node2!
+}
+
+input Node2Options {
+  limit: Int
+  offset: Int
+}
+
+type Node2RelatedToConnection {
+  edges: [Node2RelatedToRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input Node2RelatedToConnectionSort {
+  node: Node1Sort
+}
+
+input Node2RelatedToConnectionWhere {
+  AND: [Node2RelatedToConnectionWhere!]
+  NOT: Node2RelatedToConnectionWhere
+  OR: [Node2RelatedToConnectionWhere!]
+  node: Node1Where
+}
+
+type Node2RelatedToRelationship {
+  cursor: String!
+  node: Node1!
+}
+
+input Node2Where {
+  AND: [Node2Where!]
+  NOT: Node2Where
+  OR: [Node2Where!]
+  """
+  Return Node2s where all of the related Node2RelatedToConnections match this filter
+  """
+  relatedToConnection_ALL: Node2RelatedToConnectionWhere
+  """
+  Return Node2s where none of the related Node2RelatedToConnections match this filter
+  """
+  relatedToConnection_NONE: Node2RelatedToConnectionWhere
+  """
+  Return Node2s where one of the related Node2RelatedToConnections match this filter
+  """
+  relatedToConnection_SINGLE: Node2RelatedToConnectionWhere
+  """
+  Return Node2s where some of the related Node2RelatedToConnections match this filter
+  """
+  relatedToConnection_SOME: Node2RelatedToConnectionWhere
+  """Return Node2s where all of the related Node1s match this filter"""
+  relatedTo_ALL: Node1Where
+  """Return Node2s where none of the related Node1s match this filter"""
+  relatedTo_NONE: Node1Where
+  """Return Node2s where one of the related Node1s match this filter"""
+  relatedTo_SINGLE: Node1Where
+  """Return Node2s where some of the related Node1s match this filter"""
+  relatedTo_SOME: Node1Where
+}
+
+type Node2sConnection {
+  edges: [Node2Edge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+type Query {
+  node1s(options: Node1Options, where: Node1Where): [Node1!]!
+  node1sConnection(after: String, first: Int, sort: [Node1Sort], where: Node1Where): Node1sConnection!
+  node2s(options: Node2Options, where: Node2Where): [Node2!]!
+  node2sConnection(after: String, first: Int, where: Node2Where): Node2sConnection!
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
diff --git a/core/src/test/resources/tck-test-files/schema/v2/connections/unions.adoc b/core/src/test/resources/tck-test-files/schema/v2/connections/unions.adoc
index 55ab0ccd..ca8ec4f4 100644
--- a/core/src/test/resources/tck-test-files/schema/v2/connections/unions.adoc
+++ b/core/src/test/resources/tck-test-files/schema/v2/connections/unions.adoc
@@ -31,7 +31,7 @@ type Wrote @relationshipProperties {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -358,6 +358,3 @@ input WroteWhere {
 }
 
 ----
-
-'''
-
diff --git a/core/src/test/resources/tck-test-files/schema/v2/connections/unions.js.adoc b/core/src/test/resources/tck-test-files/schema/v2/connections/unions.js.adoc
new file mode 100644
index 00000000..c347d1e5
--- /dev/null
+++ b/core/src/test/resources/tck-test-files/schema/v2/connections/unions.js.adoc
@@ -0,0 +1,400 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= Unions
+
+== Relationship Properties
+
+.Schema
+[source,graphql,schema=true]
+----
+union Publication = Book | Journal
+
+type Author {
+  name: String!
+  publications: [Publication!]! @relationship(type: "WROTE", direction: OUT, properties: "Wrote")
+}
+
+type Book {
+  title: String!
+  author: [Author!]! @relationship(type: "WROTE", direction: IN, properties: "Wrote")
+}
+
+type Journal {
+  subject: String!
+  author: [Author!]! @relationship(type: "WROTE", direction: IN, properties: "Wrote")
+}
+
+type Wrote @relationshipProperties {
+  words: Int!
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+type Author {
+  name: String!
+  publications(directed: Boolean = true, options: QueryOptions, where: PublicationWhere): [Publication!]!
+  publicationsConnection(after: String, directed: Boolean = true, first: Int, sort: [AuthorPublicationsConnectionSort!], where: AuthorPublicationsConnectionWhere): AuthorPublicationsConnection!
+}
+
+type AuthorEdge {
+  cursor: String!
+  node: Author!
+}
+
+input AuthorOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more AuthorSort objects to sort Authors by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [AuthorSort!]
+}
+
+input AuthorPublicationsBookConnectionWhere {
+  AND: [AuthorPublicationsBookConnectionWhere!]
+  NOT: AuthorPublicationsBookConnectionWhere
+  OR: [AuthorPublicationsBookConnectionWhere!]
+  edge: WroteWhere
+  node: BookWhere
+}
+
+type AuthorPublicationsConnection {
+  edges: [AuthorPublicationsRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input AuthorPublicationsConnectionSort {
+  edge: WroteSort
+}
+
+input AuthorPublicationsConnectionWhere {
+  Book: AuthorPublicationsBookConnectionWhere
+  Journal: AuthorPublicationsJournalConnectionWhere
+}
+
+input AuthorPublicationsJournalConnectionWhere {
+  AND: [AuthorPublicationsJournalConnectionWhere!]
+  NOT: AuthorPublicationsJournalConnectionWhere
+  OR: [AuthorPublicationsJournalConnectionWhere!]
+  edge: WroteWhere
+  node: JournalWhere
+}
+
+type AuthorPublicationsRelationship {
+  cursor: String!
+  node: Publication!
+  properties: Wrote!
+}
+
+"""
+Fields to sort Authors by. The order in which sorts are applied is not guaranteed when specifying many fields in one AuthorSort object.
+"""
+input AuthorSort {
+  name: SortDirection
+}
+
+input AuthorWhere {
+  AND: [AuthorWhere!]
+  NOT: AuthorWhere
+  OR: [AuthorWhere!]
+  name: String
+  name_CONTAINS: String
+  name_ENDS_WITH: String
+  name_IN: [String!]
+  name_STARTS_WITH: String
+  """
+  Return Authors where all of the related AuthorPublicationsConnections match this filter
+  """
+  publicationsConnection_ALL: AuthorPublicationsConnectionWhere
+  """
+  Return Authors where none of the related AuthorPublicationsConnections match this filter
+  """
+  publicationsConnection_NONE: AuthorPublicationsConnectionWhere
+  """
+  Return Authors where one of the related AuthorPublicationsConnections match this filter
+  """
+  publicationsConnection_SINGLE: AuthorPublicationsConnectionWhere
+  """
+  Return Authors where some of the related AuthorPublicationsConnections match this filter
+  """
+  publicationsConnection_SOME: AuthorPublicationsConnectionWhere
+  """Return Authors where all of the related Publications match this filter"""
+  publications_ALL: PublicationWhere
+  """
+  Return Authors where none of the related Publications match this filter
+  """
+  publications_NONE: PublicationWhere
+  """Return Authors where one of the related Publications match this filter"""
+  publications_SINGLE: PublicationWhere
+  """
+  Return Authors where some of the related Publications match this filter
+  """
+  publications_SOME: PublicationWhere
+}
+
+type AuthorsConnection {
+  edges: [AuthorEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+type Book {
+  author(directed: Boolean = true, options: AuthorOptions, where: AuthorWhere): [Author!]!
+  authorConnection(after: String, directed: Boolean = true, first: Int, sort: [BookAuthorConnectionSort!], where: BookAuthorConnectionWhere): BookAuthorConnection!
+  title: String!
+}
+
+type BookAuthorConnection {
+  edges: [BookAuthorRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input BookAuthorConnectionSort {
+  edge: WroteSort
+  node: AuthorSort
+}
+
+input BookAuthorConnectionWhere {
+  AND: [BookAuthorConnectionWhere!]
+  NOT: BookAuthorConnectionWhere
+  OR: [BookAuthorConnectionWhere!]
+  edge: WroteWhere
+  node: AuthorWhere
+}
+
+type BookAuthorRelationship {
+  cursor: String!
+  node: Author!
+  properties: Wrote!
+}
+
+type BookEdge {
+  cursor: String!
+  node: Book!
+}
+
+input BookOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more BookSort objects to sort Books by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [BookSort!]
+}
+
+"""
+Fields to sort Books by. The order in which sorts are applied is not guaranteed when specifying many fields in one BookSort object.
+"""
+input BookSort {
+  title: SortDirection
+}
+
+input BookWhere {
+  AND: [BookWhere!]
+  NOT: BookWhere
+  OR: [BookWhere!]
+  """
+  Return Books where all of the related BookAuthorConnections match this filter
+  """
+  authorConnection_ALL: BookAuthorConnectionWhere
+  """
+  Return Books where none of the related BookAuthorConnections match this filter
+  """
+  authorConnection_NONE: BookAuthorConnectionWhere
+  """
+  Return Books where one of the related BookAuthorConnections match this filter
+  """
+  authorConnection_SINGLE: BookAuthorConnectionWhere
+  """
+  Return Books where some of the related BookAuthorConnections match this filter
+  """
+  authorConnection_SOME: BookAuthorConnectionWhere
+  """Return Books where all of the related Authors match this filter"""
+  author_ALL: AuthorWhere
+  """Return Books where none of the related Authors match this filter"""
+  author_NONE: AuthorWhere
+  """Return Books where one of the related Authors match this filter"""
+  author_SINGLE: AuthorWhere
+  """Return Books where some of the related Authors match this filter"""
+  author_SOME: AuthorWhere
+  title: String
+  title_CONTAINS: String
+  title_ENDS_WITH: String
+  title_IN: [String!]
+  title_STARTS_WITH: String
+}
+
+type BooksConnection {
+  edges: [BookEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+type Journal {
+  author(directed: Boolean = true, options: AuthorOptions, where: AuthorWhere): [Author!]!
+  authorConnection(after: String, directed: Boolean = true, first: Int, sort: [JournalAuthorConnectionSort!], where: JournalAuthorConnectionWhere): JournalAuthorConnection!
+  subject: String!
+}
+
+type JournalAuthorConnection {
+  edges: [JournalAuthorRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input JournalAuthorConnectionSort {
+  edge: WroteSort
+  node: AuthorSort
+}
+
+input JournalAuthorConnectionWhere {
+  AND: [JournalAuthorConnectionWhere!]
+  NOT: JournalAuthorConnectionWhere
+  OR: [JournalAuthorConnectionWhere!]
+  edge: WroteWhere
+  node: AuthorWhere
+}
+
+type JournalAuthorRelationship {
+  cursor: String!
+  node: Author!
+  properties: Wrote!
+}
+
+type JournalEdge {
+  cursor: String!
+  node: Journal!
+}
+
+input JournalOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more JournalSort objects to sort Journals by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [JournalSort!]
+}
+
+"""
+Fields to sort Journals by. The order in which sorts are applied is not guaranteed when specifying many fields in one JournalSort object.
+"""
+input JournalSort {
+  subject: SortDirection
+}
+
+input JournalWhere {
+  AND: [JournalWhere!]
+  NOT: JournalWhere
+  OR: [JournalWhere!]
+  """
+  Return Journals where all of the related JournalAuthorConnections match this filter
+  """
+  authorConnection_ALL: JournalAuthorConnectionWhere
+  """
+  Return Journals where none of the related JournalAuthorConnections match this filter
+  """
+  authorConnection_NONE: JournalAuthorConnectionWhere
+  """
+  Return Journals where one of the related JournalAuthorConnections match this filter
+  """
+  authorConnection_SINGLE: JournalAuthorConnectionWhere
+  """
+  Return Journals where some of the related JournalAuthorConnections match this filter
+  """
+  authorConnection_SOME: JournalAuthorConnectionWhere
+  """Return Journals where all of the related Authors match this filter"""
+  author_ALL: AuthorWhere
+  """Return Journals where none of the related Authors match this filter"""
+  author_NONE: AuthorWhere
+  """Return Journals where one of the related Authors match this filter"""
+  author_SINGLE: AuthorWhere
+  """Return Journals where some of the related Authors match this filter"""
+  author_SOME: AuthorWhere
+  subject: String
+  subject_CONTAINS: String
+  subject_ENDS_WITH: String
+  subject_IN: [String!]
+  subject_STARTS_WITH: String
+}
+
+type JournalsConnection {
+  edges: [JournalEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+union Publication = Book | Journal
+
+input PublicationWhere {
+  Book: BookWhere
+  Journal: JournalWhere
+}
+
+type Query {
+  authors(options: AuthorOptions, where: AuthorWhere): [Author!]!
+  authorsConnection(after: String, first: Int, sort: [AuthorSort], where: AuthorWhere): AuthorsConnection!
+  books(options: BookOptions, where: BookWhere): [Book!]!
+  booksConnection(after: String, first: Int, sort: [BookSort], where: BookWhere): BooksConnection!
+  journals(options: JournalOptions, where: JournalWhere): [Journal!]!
+  journalsConnection(after: String, first: Int, sort: [JournalSort], where: JournalWhere): JournalsConnection!
+  publications(options: QueryOptions, where: PublicationWhere): [Publication!]!
+}
+
+"""Input type for options that can be specified on a query operation."""
+input QueryOptions {
+  limit: Int
+  offset: Int
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+
+"""
+The edge properties for the following fields:
+* Author.publications
+* Book.author
+* Journal.author
+"""
+type Wrote {
+  words: Int!
+}
+
+input WroteSort {
+  words: SortDirection
+}
+
+input WroteWhere {
+  AND: [WroteWhere!]
+  NOT: WroteWhere
+  OR: [WroteWhere!]
+  words: Int
+  words_GT: Int
+  words_GTE: Int
+  words_IN: [Int!]
+  words_LT: Int
+  words_LTE: Int
+}
+----
diff --git a/core/src/test/resources/tck-test-files/schema/v2/directive-preserve.adoc b/core/src/test/resources/tck-test-files/schema/v2/directive-preserve.adoc
index d97261a2..15e36644 100644
--- a/core/src/test/resources/tck-test-files/schema/v2/directive-preserve.adoc
+++ b/core/src/test/resources/tck-test-files/schema/v2/directive-preserve.adoc
@@ -18,7 +18,7 @@ type Movie @preservedTopLevel {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -89,8 +89,6 @@ input MovieWhere {
 
 ----
 
-'''
-
 == Directives on relations preserved
 
 .Schema
@@ -110,7 +108,7 @@ type Genre {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -313,8 +311,6 @@ input MovieWhere {
 
 ----
 
-'''
-
 == Directives on implemented interface relations preserved - field not declared relationship
 
 .Schema
@@ -348,7 +344,7 @@ type Actor {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -712,8 +708,6 @@ input SeriesWhere {
 
 ----
 
-'''
-
 == Directives on base interface preserved
 
 .Schema
@@ -747,7 +741,7 @@ type Actor {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -1111,8 +1105,6 @@ input SeriesWhere {
 
 ----
 
-'''
-
 == Directives on unions preserved
 
 .Schema
@@ -1136,7 +1128,7 @@ type User {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -1384,6 +1376,3 @@ input UserWhere {
 }
 
 ----
-
-'''
-
diff --git a/core/src/test/resources/tck-test-files/schema/v2/directive-preserve.js.adoc b/core/src/test/resources/tck-test-files/schema/v2/directive-preserve.js.adoc
new file mode 100644
index 00000000..ac195bb3
--- /dev/null
+++ b/core/src/test/resources/tck-test-files/schema/v2/directive-preserve.js.adoc
@@ -0,0 +1,1510 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= Directive-preserve
+
+== Custom directives preserved
+
+.Schema
+[source,graphql,schema=true]
+----
+directive @preservedTopLevel(string: String, int: Int, float: Float, boolean: Boolean) on OBJECT
+
+directive @preservedFieldLevel(string: String, int: Int, float: Float, boolean: Boolean) on FIELD_DEFINITION
+
+type Movie @preservedTopLevel {
+  id: ID @preservedFieldLevel(string: "str", int: 12, float: 1.2, boolean: true)
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+directive @preservedFieldLevel(boolean: Boolean, float: Float, int: Int, string: String) on FIELD_DEFINITION
+
+directive @preservedTopLevel(boolean: Boolean, float: Float, int: Int, string: String) on OBJECT
+
+type Movie @preservedTopLevel {
+  id: ID @preservedFieldLevel(string: "str", int: 12, float: 1.2, boolean: true)
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MovieSort!]
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
+"""
+input MovieSort {
+  id: SortDirection
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  id: ID
+  id_CONTAINS: ID
+  id_ENDS_WITH: ID
+  id_IN: [ID]
+  id_STARTS_WITH: ID
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+type Query {
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
+
+== Directives on relations preserved
+
+.Schema
+[source,graphql,schema=true]
+----
+type Movie {
+  title: String
+  year: Int
+  imdbRating: Float
+  genres: [Genre!]! @relationship(type: "IN_GENRE", direction: OUT) @deprecated(reason: "Do not use")
+}
+
+type Genre {
+  name: String
+  movies: [Movie!]! @relationship(type: "IN_GENRE", direction: IN)
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+type Genre {
+  movies(directed: Boolean = true, options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, directed: Boolean = true, first: Int, sort: [GenreMoviesConnectionSort!], where: GenreMoviesConnectionWhere): GenreMoviesConnection!
+  name: String
+}
+
+type GenreEdge {
+  cursor: String!
+  node: Genre!
+}
+
+type GenreMoviesConnection {
+  edges: [GenreMoviesRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input GenreMoviesConnectionSort {
+  node: MovieSort
+}
+
+input GenreMoviesConnectionWhere {
+  AND: [GenreMoviesConnectionWhere!]
+  NOT: GenreMoviesConnectionWhere
+  OR: [GenreMoviesConnectionWhere!]
+  node: MovieWhere
+}
+
+type GenreMoviesRelationship {
+  cursor: String!
+  node: Movie!
+}
+
+input GenreOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more GenreSort objects to sort Genres by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [GenreSort!]
+}
+
+"""
+Fields to sort Genres by. The order in which sorts are applied is not guaranteed when specifying many fields in one GenreSort object.
+"""
+input GenreSort {
+  name: SortDirection
+}
+
+input GenreWhere {
+  AND: [GenreWhere!]
+  NOT: GenreWhere
+  OR: [GenreWhere!]
+  """
+  Return Genres where all of the related GenreMoviesConnections match this filter
+  """
+  moviesConnection_ALL: GenreMoviesConnectionWhere
+  """
+  Return Genres where none of the related GenreMoviesConnections match this filter
+  """
+  moviesConnection_NONE: GenreMoviesConnectionWhere
+  """
+  Return Genres where one of the related GenreMoviesConnections match this filter
+  """
+  moviesConnection_SINGLE: GenreMoviesConnectionWhere
+  """
+  Return Genres where some of the related GenreMoviesConnections match this filter
+  """
+  moviesConnection_SOME: GenreMoviesConnectionWhere
+  """Return Genres where all of the related Movies match this filter"""
+  movies_ALL: MovieWhere
+  """Return Genres where none of the related Movies match this filter"""
+  movies_NONE: MovieWhere
+  """Return Genres where one of the related Movies match this filter"""
+  movies_SINGLE: MovieWhere
+  """Return Genres where some of the related Movies match this filter"""
+  movies_SOME: MovieWhere
+  name: String
+  name_CONTAINS: String
+  name_ENDS_WITH: String
+  name_IN: [String]
+  name_STARTS_WITH: String
+}
+
+type GenresConnection {
+  edges: [GenreEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+type Movie {
+  genres(directed: Boolean = true, options: GenreOptions, where: GenreWhere): [Genre!]! @deprecated(reason: "Do not use")
+  genresConnection(after: String, directed: Boolean = true, first: Int, sort: [MovieGenresConnectionSort!], where: MovieGenresConnectionWhere): MovieGenresConnection! @deprecated(reason: "Do not use")
+  imdbRating: Float
+  title: String
+  year: Int
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+type MovieGenresConnection {
+  edges: [MovieGenresRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input MovieGenresConnectionSort {
+  node: GenreSort
+}
+
+input MovieGenresConnectionWhere {
+  AND: [MovieGenresConnectionWhere!]
+  NOT: MovieGenresConnectionWhere
+  OR: [MovieGenresConnectionWhere!]
+  node: GenreWhere
+}
+
+type MovieGenresRelationship {
+  cursor: String!
+  node: Genre!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MovieSort!]
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
+"""
+input MovieSort {
+  imdbRating: SortDirection
+  title: SortDirection
+  year: SortDirection
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  """
+  Return Movies where all of the related MovieGenresConnections match this filter
+  """
+  genresConnection_ALL: MovieGenresConnectionWhere @deprecated(reason: "Do not use")
+  """
+  Return Movies where none of the related MovieGenresConnections match this filter
+  """
+  genresConnection_NONE: MovieGenresConnectionWhere @deprecated(reason: "Do not use")
+  """
+  Return Movies where one of the related MovieGenresConnections match this filter
+  """
+  genresConnection_SINGLE: MovieGenresConnectionWhere @deprecated(reason: "Do not use")
+  """
+  Return Movies where some of the related MovieGenresConnections match this filter
+  """
+  genresConnection_SOME: MovieGenresConnectionWhere @deprecated(reason: "Do not use")
+  """Return Movies where all of the related Genres match this filter"""
+  genres_ALL: GenreWhere @deprecated(reason: "Do not use")
+  """Return Movies where none of the related Genres match this filter"""
+  genres_NONE: GenreWhere @deprecated(reason: "Do not use")
+  """Return Movies where one of the related Genres match this filter"""
+  genres_SINGLE: GenreWhere @deprecated(reason: "Do not use")
+  """Return Movies where some of the related Genres match this filter"""
+  genres_SOME: GenreWhere @deprecated(reason: "Do not use")
+  imdbRating: Float
+  imdbRating_GT: Float
+  imdbRating_GTE: Float
+  imdbRating_IN: [Float]
+  imdbRating_LT: Float
+  imdbRating_LTE: Float
+  title: String
+  title_CONTAINS: String
+  title_ENDS_WITH: String
+  title_IN: [String]
+  title_STARTS_WITH: String
+  year: Int
+  year_GT: Int
+  year_GTE: Int
+  year_IN: [Int]
+  year_LT: Int
+  year_LTE: Int
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+type Query {
+  genres(options: GenreOptions, where: GenreWhere): [Genre!]!
+  genresConnection(after: String, first: Int, sort: [GenreSort], where: GenreWhere): GenresConnection!
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
+
+== Directives on implemented interface relations preserved - field not declared relationship
+
+.Schema
+[source,graphql,schema=true]
+----
+interface Production {
+  title: String!
+  actors: [Actor!]!
+}
+
+type Movie implements Production {
+  title: String!
+  actors: [Actor!]! @relationship(type: "ACTED_IN", direction: IN, properties: "ActedIn") @deprecated(reason: "Do not use")
+  runtime: Int!
+}
+
+type Series implements Production {
+  title: String!
+  actors: [Actor!]! @relationship(type: "ACTED_IN", direction: IN, properties: "ActedIn")
+  episodes: Int!
+}
+
+type ActedIn @relationshipProperties {
+  role: String!
+}
+
+type Actor {
+  name: String!
+  actedIn: [Production!]! @relationship(type: "ACTED_IN", direction: OUT, properties: "ActedIn")
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+"""
+The edge properties for the following fields:
+* Movie.actors
+* Series.actors
+* Actor.actedIn
+"""
+type ActedIn {
+  role: String!
+}
+
+input ActedInSort {
+  role: SortDirection
+}
+
+input ActedInWhere {
+  AND: [ActedInWhere!]
+  NOT: ActedInWhere
+  OR: [ActedInWhere!]
+  role: String
+  role_CONTAINS: String
+  role_ENDS_WITH: String
+  role_IN: [String!]
+  role_STARTS_WITH: String
+}
+
+type Actor {
+  actedIn(directed: Boolean = true, options: ProductionOptions, where: ProductionWhere): [Production!]!
+  actedInConnection(after: String, directed: Boolean = true, first: Int, sort: [ActorActedInConnectionSort!], where: ActorActedInConnectionWhere): ActorActedInConnection!
+  name: String!
+}
+
+type ActorActedInConnection {
+  edges: [ActorActedInRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input ActorActedInConnectionSort {
+  edge: ActedInSort
+  node: ProductionSort
+}
+
+input ActorActedInConnectionWhere {
+  AND: [ActorActedInConnectionWhere!]
+  NOT: ActorActedInConnectionWhere
+  OR: [ActorActedInConnectionWhere!]
+  edge: ActedInWhere
+  node: ProductionWhere
+}
+
+type ActorActedInRelationship {
+  cursor: String!
+  node: Production!
+  properties: ActedIn!
+}
+
+type ActorEdge {
+  cursor: String!
+  node: Actor!
+}
+
+input ActorOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more ActorSort objects to sort Actors by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [ActorSort!]
+}
+
+"""
+Fields to sort Actors by. The order in which sorts are applied is not guaranteed when specifying many fields in one ActorSort object.
+"""
+input ActorSort {
+  name: SortDirection
+}
+
+input ActorWhere {
+  AND: [ActorWhere!]
+  NOT: ActorWhere
+  OR: [ActorWhere!]
+  """
+  Return Actors where all of the related ActorActedInConnections match this filter
+  """
+  actedInConnection_ALL: ActorActedInConnectionWhere
+  """
+  Return Actors where none of the related ActorActedInConnections match this filter
+  """
+  actedInConnection_NONE: ActorActedInConnectionWhere
+  """
+  Return Actors where one of the related ActorActedInConnections match this filter
+  """
+  actedInConnection_SINGLE: ActorActedInConnectionWhere
+  """
+  Return Actors where some of the related ActorActedInConnections match this filter
+  """
+  actedInConnection_SOME: ActorActedInConnectionWhere
+  """Return Actors where all of the related Productions match this filter"""
+  actedIn_ALL: ProductionWhere
+  """Return Actors where none of the related Productions match this filter"""
+  actedIn_NONE: ProductionWhere
+  """Return Actors where one of the related Productions match this filter"""
+  actedIn_SINGLE: ProductionWhere
+  """Return Actors where some of the related Productions match this filter"""
+  actedIn_SOME: ProductionWhere
+  name: String
+  name_CONTAINS: String
+  name_ENDS_WITH: String
+  name_IN: [String!]
+  name_STARTS_WITH: String
+}
+
+type ActorsConnection {
+  edges: [ActorEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+type Movie implements Production {
+  actors(directed: Boolean = true, options: ActorOptions, where: ActorWhere): [Actor!]! @deprecated(reason: "Do not use")
+  actorsConnection(after: String, directed: Boolean = true, first: Int, sort: [MovieActorsConnectionSort!], where: MovieActorsConnectionWhere): MovieActorsConnection! @deprecated(reason: "Do not use")
+  runtime: Int!
+  title: String!
+}
+
+type MovieActorsConnection {
+  edges: [MovieActorsRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input MovieActorsConnectionSort {
+  edge: ActedInSort
+  node: ActorSort
+}
+
+input MovieActorsConnectionWhere {
+  AND: [MovieActorsConnectionWhere!]
+  NOT: MovieActorsConnectionWhere
+  OR: [MovieActorsConnectionWhere!]
+  edge: ActedInWhere
+  node: ActorWhere
+}
+
+type MovieActorsRelationship {
+  cursor: String!
+  node: Actor!
+  properties: ActedIn!
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MovieSort!]
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
+"""
+input MovieSort {
+  runtime: SortDirection
+  title: SortDirection
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  """
+  Return Movies where all of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_ALL: MovieActorsConnectionWhere @deprecated(reason: "Do not use")
+  """
+  Return Movies where none of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_NONE: MovieActorsConnectionWhere @deprecated(reason: "Do not use")
+  """
+  Return Movies where one of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SINGLE: MovieActorsConnectionWhere @deprecated(reason: "Do not use")
+  """
+  Return Movies where some of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SOME: MovieActorsConnectionWhere @deprecated(reason: "Do not use")
+  """Return Movies where all of the related Actors match this filter"""
+  actors_ALL: ActorWhere @deprecated(reason: "Do not use")
+  """Return Movies where none of the related Actors match this filter"""
+  actors_NONE: ActorWhere @deprecated(reason: "Do not use")
+  """Return Movies where one of the related Actors match this filter"""
+  actors_SINGLE: ActorWhere @deprecated(reason: "Do not use")
+  """Return Movies where some of the related Actors match this filter"""
+  actors_SOME: ActorWhere @deprecated(reason: "Do not use")
+  runtime: Int
+  runtime_GT: Int
+  runtime_GTE: Int
+  runtime_IN: [Int!]
+  runtime_LT: Int
+  runtime_LTE: Int
+  title: String
+  title_CONTAINS: String
+  title_ENDS_WITH: String
+  title_IN: [String!]
+  title_STARTS_WITH: String
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+interface Production {
+  actors: [Actor!]!
+  title: String!
+}
+
+type ProductionEdge {
+  cursor: String!
+  node: Production!
+}
+
+enum ProductionImplementation {
+  Movie
+  Series
+}
+
+input ProductionOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more ProductionSort objects to sort Productions by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [ProductionSort]
+}
+
+"""
+Fields to sort Productions by. The order in which sorts are applied is not guaranteed when specifying many fields in one ProductionSort object.
+"""
+input ProductionSort {
+  title: SortDirection
+}
+
+input ProductionWhere {
+  AND: [ProductionWhere!]
+  NOT: ProductionWhere
+  OR: [ProductionWhere!]
+  title: String
+  title_CONTAINS: String
+  title_ENDS_WITH: String
+  title_IN: [String!]
+  title_STARTS_WITH: String
+  typename_IN: [ProductionImplementation!]
+}
+
+type ProductionsConnection {
+  edges: [ProductionEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+type Query {
+  actors(options: ActorOptions, where: ActorWhere): [Actor!]!
+  actorsConnection(after: String, first: Int, sort: [ActorSort], where: ActorWhere): ActorsConnection!
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+  productions(options: ProductionOptions, where: ProductionWhere): [Production!]!
+  productionsConnection(after: String, first: Int, sort: [ProductionSort], where: ProductionWhere): ProductionsConnection!
+  series(options: SeriesOptions, where: SeriesWhere): [Series!]!
+  seriesConnection(after: String, first: Int, sort: [SeriesSort], where: SeriesWhere): SeriesConnection!
+}
+
+type Series implements Production {
+  actors(directed: Boolean = true, options: ActorOptions, where: ActorWhere): [Actor!]!
+  actorsConnection(after: String, directed: Boolean = true, first: Int, sort: [SeriesActorsConnectionSort!], where: SeriesActorsConnectionWhere): SeriesActorsConnection!
+  episodes: Int!
+  title: String!
+}
+
+type SeriesActorsConnection {
+  edges: [SeriesActorsRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input SeriesActorsConnectionSort {
+  edge: ActedInSort
+  node: ActorSort
+}
+
+input SeriesActorsConnectionWhere {
+  AND: [SeriesActorsConnectionWhere!]
+  NOT: SeriesActorsConnectionWhere
+  OR: [SeriesActorsConnectionWhere!]
+  edge: ActedInWhere
+  node: ActorWhere
+}
+
+type SeriesActorsRelationship {
+  cursor: String!
+  node: Actor!
+  properties: ActedIn!
+}
+
+type SeriesConnection {
+  edges: [SeriesEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+type SeriesEdge {
+  cursor: String!
+  node: Series!
+}
+
+input SeriesOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more SeriesSort objects to sort Series by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [SeriesSort!]
+}
+
+"""
+Fields to sort Series by. The order in which sorts are applied is not guaranteed when specifying many fields in one SeriesSort object.
+"""
+input SeriesSort {
+  episodes: SortDirection
+  title: SortDirection
+}
+
+input SeriesWhere {
+  AND: [SeriesWhere!]
+  NOT: SeriesWhere
+  OR: [SeriesWhere!]
+  """
+  Return Series where all of the related SeriesActorsConnections match this filter
+  """
+  actorsConnection_ALL: SeriesActorsConnectionWhere
+  """
+  Return Series where none of the related SeriesActorsConnections match this filter
+  """
+  actorsConnection_NONE: SeriesActorsConnectionWhere
+  """
+  Return Series where one of the related SeriesActorsConnections match this filter
+  """
+  actorsConnection_SINGLE: SeriesActorsConnectionWhere
+  """
+  Return Series where some of the related SeriesActorsConnections match this filter
+  """
+  actorsConnection_SOME: SeriesActorsConnectionWhere
+  """Return Series where all of the related Actors match this filter"""
+  actors_ALL: ActorWhere
+  """Return Series where none of the related Actors match this filter"""
+  actors_NONE: ActorWhere
+  """Return Series where one of the related Actors match this filter"""
+  actors_SINGLE: ActorWhere
+  """Return Series where some of the related Actors match this filter"""
+  actors_SOME: ActorWhere
+  episodes: Int
+  episodes_GT: Int
+  episodes_GTE: Int
+  episodes_IN: [Int!]
+  episodes_LT: Int
+  episodes_LTE: Int
+  title: String
+  title_CONTAINS: String
+  title_ENDS_WITH: String
+  title_IN: [String!]
+  title_STARTS_WITH: String
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
+
+== Directives on base interface preserved
+
+.Schema
+[source,graphql,schema=true]
+----
+interface Production {
+  title: String!
+  actors: [Actor!]! @deprecated(reason: "Do not use")
+}
+
+type Movie implements Production {
+  title: String!
+  actors: [Actor!]! @relationship(type: "ACTED_IN", direction: IN, properties: "ActedIn")
+  runtime: Int!
+}
+
+type Series implements Production {
+  title: String!
+  actors: [Actor!]! @relationship(type: "ACTED_IN", direction: IN, properties: "ActedIn")
+  episodes: Int!
+}
+
+type ActedIn @relationshipProperties {
+  role: String!
+}
+
+type Actor {
+  name: String!
+  actedIn: [Production!]! @relationship(type: "ACTED_IN", direction: OUT, properties: "ActedIn")
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+"""
+The edge properties for the following fields:
+* Movie.actors
+* Series.actors
+* Actor.actedIn
+"""
+type ActedIn {
+  role: String!
+}
+
+input ActedInSort {
+  role: SortDirection
+}
+
+input ActedInWhere {
+  AND: [ActedInWhere!]
+  NOT: ActedInWhere
+  OR: [ActedInWhere!]
+  role: String
+  role_CONTAINS: String
+  role_ENDS_WITH: String
+  role_IN: [String!]
+  role_STARTS_WITH: String
+}
+
+type Actor {
+  actedIn(directed: Boolean = true, options: ProductionOptions, where: ProductionWhere): [Production!]!
+  actedInConnection(after: String, directed: Boolean = true, first: Int, sort: [ActorActedInConnectionSort!], where: ActorActedInConnectionWhere): ActorActedInConnection!
+  name: String!
+}
+
+type ActorActedInConnection {
+  edges: [ActorActedInRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input ActorActedInConnectionSort {
+  edge: ActedInSort
+  node: ProductionSort
+}
+
+input ActorActedInConnectionWhere {
+  AND: [ActorActedInConnectionWhere!]
+  NOT: ActorActedInConnectionWhere
+  OR: [ActorActedInConnectionWhere!]
+  edge: ActedInWhere
+  node: ProductionWhere
+}
+
+type ActorActedInRelationship {
+  cursor: String!
+  node: Production!
+  properties: ActedIn!
+}
+
+type ActorEdge {
+  cursor: String!
+  node: Actor!
+}
+
+input ActorOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more ActorSort objects to sort Actors by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [ActorSort!]
+}
+
+"""
+Fields to sort Actors by. The order in which sorts are applied is not guaranteed when specifying many fields in one ActorSort object.
+"""
+input ActorSort {
+  name: SortDirection
+}
+
+input ActorWhere {
+  AND: [ActorWhere!]
+  NOT: ActorWhere
+  OR: [ActorWhere!]
+  """
+  Return Actors where all of the related ActorActedInConnections match this filter
+  """
+  actedInConnection_ALL: ActorActedInConnectionWhere
+  """
+  Return Actors where none of the related ActorActedInConnections match this filter
+  """
+  actedInConnection_NONE: ActorActedInConnectionWhere
+  """
+  Return Actors where one of the related ActorActedInConnections match this filter
+  """
+  actedInConnection_SINGLE: ActorActedInConnectionWhere
+  """
+  Return Actors where some of the related ActorActedInConnections match this filter
+  """
+  actedInConnection_SOME: ActorActedInConnectionWhere
+  """Return Actors where all of the related Productions match this filter"""
+  actedIn_ALL: ProductionWhere
+  """Return Actors where none of the related Productions match this filter"""
+  actedIn_NONE: ProductionWhere
+  """Return Actors where one of the related Productions match this filter"""
+  actedIn_SINGLE: ProductionWhere
+  """Return Actors where some of the related Productions match this filter"""
+  actedIn_SOME: ProductionWhere
+  name: String
+  name_CONTAINS: String
+  name_ENDS_WITH: String
+  name_IN: [String!]
+  name_STARTS_WITH: String
+}
+
+type ActorsConnection {
+  edges: [ActorEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+type Movie implements Production {
+  actors(directed: Boolean = true, options: ActorOptions, where: ActorWhere): [Actor!]!
+  actorsConnection(after: String, directed: Boolean = true, first: Int, sort: [MovieActorsConnectionSort!], where: MovieActorsConnectionWhere): MovieActorsConnection!
+  runtime: Int!
+  title: String!
+}
+
+type MovieActorsConnection {
+  edges: [MovieActorsRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input MovieActorsConnectionSort {
+  edge: ActedInSort
+  node: ActorSort
+}
+
+input MovieActorsConnectionWhere {
+  AND: [MovieActorsConnectionWhere!]
+  NOT: MovieActorsConnectionWhere
+  OR: [MovieActorsConnectionWhere!]
+  edge: ActedInWhere
+  node: ActorWhere
+}
+
+type MovieActorsRelationship {
+  cursor: String!
+  node: Actor!
+  properties: ActedIn!
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MovieSort!]
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
+"""
+input MovieSort {
+  runtime: SortDirection
+  title: SortDirection
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  """
+  Return Movies where all of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_ALL: MovieActorsConnectionWhere
+  """
+  Return Movies where none of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_NONE: MovieActorsConnectionWhere
+  """
+  Return Movies where one of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SINGLE: MovieActorsConnectionWhere
+  """
+  Return Movies where some of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SOME: MovieActorsConnectionWhere
+  """Return Movies where all of the related Actors match this filter"""
+  actors_ALL: ActorWhere
+  """Return Movies where none of the related Actors match this filter"""
+  actors_NONE: ActorWhere
+  """Return Movies where one of the related Actors match this filter"""
+  actors_SINGLE: ActorWhere
+  """Return Movies where some of the related Actors match this filter"""
+  actors_SOME: ActorWhere
+  runtime: Int
+  runtime_GT: Int
+  runtime_GTE: Int
+  runtime_IN: [Int!]
+  runtime_LT: Int
+  runtime_LTE: Int
+  title: String
+  title_CONTAINS: String
+  title_ENDS_WITH: String
+  title_IN: [String!]
+  title_STARTS_WITH: String
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+interface Production {
+  actors: [Actor!]! @deprecated(reason: "Do not use")
+  title: String!
+}
+
+type ProductionEdge {
+  cursor: String!
+  node: Production!
+}
+
+enum ProductionImplementation {
+  Movie
+  Series
+}
+
+input ProductionOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more ProductionSort objects to sort Productions by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [ProductionSort]
+}
+
+"""
+Fields to sort Productions by. The order in which sorts are applied is not guaranteed when specifying many fields in one ProductionSort object.
+"""
+input ProductionSort {
+  title: SortDirection
+}
+
+input ProductionWhere {
+  AND: [ProductionWhere!]
+  NOT: ProductionWhere
+  OR: [ProductionWhere!]
+  title: String
+  title_CONTAINS: String
+  title_ENDS_WITH: String
+  title_IN: [String!]
+  title_STARTS_WITH: String
+  typename_IN: [ProductionImplementation!]
+}
+
+type ProductionsConnection {
+  edges: [ProductionEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+type Query {
+  actors(options: ActorOptions, where: ActorWhere): [Actor!]!
+  actorsConnection(after: String, first: Int, sort: [ActorSort], where: ActorWhere): ActorsConnection!
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+  productions(options: ProductionOptions, where: ProductionWhere): [Production!]!
+  productionsConnection(after: String, first: Int, sort: [ProductionSort], where: ProductionWhere): ProductionsConnection!
+  series(options: SeriesOptions, where: SeriesWhere): [Series!]!
+  seriesConnection(after: String, first: Int, sort: [SeriesSort], where: SeriesWhere): SeriesConnection!
+}
+
+type Series implements Production {
+  actors(directed: Boolean = true, options: ActorOptions, where: ActorWhere): [Actor!]!
+  actorsConnection(after: String, directed: Boolean = true, first: Int, sort: [SeriesActorsConnectionSort!], where: SeriesActorsConnectionWhere): SeriesActorsConnection!
+  episodes: Int!
+  title: String!
+}
+
+type SeriesActorsConnection {
+  edges: [SeriesActorsRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input SeriesActorsConnectionSort {
+  edge: ActedInSort
+  node: ActorSort
+}
+
+input SeriesActorsConnectionWhere {
+  AND: [SeriesActorsConnectionWhere!]
+  NOT: SeriesActorsConnectionWhere
+  OR: [SeriesActorsConnectionWhere!]
+  edge: ActedInWhere
+  node: ActorWhere
+}
+
+type SeriesActorsRelationship {
+  cursor: String!
+  node: Actor!
+  properties: ActedIn!
+}
+
+type SeriesConnection {
+  edges: [SeriesEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+type SeriesEdge {
+  cursor: String!
+  node: Series!
+}
+
+input SeriesOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more SeriesSort objects to sort Series by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [SeriesSort!]
+}
+
+"""
+Fields to sort Series by. The order in which sorts are applied is not guaranteed when specifying many fields in one SeriesSort object.
+"""
+input SeriesSort {
+  episodes: SortDirection
+  title: SortDirection
+}
+
+input SeriesWhere {
+  AND: [SeriesWhere!]
+  NOT: SeriesWhere
+  OR: [SeriesWhere!]
+  """
+  Return Series where all of the related SeriesActorsConnections match this filter
+  """
+  actorsConnection_ALL: SeriesActorsConnectionWhere
+  """
+  Return Series where none of the related SeriesActorsConnections match this filter
+  """
+  actorsConnection_NONE: SeriesActorsConnectionWhere
+  """
+  Return Series where one of the related SeriesActorsConnections match this filter
+  """
+  actorsConnection_SINGLE: SeriesActorsConnectionWhere
+  """
+  Return Series where some of the related SeriesActorsConnections match this filter
+  """
+  actorsConnection_SOME: SeriesActorsConnectionWhere
+  """Return Series where all of the related Actors match this filter"""
+  actors_ALL: ActorWhere
+  """Return Series where none of the related Actors match this filter"""
+  actors_NONE: ActorWhere
+  """Return Series where one of the related Actors match this filter"""
+  actors_SINGLE: ActorWhere
+  """Return Series where some of the related Actors match this filter"""
+  actors_SOME: ActorWhere
+  episodes: Int
+  episodes_GT: Int
+  episodes_GTE: Int
+  episodes_IN: [Int!]
+  episodes_LT: Int
+  episodes_LTE: Int
+  title: String
+  title_CONTAINS: String
+  title_ENDS_WITH: String
+  title_IN: [String!]
+  title_STARTS_WITH: String
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
+
+== Directives on unions preserved
+
+.Schema
+[source,graphql,schema=true]
+----
+union Content = Blog | Post
+
+type Blog {
+  title: String
+  posts: [Post!]! @relationship(type: "HAS_POST", direction: OUT)
+}
+
+type Post {
+  content: String @deprecated(reason: "Do not use post.content")
+}
+
+type User {
+  name: String
+  content: [Content!]! @relationship(type: "HAS_CONTENT", direction: OUT) @deprecated(reason: "Do not use user.content")
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+type Blog {
+  posts(directed: Boolean = true, options: PostOptions, where: PostWhere): [Post!]!
+  postsConnection(after: String, directed: Boolean = true, first: Int, sort: [BlogPostsConnectionSort!], where: BlogPostsConnectionWhere): BlogPostsConnection!
+  title: String
+}
+
+type BlogEdge {
+  cursor: String!
+  node: Blog!
+}
+
+input BlogOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more BlogSort objects to sort Blogs by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [BlogSort!]
+}
+
+type BlogPostsConnection {
+  edges: [BlogPostsRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input BlogPostsConnectionSort {
+  node: PostSort
+}
+
+input BlogPostsConnectionWhere {
+  AND: [BlogPostsConnectionWhere!]
+  NOT: BlogPostsConnectionWhere
+  OR: [BlogPostsConnectionWhere!]
+  node: PostWhere
+}
+
+type BlogPostsRelationship {
+  cursor: String!
+  node: Post!
+}
+
+"""
+Fields to sort Blogs by. The order in which sorts are applied is not guaranteed when specifying many fields in one BlogSort object.
+"""
+input BlogSort {
+  title: SortDirection
+}
+
+input BlogWhere {
+  AND: [BlogWhere!]
+  NOT: BlogWhere
+  OR: [BlogWhere!]
+  """
+  Return Blogs where all of the related BlogPostsConnections match this filter
+  """
+  postsConnection_ALL: BlogPostsConnectionWhere
+  """
+  Return Blogs where none of the related BlogPostsConnections match this filter
+  """
+  postsConnection_NONE: BlogPostsConnectionWhere
+  """
+  Return Blogs where one of the related BlogPostsConnections match this filter
+  """
+  postsConnection_SINGLE: BlogPostsConnectionWhere
+  """
+  Return Blogs where some of the related BlogPostsConnections match this filter
+  """
+  postsConnection_SOME: BlogPostsConnectionWhere
+  """Return Blogs where all of the related Posts match this filter"""
+  posts_ALL: PostWhere
+  """Return Blogs where none of the related Posts match this filter"""
+  posts_NONE: PostWhere
+  """Return Blogs where one of the related Posts match this filter"""
+  posts_SINGLE: PostWhere
+  """Return Blogs where some of the related Posts match this filter"""
+  posts_SOME: PostWhere
+  title: String
+  title_CONTAINS: String
+  title_ENDS_WITH: String
+  title_IN: [String]
+  title_STARTS_WITH: String
+}
+
+type BlogsConnection {
+  edges: [BlogEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+union Content = Blog | Post
+
+input ContentWhere {
+  Blog: BlogWhere
+  Post: PostWhere
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+type Post {
+  content: String @deprecated(reason: "Do not use post.content")
+}
+
+type PostEdge {
+  cursor: String!
+  node: Post!
+}
+
+input PostOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more PostSort objects to sort Posts by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [PostSort!]
+}
+
+"""
+Fields to sort Posts by. The order in which sorts are applied is not guaranteed when specifying many fields in one PostSort object.
+"""
+input PostSort {
+  content: SortDirection @deprecated(reason: "Do not use post.content")
+}
+
+input PostWhere {
+  AND: [PostWhere!]
+  NOT: PostWhere
+  OR: [PostWhere!]
+  content: String @deprecated(reason: "Do not use post.content")
+  content_CONTAINS: String @deprecated(reason: "Do not use post.content")
+  content_ENDS_WITH: String @deprecated(reason: "Do not use post.content")
+  content_IN: [String] @deprecated(reason: "Do not use post.content")
+  content_STARTS_WITH: String @deprecated(reason: "Do not use post.content")
+}
+
+type PostsConnection {
+  edges: [PostEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+type Query {
+  blogs(options: BlogOptions, where: BlogWhere): [Blog!]!
+  blogsConnection(after: String, first: Int, sort: [BlogSort], where: BlogWhere): BlogsConnection!
+  contents(options: QueryOptions, where: ContentWhere): [Content!]!
+  posts(options: PostOptions, where: PostWhere): [Post!]!
+  postsConnection(after: String, first: Int, sort: [PostSort], where: PostWhere): PostsConnection!
+  users(options: UserOptions, where: UserWhere): [User!]!
+  usersConnection(after: String, first: Int, sort: [UserSort], where: UserWhere): UsersConnection!
+}
+
+"""Input type for options that can be specified on a query operation."""
+input QueryOptions {
+  limit: Int
+  offset: Int
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+
+type User {
+  content(directed: Boolean = true, options: QueryOptions, where: ContentWhere): [Content!]! @deprecated(reason: "Do not use user.content")
+  contentConnection(after: String, directed: Boolean = true, first: Int, where: UserContentConnectionWhere): UserContentConnection! @deprecated(reason: "Do not use user.content")
+  name: String
+}
+
+input UserContentBlogConnectionWhere {
+  AND: [UserContentBlogConnectionWhere!]
+  NOT: UserContentBlogConnectionWhere
+  OR: [UserContentBlogConnectionWhere!]
+  node: BlogWhere
+}
+
+type UserContentConnection {
+  edges: [UserContentRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input UserContentConnectionWhere {
+  Blog: UserContentBlogConnectionWhere
+  Post: UserContentPostConnectionWhere
+}
+
+input UserContentPostConnectionWhere {
+  AND: [UserContentPostConnectionWhere!]
+  NOT: UserContentPostConnectionWhere
+  OR: [UserContentPostConnectionWhere!]
+  node: PostWhere
+}
+
+type UserContentRelationship {
+  cursor: String!
+  node: Content!
+}
+
+type UserEdge {
+  cursor: String!
+  node: User!
+}
+
+input UserOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more UserSort objects to sort Users by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [UserSort!]
+}
+
+"""
+Fields to sort Users by. The order in which sorts are applied is not guaranteed when specifying many fields in one UserSort object.
+"""
+input UserSort {
+  name: SortDirection
+}
+
+input UserWhere {
+  AND: [UserWhere!]
+  NOT: UserWhere
+  OR: [UserWhere!]
+  """
+  Return Users where all of the related UserContentConnections match this filter
+  """
+  contentConnection_ALL: UserContentConnectionWhere @deprecated(reason: "Do not use user.content")
+  """
+  Return Users where none of the related UserContentConnections match this filter
+  """
+  contentConnection_NONE: UserContentConnectionWhere @deprecated(reason: "Do not use user.content")
+  """
+  Return Users where one of the related UserContentConnections match this filter
+  """
+  contentConnection_SINGLE: UserContentConnectionWhere @deprecated(reason: "Do not use user.content")
+  """
+  Return Users where some of the related UserContentConnections match this filter
+  """
+  contentConnection_SOME: UserContentConnectionWhere @deprecated(reason: "Do not use user.content")
+  """Return Users where all of the related Contents match this filter"""
+  content_ALL: ContentWhere @deprecated(reason: "Do not use user.content")
+  """Return Users where none of the related Contents match this filter"""
+  content_NONE: ContentWhere @deprecated(reason: "Do not use user.content")
+  """Return Users where one of the related Contents match this filter"""
+  content_SINGLE: ContentWhere @deprecated(reason: "Do not use user.content")
+  """Return Users where some of the related Contents match this filter"""
+  content_SOME: ContentWhere @deprecated(reason: "Do not use user.content")
+  name: String
+  name_CONTAINS: String
+  name_ENDS_WITH: String
+  name_IN: [String]
+  name_STARTS_WITH: String
+}
+
+type UsersConnection {
+  edges: [UserEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+----
diff --git a/core/src/test/resources/tck-test-files/schema/v2/directives/alias.adoc b/core/src/test/resources/tck-test-files/schema/v2/directives/alias.adoc
index 994ba120..6e7cc7bd 100644
--- a/core/src/test/resources/tck-test-files/schema/v2/directives/alias.adoc
+++ b/core/src/test/resources/tck-test-files/schema/v2/directives/alias.adoc
@@ -26,7 +26,7 @@ type ActorActedInProps @relationshipProperties {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -221,6 +221,3 @@ input MovieWhere {
 }
 
 ----
-
-'''
-
diff --git a/core/src/test/resources/tck-test-files/schema/v2/directives/alias.js.adoc b/core/src/test/resources/tck-test-files/schema/v2/directives/alias.js.adoc
new file mode 100644
index 00000000..8ba3835c
--- /dev/null
+++ b/core/src/test/resources/tck-test-files/schema/v2/directives/alias.js.adoc
@@ -0,0 +1,239 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= Alias
+
+== Custom Directive Simple
+
+.Schema
+[source,graphql,schema=true]
+----
+type Actor {
+  name: String!
+  city: String @alias(property: "cityPropInDb")
+  actedIn: [Movie!]! @relationship(direction: OUT, type: "ACTED_IN", properties: "ActorActedInProps")
+}
+
+type Movie {
+  title: String!
+  rating: Float @alias(property: "ratingPropInDb")
+}
+
+type ActorActedInProps @relationshipProperties {
+  character: String! @alias(property: "characterPropInDb")
+  screenTime: Int
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+type Actor {
+  actedIn(directed: Boolean = true, options: MovieOptions, where: MovieWhere): [Movie!]!
+  actedInConnection(after: String, directed: Boolean = true, first: Int, sort: [ActorActedInConnectionSort!], where: ActorActedInConnectionWhere): ActorActedInConnection!
+  city: String
+  name: String!
+}
+
+type ActorActedInConnection {
+  edges: [ActorActedInRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input ActorActedInConnectionSort {
+  edge: ActorActedInPropsSort
+  node: MovieSort
+}
+
+input ActorActedInConnectionWhere {
+  AND: [ActorActedInConnectionWhere!]
+  NOT: ActorActedInConnectionWhere
+  OR: [ActorActedInConnectionWhere!]
+  edge: ActorActedInPropsWhere
+  node: MovieWhere
+}
+
+"""
+The edge properties for the following fields:
+* Actor.actedIn
+"""
+type ActorActedInProps {
+  character: String!
+  screenTime: Int
+}
+
+input ActorActedInPropsSort {
+  character: SortDirection
+  screenTime: SortDirection
+}
+
+input ActorActedInPropsWhere {
+  AND: [ActorActedInPropsWhere!]
+  NOT: ActorActedInPropsWhere
+  OR: [ActorActedInPropsWhere!]
+  character: String
+  character_CONTAINS: String
+  character_ENDS_WITH: String
+  character_IN: [String!]
+  character_STARTS_WITH: String
+  screenTime: Int
+  screenTime_GT: Int
+  screenTime_GTE: Int
+  screenTime_IN: [Int]
+  screenTime_LT: Int
+  screenTime_LTE: Int
+}
+
+type ActorActedInRelationship {
+  cursor: String!
+  node: Movie!
+  properties: ActorActedInProps!
+}
+
+type ActorEdge {
+  cursor: String!
+  node: Actor!
+}
+
+input ActorOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more ActorSort objects to sort Actors by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [ActorSort!]
+}
+
+"""
+Fields to sort Actors by. The order in which sorts are applied is not guaranteed when specifying many fields in one ActorSort object.
+"""
+input ActorSort {
+  city: SortDirection
+  name: SortDirection
+}
+
+input ActorWhere {
+  AND: [ActorWhere!]
+  NOT: ActorWhere
+  OR: [ActorWhere!]
+  """
+  Return Actors where all of the related ActorActedInConnections match this filter
+  """
+  actedInConnection_ALL: ActorActedInConnectionWhere
+  """
+  Return Actors where none of the related ActorActedInConnections match this filter
+  """
+  actedInConnection_NONE: ActorActedInConnectionWhere
+  """
+  Return Actors where one of the related ActorActedInConnections match this filter
+  """
+  actedInConnection_SINGLE: ActorActedInConnectionWhere
+  """
+  Return Actors where some of the related ActorActedInConnections match this filter
+  """
+  actedInConnection_SOME: ActorActedInConnectionWhere
+  """Return Actors where all of the related Movies match this filter"""
+  actedIn_ALL: MovieWhere
+  """Return Actors where none of the related Movies match this filter"""
+  actedIn_NONE: MovieWhere
+  """Return Actors where one of the related Movies match this filter"""
+  actedIn_SINGLE: MovieWhere
+  """Return Actors where some of the related Movies match this filter"""
+  actedIn_SOME: MovieWhere
+  city: String
+  city_CONTAINS: String
+  city_ENDS_WITH: String
+  city_IN: [String]
+  city_STARTS_WITH: String
+  name: String
+  name_CONTAINS: String
+  name_ENDS_WITH: String
+  name_IN: [String!]
+  name_STARTS_WITH: String
+}
+
+type ActorsConnection {
+  edges: [ActorEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+type Movie {
+  rating: Float
+  title: String!
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MovieSort!]
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
+"""
+input MovieSort {
+  rating: SortDirection
+  title: SortDirection
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  rating: Float
+  rating_GT: Float
+  rating_GTE: Float
+  rating_IN: [Float]
+  rating_LT: Float
+  rating_LTE: Float
+  title: String
+  title_CONTAINS: String
+  title_ENDS_WITH: String
+  title_IN: [String!]
+  title_STARTS_WITH: String
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+type Query {
+  actors(options: ActorOptions, where: ActorWhere): [Actor!]!
+  actorsConnection(after: String, first: Int, sort: [ActorSort], where: ActorWhere): ActorsConnection!
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
diff --git a/core/src/test/resources/tck-test-files/schema/v2/directives/customResolver.adoc b/core/src/test/resources/tck-test-files/schema/v2/directives/customResolver.adoc
index 0a01c85d..21dcbd55 100644
--- a/core/src/test/resources/tck-test-files/schema/v2/directives/customResolver.adoc
+++ b/core/src/test/resources/tck-test-files/schema/v2/directives/customResolver.adoc
@@ -22,7 +22,7 @@ type User implements UserInterface {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -149,6 +149,3 @@ input UserWhere {
 }
 
 ----
-
-'''
-
diff --git a/core/src/test/resources/tck-test-files/schema/v2/directives/customResolver.js.adoc b/core/src/test/resources/tck-test-files/schema/v2/directives/customResolver.js.adoc
new file mode 100644
index 00000000..c409a002
--- /dev/null
+++ b/core/src/test/resources/tck-test-files/schema/v2/directives/customResolver.js.adoc
@@ -0,0 +1,159 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= @customResolver directive
+
+== passes fields directly through with no generation
+
+.Schema
+[source,graphql,schema=true]
+----
+interface UserInterface {
+  customResolver: String
+}
+
+type User implements UserInterface {
+  id: ID!
+  username: String!
+  password: String!
+  nickname: String! @customResolver
+  customResolver: String @customResolver
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+type Query {
+  userInterfaces(options: UserInterfaceOptions, where: UserInterfaceWhere): [UserInterface!]!
+  userInterfacesConnection(after: String, first: Int, sort: [UserInterfaceSort], where: UserInterfaceWhere): UserInterfacesConnection!
+  users(options: UserOptions, where: UserWhere): [User!]!
+  usersConnection(after: String, first: Int, sort: [UserSort], where: UserWhere): UsersConnection!
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+
+type User implements UserInterface {
+  customResolver: String
+  id: ID!
+  nickname: String!
+  password: String!
+  username: String!
+}
+
+type UserEdge {
+  cursor: String!
+  node: User!
+}
+
+interface UserInterface {
+  customResolver: String
+}
+
+type UserInterfaceEdge {
+  cursor: String!
+  node: UserInterface!
+}
+
+enum UserInterfaceImplementation {
+  User
+}
+
+input UserInterfaceOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more UserInterfaceSort objects to sort UserInterfaces by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [UserInterfaceSort]
+}
+
+"""
+Fields to sort UserInterfaces by. The order in which sorts are applied is not guaranteed when specifying many fields in one UserInterfaceSort object.
+"""
+input UserInterfaceSort {
+  customResolver: SortDirection
+}
+
+input UserInterfaceWhere {
+  AND: [UserInterfaceWhere!]
+  NOT: UserInterfaceWhere
+  OR: [UserInterfaceWhere!]
+  customResolver: String
+  customResolver_CONTAINS: String
+  customResolver_ENDS_WITH: String
+  customResolver_IN: [String]
+  customResolver_STARTS_WITH: String
+  typename_IN: [UserInterfaceImplementation!]
+}
+
+type UserInterfacesConnection {
+  edges: [UserInterfaceEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input UserOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more UserSort objects to sort Users by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [UserSort!]
+}
+
+"""
+Fields to sort Users by. The order in which sorts are applied is not guaranteed when specifying many fields in one UserSort object.
+"""
+input UserSort {
+  id: SortDirection
+  password: SortDirection
+  username: SortDirection
+}
+
+input UserWhere {
+  AND: [UserWhere!]
+  NOT: UserWhere
+  OR: [UserWhere!]
+  id: ID
+  id_CONTAINS: ID
+  id_ENDS_WITH: ID
+  id_IN: [ID!]
+  id_STARTS_WITH: ID
+  password: String
+  password_CONTAINS: String
+  password_ENDS_WITH: String
+  password_IN: [String!]
+  password_STARTS_WITH: String
+  username: String
+  username_CONTAINS: String
+  username_ENDS_WITH: String
+  username_IN: [String!]
+  username_STARTS_WITH: String
+}
+
+type UsersConnection {
+  edges: [UserEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+----
diff --git a/core/src/test/resources/tck-test-files/schema/v2/directives/default.adoc b/core/src/test/resources/tck-test-files/schema/v2/directives/default.adoc
index 1b58d09d..c7ea58d1 100644
--- a/core/src/test/resources/tck-test-files/schema/v2/directives/default.adoc
+++ b/core/src/test/resources/tck-test-files/schema/v2/directives/default.adoc
@@ -33,7 +33,7 @@ enum Location {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -212,6 +212,3 @@ input UserWhere {
 }
 
 ----
-
-'''
-
diff --git a/core/src/test/resources/tck-test-files/schema/v2/directives/default.js.adoc b/core/src/test/resources/tck-test-files/schema/v2/directives/default.js.adoc
new file mode 100644
index 00000000..2df2b059
--- /dev/null
+++ b/core/src/test/resources/tck-test-files/schema/v2/directives/default.js.adoc
@@ -0,0 +1,222 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= @default directive
+
+== sets default values in schema
+
+.Schema
+[source,graphql,schema=true]
+----
+interface UserInterface {
+  fromInterface: String!
+  toBeOverridden: String!
+}
+
+type User implements UserInterface {
+  id: ID! @default(value: "00000000-00000000-00000000-00000000")
+  name: String! @default(value: "Jane Smith")
+  verified: Boolean! @default(value: false)
+  numberOfFriends: Int! @default(value: 0)
+  rating: Float! @default(value: 0.0)
+  verifiedDate: DateTime! @default(value: "1970-01-01T00:00:00.000Z")
+  fromInterface: String! @default(value: "Interface default value")
+  toBeOverridden: String! @default(value: "Overridden value")
+  location: Location! @default(value: HERE)
+}
+
+enum Location {
+  HERE
+  THERE
+  EVERYWHERE
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+"""A date and time, represented as an ISO-8601 string"""
+scalar DateTime
+
+enum Location {
+  EVERYWHERE
+  HERE
+  THERE
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+type Query {
+  userInterfaces(options: UserInterfaceOptions, where: UserInterfaceWhere): [UserInterface!]!
+  userInterfacesConnection(after: String, first: Int, sort: [UserInterfaceSort], where: UserInterfaceWhere): UserInterfacesConnection!
+  users(options: UserOptions, where: UserWhere): [User!]!
+  usersConnection(after: String, first: Int, sort: [UserSort], where: UserWhere): UsersConnection!
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+
+type User implements UserInterface {
+  fromInterface: String!
+  id: ID!
+  location: Location!
+  name: String!
+  numberOfFriends: Int!
+  rating: Float!
+  toBeOverridden: String!
+  verified: Boolean!
+  verifiedDate: DateTime!
+}
+
+type UserEdge {
+  cursor: String!
+  node: User!
+}
+
+interface UserInterface {
+  fromInterface: String!
+  toBeOverridden: String!
+}
+
+type UserInterfaceEdge {
+  cursor: String!
+  node: UserInterface!
+}
+
+enum UserInterfaceImplementation {
+  User
+}
+
+input UserInterfaceOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more UserInterfaceSort objects to sort UserInterfaces by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [UserInterfaceSort]
+}
+
+"""
+Fields to sort UserInterfaces by. The order in which sorts are applied is not guaranteed when specifying many fields in one UserInterfaceSort object.
+"""
+input UserInterfaceSort {
+  fromInterface: SortDirection
+  toBeOverridden: SortDirection
+}
+
+input UserInterfaceWhere {
+  AND: [UserInterfaceWhere!]
+  NOT: UserInterfaceWhere
+  OR: [UserInterfaceWhere!]
+  fromInterface: String
+  fromInterface_CONTAINS: String
+  fromInterface_ENDS_WITH: String
+  fromInterface_IN: [String!]
+  fromInterface_STARTS_WITH: String
+  toBeOverridden: String
+  toBeOverridden_CONTAINS: String
+  toBeOverridden_ENDS_WITH: String
+  toBeOverridden_IN: [String!]
+  toBeOverridden_STARTS_WITH: String
+  typename_IN: [UserInterfaceImplementation!]
+}
+
+type UserInterfacesConnection {
+  edges: [UserInterfaceEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input UserOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more UserSort objects to sort Users by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [UserSort!]
+}
+
+"""
+Fields to sort Users by. The order in which sorts are applied is not guaranteed when specifying many fields in one UserSort object.
+"""
+input UserSort {
+  fromInterface: SortDirection
+  id: SortDirection
+  location: SortDirection
+  name: SortDirection
+  numberOfFriends: SortDirection
+  rating: SortDirection
+  toBeOverridden: SortDirection
+  verified: SortDirection
+  verifiedDate: SortDirection
+}
+
+input UserWhere {
+  AND: [UserWhere!]
+  NOT: UserWhere
+  OR: [UserWhere!]
+  fromInterface: String
+  fromInterface_CONTAINS: String
+  fromInterface_ENDS_WITH: String
+  fromInterface_IN: [String!]
+  fromInterface_STARTS_WITH: String
+  id: ID
+  id_CONTAINS: ID
+  id_ENDS_WITH: ID
+  id_IN: [ID!]
+  id_STARTS_WITH: ID
+  location: Location
+  location_IN: [Location!]
+  name: String
+  name_CONTAINS: String
+  name_ENDS_WITH: String
+  name_IN: [String!]
+  name_STARTS_WITH: String
+  numberOfFriends: Int
+  numberOfFriends_GT: Int
+  numberOfFriends_GTE: Int
+  numberOfFriends_IN: [Int!]
+  numberOfFriends_LT: Int
+  numberOfFriends_LTE: Int
+  rating: Float
+  rating_GT: Float
+  rating_GTE: Float
+  rating_IN: [Float!]
+  rating_LT: Float
+  rating_LTE: Float
+  toBeOverridden: String
+  toBeOverridden_CONTAINS: String
+  toBeOverridden_ENDS_WITH: String
+  toBeOverridden_IN: [String!]
+  toBeOverridden_STARTS_WITH: String
+  verified: Boolean
+  verifiedDate: DateTime
+  verifiedDate_GT: DateTime
+  verifiedDate_GTE: DateTime
+  verifiedDate_IN: [DateTime!]
+  verifiedDate_LT: DateTime
+  verifiedDate_LTE: DateTime
+}
+
+type UsersConnection {
+  edges: [UserEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+----
diff --git a/core/src/test/resources/tck-test-files/schema/v2/directives/filterable.adoc b/core/src/test/resources/tck-test-files/schema/v2/directives/filterable.adoc
index 7349858d..0c061f0b 100644
--- a/core/src/test/resources/tck-test-files/schema/v2/directives/filterable.adoc
+++ b/core/src/test/resources/tck-test-files/schema/v2/directives/filterable.adoc
@@ -27,7 +27,7 @@ type Movie {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -250,8 +250,6 @@ input PersonWhere {
 
 ----
 
-'''
-
 == snapshot tests
 
 === on SCALAR
@@ -274,7 +272,7 @@ type Movie {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -468,8 +466,6 @@ input MovieWhere {
 
 ----
 
-'''
-
 === on RELATIONSHIP FIELD
 
 ==== default arguments should disable aggregation
@@ -490,7 +486,7 @@ type Movie {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -684,8 +680,6 @@ input MovieWhere {
 
 ----
 
-'''
-
 ==== enable only value filters
 
 .Schema
@@ -704,7 +698,7 @@ type Movie {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -898,8 +892,6 @@ input MovieWhere {
 
 ----
 
-'''
-
 === on INTERFACE RELATIONSHIP FIELD, (aggregation does not exists on abstract types)
 
 ==== default arguments should disable aggregation
@@ -924,7 +916,7 @@ type Movie {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -1163,8 +1155,6 @@ input PersonWhere {
 
 ----
 
-'''
-
 ==== enable only value filters
 
 .Schema
@@ -1187,7 +1177,7 @@ type Movie {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -1426,8 +1416,6 @@ input PersonWhere {
 
 ----
 
-'''
-
 === on UNION RELATIONSHIP FIELD, (aggregation does not exists on abstract types)
 
 ==== default arguments should disable aggregation
@@ -1456,7 +1444,7 @@ type Movie {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -1759,8 +1747,6 @@ input QueryOptions {
 
 ----
 
-'''
-
 ==== enable only value filters
 
 .Schema
@@ -1787,7 +1773,7 @@ type Movie {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -2089,6 +2075,3 @@ input QueryOptions {
 }
 
 ----
-
-'''
-
diff --git a/core/src/test/resources/tck-test-files/schema/v2/directives/filterable.js.adoc b/core/src/test/resources/tck-test-files/schema/v2/directives/filterable.js.adoc
new file mode 100644
index 00000000..d19062ef
--- /dev/null
+++ b/core/src/test/resources/tck-test-files/schema/v2/directives/filterable.js.adoc
@@ -0,0 +1,2290 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= @filterable directive
+
+== on INTERFACE RELATIONSHIP FIELD, (aggregation are not generated for abstract types)
+
+=== disable value filters
+
+.Schema
+[source,graphql,schema=true]
+----
+type Actor implements Person {
+  username: String!
+  password: String!
+  movies: [Movie!]! @relationship(type: "ACTED_IN", direction: OUT)
+}
+
+interface Person {
+  username: String!
+}
+
+type Movie {
+  title: String
+  actors: [Person!]! @relationship(type: "ACTED_IN", direction: IN) @filterable(byValue: false)
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+type Actor implements Person {
+  movies(directed: Boolean = true, options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, directed: Boolean = true, first: Int, sort: [ActorMoviesConnectionSort!], where: ActorMoviesConnectionWhere): ActorMoviesConnection!
+  password: String!
+  username: String!
+}
+
+type ActorEdge {
+  cursor: String!
+  node: Actor!
+}
+
+type ActorMoviesConnection {
+  edges: [ActorMoviesRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input ActorMoviesConnectionSort {
+  node: MovieSort
+}
+
+input ActorMoviesConnectionWhere {
+  AND: [ActorMoviesConnectionWhere!]
+  NOT: ActorMoviesConnectionWhere
+  OR: [ActorMoviesConnectionWhere!]
+  node: MovieWhere
+}
+
+type ActorMoviesRelationship {
+  cursor: String!
+  node: Movie!
+}
+
+input ActorOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more ActorSort objects to sort Actors by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [ActorSort!]
+}
+
+"""
+Fields to sort Actors by. The order in which sorts are applied is not guaranteed when specifying many fields in one ActorSort object.
+"""
+input ActorSort {
+  password: SortDirection
+  username: SortDirection
+}
+
+input ActorWhere {
+  AND: [ActorWhere!]
+  NOT: ActorWhere
+  OR: [ActorWhere!]
+  """
+  Return Actors where all of the related ActorMoviesConnections match this filter
+  """
+  moviesConnection_ALL: ActorMoviesConnectionWhere
+  """
+  Return Actors where none of the related ActorMoviesConnections match this filter
+  """
+  moviesConnection_NONE: ActorMoviesConnectionWhere
+  """
+  Return Actors where one of the related ActorMoviesConnections match this filter
+  """
+  moviesConnection_SINGLE: ActorMoviesConnectionWhere
+  """
+  Return Actors where some of the related ActorMoviesConnections match this filter
+  """
+  moviesConnection_SOME: ActorMoviesConnectionWhere
+  """Return Actors where all of the related Movies match this filter"""
+  movies_ALL: MovieWhere
+  """Return Actors where none of the related Movies match this filter"""
+  movies_NONE: MovieWhere
+  """Return Actors where one of the related Movies match this filter"""
+  movies_SINGLE: MovieWhere
+  """Return Actors where some of the related Movies match this filter"""
+  movies_SOME: MovieWhere
+  password: String
+  password_CONTAINS: String
+  password_ENDS_WITH: String
+  password_IN: [String!]
+  password_STARTS_WITH: String
+  username: String
+  username_CONTAINS: String
+  username_ENDS_WITH: String
+  username_IN: [String!]
+  username_STARTS_WITH: String
+}
+
+type ActorsConnection {
+  edges: [ActorEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+type Movie {
+  actors(directed: Boolean = true, options: PersonOptions, where: PersonWhere): [Person!]!
+  actorsConnection(after: String, directed: Boolean = true, first: Int, sort: [MovieActorsConnectionSort!], where: MovieActorsConnectionWhere): MovieActorsConnection!
+  title: String
+}
+
+type MovieActorsConnection {
+  edges: [MovieActorsRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input MovieActorsConnectionSort {
+  node: PersonSort
+}
+
+input MovieActorsConnectionWhere {
+  AND: [MovieActorsConnectionWhere!]
+  NOT: MovieActorsConnectionWhere
+  OR: [MovieActorsConnectionWhere!]
+  node: PersonWhere
+}
+
+type MovieActorsRelationship {
+  cursor: String!
+  node: Person!
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MovieSort!]
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
+"""
+input MovieSort {
+  title: SortDirection
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  title: String
+  title_CONTAINS: String
+  title_ENDS_WITH: String
+  title_IN: [String]
+  title_STARTS_WITH: String
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+type PeopleConnection {
+  edges: [PersonEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+interface Person {
+  username: String!
+}
+
+type PersonEdge {
+  cursor: String!
+  node: Person!
+}
+
+enum PersonImplementation {
+  Actor
+}
+
+input PersonOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more PersonSort objects to sort People by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [PersonSort]
+}
+
+"""
+Fields to sort People by. The order in which sorts are applied is not guaranteed when specifying many fields in one PersonSort object.
+"""
+input PersonSort {
+  username: SortDirection
+}
+
+input PersonWhere {
+  AND: [PersonWhere!]
+  NOT: PersonWhere
+  OR: [PersonWhere!]
+  typename_IN: [PersonImplementation!]
+  username: String
+  username_CONTAINS: String
+  username_ENDS_WITH: String
+  username_IN: [String!]
+  username_STARTS_WITH: String
+}
+
+type Query {
+  actors(options: ActorOptions, where: ActorWhere): [Actor!]!
+  actorsConnection(after: String, first: Int, sort: [ActorSort], where: ActorWhere): ActorsConnection!
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+  people(options: PersonOptions, where: PersonWhere): [Person!]!
+  peopleConnection(after: String, first: Int, sort: [PersonSort], where: PersonWhere): PeopleConnection!
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
+
+== snapshot tests
+
+=== on SCALAR
+
+==== default arguments should disable aggregation
+
+.Schema
+[source,graphql,schema=true]
+----
+type Actor {
+  username: String!
+  password: String!
+  movies: [Movie!]! @relationship(type: "ACTED_IN", direction: OUT)
+}
+
+type Movie {
+  title: String @filterable
+  actors: [Actor!]! @relationship(type: "ACTED_IN", direction: IN)
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+type Actor {
+  movies(directed: Boolean = true, options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, directed: Boolean = true, first: Int, sort: [ActorMoviesConnectionSort!], where: ActorMoviesConnectionWhere): ActorMoviesConnection!
+  password: String!
+  username: String!
+}
+
+type ActorEdge {
+  cursor: String!
+  node: Actor!
+}
+
+type ActorMoviesConnection {
+  edges: [ActorMoviesRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input ActorMoviesConnectionSort {
+  node: MovieSort
+}
+
+input ActorMoviesConnectionWhere {
+  AND: [ActorMoviesConnectionWhere!]
+  NOT: ActorMoviesConnectionWhere
+  OR: [ActorMoviesConnectionWhere!]
+  node: MovieWhere
+}
+
+type ActorMoviesRelationship {
+  cursor: String!
+  node: Movie!
+}
+
+input ActorOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more ActorSort objects to sort Actors by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [ActorSort!]
+}
+
+"""
+Fields to sort Actors by. The order in which sorts are applied is not guaranteed when specifying many fields in one ActorSort object.
+"""
+input ActorSort {
+  password: SortDirection
+  username: SortDirection
+}
+
+input ActorWhere {
+  AND: [ActorWhere!]
+  NOT: ActorWhere
+  OR: [ActorWhere!]
+  """
+  Return Actors where all of the related ActorMoviesConnections match this filter
+  """
+  moviesConnection_ALL: ActorMoviesConnectionWhere
+  """
+  Return Actors where none of the related ActorMoviesConnections match this filter
+  """
+  moviesConnection_NONE: ActorMoviesConnectionWhere
+  """
+  Return Actors where one of the related ActorMoviesConnections match this filter
+  """
+  moviesConnection_SINGLE: ActorMoviesConnectionWhere
+  """
+  Return Actors where some of the related ActorMoviesConnections match this filter
+  """
+  moviesConnection_SOME: ActorMoviesConnectionWhere
+  """Return Actors where all of the related Movies match this filter"""
+  movies_ALL: MovieWhere
+  """Return Actors where none of the related Movies match this filter"""
+  movies_NONE: MovieWhere
+  """Return Actors where one of the related Movies match this filter"""
+  movies_SINGLE: MovieWhere
+  """Return Actors where some of the related Movies match this filter"""
+  movies_SOME: MovieWhere
+  password: String
+  password_CONTAINS: String
+  password_ENDS_WITH: String
+  password_IN: [String!]
+  password_STARTS_WITH: String
+  username: String
+  username_CONTAINS: String
+  username_ENDS_WITH: String
+  username_IN: [String!]
+  username_STARTS_WITH: String
+}
+
+type ActorsConnection {
+  edges: [ActorEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+type Movie {
+  actors(directed: Boolean = true, options: ActorOptions, where: ActorWhere): [Actor!]!
+  actorsConnection(after: String, directed: Boolean = true, first: Int, sort: [MovieActorsConnectionSort!], where: MovieActorsConnectionWhere): MovieActorsConnection!
+  title: String
+}
+
+type MovieActorsConnection {
+  edges: [MovieActorsRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input MovieActorsConnectionSort {
+  node: ActorSort
+}
+
+input MovieActorsConnectionWhere {
+  AND: [MovieActorsConnectionWhere!]
+  NOT: MovieActorsConnectionWhere
+  OR: [MovieActorsConnectionWhere!]
+  node: ActorWhere
+}
+
+type MovieActorsRelationship {
+  cursor: String!
+  node: Actor!
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MovieSort!]
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
+"""
+input MovieSort {
+  title: SortDirection
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  """
+  Return Movies where all of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_ALL: MovieActorsConnectionWhere
+  """
+  Return Movies where none of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_NONE: MovieActorsConnectionWhere
+  """
+  Return Movies where one of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SINGLE: MovieActorsConnectionWhere
+  """
+  Return Movies where some of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SOME: MovieActorsConnectionWhere
+  """Return Movies where all of the related Actors match this filter"""
+  actors_ALL: ActorWhere
+  """Return Movies where none of the related Actors match this filter"""
+  actors_NONE: ActorWhere
+  """Return Movies where one of the related Actors match this filter"""
+  actors_SINGLE: ActorWhere
+  """Return Movies where some of the related Actors match this filter"""
+  actors_SOME: ActorWhere
+  title: String
+  title_CONTAINS: String
+  title_ENDS_WITH: String
+  title_IN: [String]
+  title_STARTS_WITH: String
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+type Query {
+  actors(options: ActorOptions, where: ActorWhere): [Actor!]!
+  actorsConnection(after: String, first: Int, sort: [ActorSort], where: ActorWhere): ActorsConnection!
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
+
+=== on RELATIONSHIP FIELD
+
+==== default arguments should disable aggregation
+
+.Schema
+[source,graphql,schema=true]
+----
+type Actor {
+  username: String!
+  password: String!
+  movies: [Movie!]! @relationship(type: "ACTED_IN", direction: OUT)
+}
+
+type Movie {
+  title: String
+  actors: [Actor!]! @relationship(type: "ACTED_IN", direction: IN) @filterable
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+type Actor {
+  movies(directed: Boolean = true, options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, directed: Boolean = true, first: Int, sort: [ActorMoviesConnectionSort!], where: ActorMoviesConnectionWhere): ActorMoviesConnection!
+  password: String!
+  username: String!
+}
+
+type ActorEdge {
+  cursor: String!
+  node: Actor!
+}
+
+type ActorMoviesConnection {
+  edges: [ActorMoviesRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input ActorMoviesConnectionSort {
+  node: MovieSort
+}
+
+input ActorMoviesConnectionWhere {
+  AND: [ActorMoviesConnectionWhere!]
+  NOT: ActorMoviesConnectionWhere
+  OR: [ActorMoviesConnectionWhere!]
+  node: MovieWhere
+}
+
+type ActorMoviesRelationship {
+  cursor: String!
+  node: Movie!
+}
+
+input ActorOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more ActorSort objects to sort Actors by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [ActorSort!]
+}
+
+"""
+Fields to sort Actors by. The order in which sorts are applied is not guaranteed when specifying many fields in one ActorSort object.
+"""
+input ActorSort {
+  password: SortDirection
+  username: SortDirection
+}
+
+input ActorWhere {
+  AND: [ActorWhere!]
+  NOT: ActorWhere
+  OR: [ActorWhere!]
+  """
+  Return Actors where all of the related ActorMoviesConnections match this filter
+  """
+  moviesConnection_ALL: ActorMoviesConnectionWhere
+  """
+  Return Actors where none of the related ActorMoviesConnections match this filter
+  """
+  moviesConnection_NONE: ActorMoviesConnectionWhere
+  """
+  Return Actors where one of the related ActorMoviesConnections match this filter
+  """
+  moviesConnection_SINGLE: ActorMoviesConnectionWhere
+  """
+  Return Actors where some of the related ActorMoviesConnections match this filter
+  """
+  moviesConnection_SOME: ActorMoviesConnectionWhere
+  """Return Actors where all of the related Movies match this filter"""
+  movies_ALL: MovieWhere
+  """Return Actors where none of the related Movies match this filter"""
+  movies_NONE: MovieWhere
+  """Return Actors where one of the related Movies match this filter"""
+  movies_SINGLE: MovieWhere
+  """Return Actors where some of the related Movies match this filter"""
+  movies_SOME: MovieWhere
+  password: String
+  password_CONTAINS: String
+  password_ENDS_WITH: String
+  password_IN: [String!]
+  password_STARTS_WITH: String
+  username: String
+  username_CONTAINS: String
+  username_ENDS_WITH: String
+  username_IN: [String!]
+  username_STARTS_WITH: String
+}
+
+type ActorsConnection {
+  edges: [ActorEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+type Movie {
+  actors(directed: Boolean = true, options: ActorOptions, where: ActorWhere): [Actor!]!
+  actorsConnection(after: String, directed: Boolean = true, first: Int, sort: [MovieActorsConnectionSort!], where: MovieActorsConnectionWhere): MovieActorsConnection!
+  title: String
+}
+
+type MovieActorsConnection {
+  edges: [MovieActorsRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input MovieActorsConnectionSort {
+  node: ActorSort
+}
+
+input MovieActorsConnectionWhere {
+  AND: [MovieActorsConnectionWhere!]
+  NOT: MovieActorsConnectionWhere
+  OR: [MovieActorsConnectionWhere!]
+  node: ActorWhere
+}
+
+type MovieActorsRelationship {
+  cursor: String!
+  node: Actor!
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MovieSort!]
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
+"""
+input MovieSort {
+  title: SortDirection
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  """
+  Return Movies where all of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_ALL: MovieActorsConnectionWhere
+  """
+  Return Movies where none of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_NONE: MovieActorsConnectionWhere
+  """
+  Return Movies where one of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SINGLE: MovieActorsConnectionWhere
+  """
+  Return Movies where some of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SOME: MovieActorsConnectionWhere
+  """Return Movies where all of the related Actors match this filter"""
+  actors_ALL: ActorWhere
+  """Return Movies where none of the related Actors match this filter"""
+  actors_NONE: ActorWhere
+  """Return Movies where one of the related Actors match this filter"""
+  actors_SINGLE: ActorWhere
+  """Return Movies where some of the related Actors match this filter"""
+  actors_SOME: ActorWhere
+  title: String
+  title_CONTAINS: String
+  title_ENDS_WITH: String
+  title_IN: [String]
+  title_STARTS_WITH: String
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+type Query {
+  actors(options: ActorOptions, where: ActorWhere): [Actor!]!
+  actorsConnection(after: String, first: Int, sort: [ActorSort], where: ActorWhere): ActorsConnection!
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
+
+==== enable only value filters
+
+.Schema
+[source,graphql,schema=true]
+----
+type Actor {
+  username: String!
+  password: String!
+  movies: [Movie!]! @relationship(type: "ACTED_IN", direction: OUT)
+}
+
+type Movie {
+  title: String
+  actors: [Actor!]! @relationship(type: "ACTED_IN", direction: IN) @filterable(byValue: true)
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+type Actor {
+  movies(directed: Boolean = true, options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, directed: Boolean = true, first: Int, sort: [ActorMoviesConnectionSort!], where: ActorMoviesConnectionWhere): ActorMoviesConnection!
+  password: String!
+  username: String!
+}
+
+type ActorEdge {
+  cursor: String!
+  node: Actor!
+}
+
+type ActorMoviesConnection {
+  edges: [ActorMoviesRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input ActorMoviesConnectionSort {
+  node: MovieSort
+}
+
+input ActorMoviesConnectionWhere {
+  AND: [ActorMoviesConnectionWhere!]
+  NOT: ActorMoviesConnectionWhere
+  OR: [ActorMoviesConnectionWhere!]
+  node: MovieWhere
+}
+
+type ActorMoviesRelationship {
+  cursor: String!
+  node: Movie!
+}
+
+input ActorOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more ActorSort objects to sort Actors by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [ActorSort!]
+}
+
+"""
+Fields to sort Actors by. The order in which sorts are applied is not guaranteed when specifying many fields in one ActorSort object.
+"""
+input ActorSort {
+  password: SortDirection
+  username: SortDirection
+}
+
+input ActorWhere {
+  AND: [ActorWhere!]
+  NOT: ActorWhere
+  OR: [ActorWhere!]
+  """
+  Return Actors where all of the related ActorMoviesConnections match this filter
+  """
+  moviesConnection_ALL: ActorMoviesConnectionWhere
+  """
+  Return Actors where none of the related ActorMoviesConnections match this filter
+  """
+  moviesConnection_NONE: ActorMoviesConnectionWhere
+  """
+  Return Actors where one of the related ActorMoviesConnections match this filter
+  """
+  moviesConnection_SINGLE: ActorMoviesConnectionWhere
+  """
+  Return Actors where some of the related ActorMoviesConnections match this filter
+  """
+  moviesConnection_SOME: ActorMoviesConnectionWhere
+  """Return Actors where all of the related Movies match this filter"""
+  movies_ALL: MovieWhere
+  """Return Actors where none of the related Movies match this filter"""
+  movies_NONE: MovieWhere
+  """Return Actors where one of the related Movies match this filter"""
+  movies_SINGLE: MovieWhere
+  """Return Actors where some of the related Movies match this filter"""
+  movies_SOME: MovieWhere
+  password: String
+  password_CONTAINS: String
+  password_ENDS_WITH: String
+  password_IN: [String!]
+  password_STARTS_WITH: String
+  username: String
+  username_CONTAINS: String
+  username_ENDS_WITH: String
+  username_IN: [String!]
+  username_STARTS_WITH: String
+}
+
+type ActorsConnection {
+  edges: [ActorEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+type Movie {
+  actors(directed: Boolean = true, options: ActorOptions, where: ActorWhere): [Actor!]!
+  actorsConnection(after: String, directed: Boolean = true, first: Int, sort: [MovieActorsConnectionSort!], where: MovieActorsConnectionWhere): MovieActorsConnection!
+  title: String
+}
+
+type MovieActorsConnection {
+  edges: [MovieActorsRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input MovieActorsConnectionSort {
+  node: ActorSort
+}
+
+input MovieActorsConnectionWhere {
+  AND: [MovieActorsConnectionWhere!]
+  NOT: MovieActorsConnectionWhere
+  OR: [MovieActorsConnectionWhere!]
+  node: ActorWhere
+}
+
+type MovieActorsRelationship {
+  cursor: String!
+  node: Actor!
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MovieSort!]
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
+"""
+input MovieSort {
+  title: SortDirection
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  """
+  Return Movies where all of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_ALL: MovieActorsConnectionWhere
+  """
+  Return Movies where none of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_NONE: MovieActorsConnectionWhere
+  """
+  Return Movies where one of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SINGLE: MovieActorsConnectionWhere
+  """
+  Return Movies where some of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SOME: MovieActorsConnectionWhere
+  """Return Movies where all of the related Actors match this filter"""
+  actors_ALL: ActorWhere
+  """Return Movies where none of the related Actors match this filter"""
+  actors_NONE: ActorWhere
+  """Return Movies where one of the related Actors match this filter"""
+  actors_SINGLE: ActorWhere
+  """Return Movies where some of the related Actors match this filter"""
+  actors_SOME: ActorWhere
+  title: String
+  title_CONTAINS: String
+  title_ENDS_WITH: String
+  title_IN: [String]
+  title_STARTS_WITH: String
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+type Query {
+  actors(options: ActorOptions, where: ActorWhere): [Actor!]!
+  actorsConnection(after: String, first: Int, sort: [ActorSort], where: ActorWhere): ActorsConnection!
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
+
+=== on INTERFACE RELATIONSHIP FIELD, (aggregation does not exists on abstract types)
+
+==== default arguments should disable aggregation
+
+.Schema
+[source,graphql,schema=true]
+----
+type Actor implements Person {
+  username: String!
+  password: String!
+  movies: [Movie!]! @relationship(type: "ACTED_IN", direction: OUT)
+}
+
+interface Person {
+  username: String!
+}
+
+type Movie {
+  title: String
+  actors: [Person!]! @relationship(type: "ACTED_IN", direction: IN) @filterable
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+type Actor implements Person {
+  movies(directed: Boolean = true, options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, directed: Boolean = true, first: Int, sort: [ActorMoviesConnectionSort!], where: ActorMoviesConnectionWhere): ActorMoviesConnection!
+  password: String!
+  username: String!
+}
+
+type ActorEdge {
+  cursor: String!
+  node: Actor!
+}
+
+type ActorMoviesConnection {
+  edges: [ActorMoviesRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input ActorMoviesConnectionSort {
+  node: MovieSort
+}
+
+input ActorMoviesConnectionWhere {
+  AND: [ActorMoviesConnectionWhere!]
+  NOT: ActorMoviesConnectionWhere
+  OR: [ActorMoviesConnectionWhere!]
+  node: MovieWhere
+}
+
+type ActorMoviesRelationship {
+  cursor: String!
+  node: Movie!
+}
+
+input ActorOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more ActorSort objects to sort Actors by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [ActorSort!]
+}
+
+"""
+Fields to sort Actors by. The order in which sorts are applied is not guaranteed when specifying many fields in one ActorSort object.
+"""
+input ActorSort {
+  password: SortDirection
+  username: SortDirection
+}
+
+input ActorWhere {
+  AND: [ActorWhere!]
+  NOT: ActorWhere
+  OR: [ActorWhere!]
+  """
+  Return Actors where all of the related ActorMoviesConnections match this filter
+  """
+  moviesConnection_ALL: ActorMoviesConnectionWhere
+  """
+  Return Actors where none of the related ActorMoviesConnections match this filter
+  """
+  moviesConnection_NONE: ActorMoviesConnectionWhere
+  """
+  Return Actors where one of the related ActorMoviesConnections match this filter
+  """
+  moviesConnection_SINGLE: ActorMoviesConnectionWhere
+  """
+  Return Actors where some of the related ActorMoviesConnections match this filter
+  """
+  moviesConnection_SOME: ActorMoviesConnectionWhere
+  """Return Actors where all of the related Movies match this filter"""
+  movies_ALL: MovieWhere
+  """Return Actors where none of the related Movies match this filter"""
+  movies_NONE: MovieWhere
+  """Return Actors where one of the related Movies match this filter"""
+  movies_SINGLE: MovieWhere
+  """Return Actors where some of the related Movies match this filter"""
+  movies_SOME: MovieWhere
+  password: String
+  password_CONTAINS: String
+  password_ENDS_WITH: String
+  password_IN: [String!]
+  password_STARTS_WITH: String
+  username: String
+  username_CONTAINS: String
+  username_ENDS_WITH: String
+  username_IN: [String!]
+  username_STARTS_WITH: String
+}
+
+type ActorsConnection {
+  edges: [ActorEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+type Movie {
+  actors(directed: Boolean = true, options: PersonOptions, where: PersonWhere): [Person!]!
+  actorsConnection(after: String, directed: Boolean = true, first: Int, sort: [MovieActorsConnectionSort!], where: MovieActorsConnectionWhere): MovieActorsConnection!
+  title: String
+}
+
+type MovieActorsConnection {
+  edges: [MovieActorsRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input MovieActorsConnectionSort {
+  node: PersonSort
+}
+
+input MovieActorsConnectionWhere {
+  AND: [MovieActorsConnectionWhere!]
+  NOT: MovieActorsConnectionWhere
+  OR: [MovieActorsConnectionWhere!]
+  node: PersonWhere
+}
+
+type MovieActorsRelationship {
+  cursor: String!
+  node: Person!
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MovieSort!]
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
+"""
+input MovieSort {
+  title: SortDirection
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  """
+  Return Movies where all of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_ALL: MovieActorsConnectionWhere
+  """
+  Return Movies where none of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_NONE: MovieActorsConnectionWhere
+  """
+  Return Movies where one of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SINGLE: MovieActorsConnectionWhere
+  """
+  Return Movies where some of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SOME: MovieActorsConnectionWhere
+  """Return Movies where all of the related People match this filter"""
+  actors_ALL: PersonWhere
+  """Return Movies where none of the related People match this filter"""
+  actors_NONE: PersonWhere
+  """Return Movies where one of the related People match this filter"""
+  actors_SINGLE: PersonWhere
+  """Return Movies where some of the related People match this filter"""
+  actors_SOME: PersonWhere
+  title: String
+  title_CONTAINS: String
+  title_ENDS_WITH: String
+  title_IN: [String]
+  title_STARTS_WITH: String
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+type PeopleConnection {
+  edges: [PersonEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+interface Person {
+  username: String!
+}
+
+type PersonEdge {
+  cursor: String!
+  node: Person!
+}
+
+enum PersonImplementation {
+  Actor
+}
+
+input PersonOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more PersonSort objects to sort People by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [PersonSort]
+}
+
+"""
+Fields to sort People by. The order in which sorts are applied is not guaranteed when specifying many fields in one PersonSort object.
+"""
+input PersonSort {
+  username: SortDirection
+}
+
+input PersonWhere {
+  AND: [PersonWhere!]
+  NOT: PersonWhere
+  OR: [PersonWhere!]
+  typename_IN: [PersonImplementation!]
+  username: String
+  username_CONTAINS: String
+  username_ENDS_WITH: String
+  username_IN: [String!]
+  username_STARTS_WITH: String
+}
+
+type Query {
+  actors(options: ActorOptions, where: ActorWhere): [Actor!]!
+  actorsConnection(after: String, first: Int, sort: [ActorSort], where: ActorWhere): ActorsConnection!
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+  people(options: PersonOptions, where: PersonWhere): [Person!]!
+  peopleConnection(after: String, first: Int, sort: [PersonSort], where: PersonWhere): PeopleConnection!
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
+
+==== enable only value filters
+
+.Schema
+[source,graphql,schema=true]
+----
+type Actor implements Person {
+  username: String!
+  password: String!
+  movies: [Movie!]! @relationship(type: "ACTED_IN", direction: OUT)
+}
+
+interface Person {
+  username: String!
+}
+
+type Movie {
+  title: String
+  actors: [Person!]! @relationship(type: "ACTED_IN", direction: IN) @filterable(byValue: true)
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+type Actor implements Person {
+  movies(directed: Boolean = true, options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, directed: Boolean = true, first: Int, sort: [ActorMoviesConnectionSort!], where: ActorMoviesConnectionWhere): ActorMoviesConnection!
+  password: String!
+  username: String!
+}
+
+type ActorEdge {
+  cursor: String!
+  node: Actor!
+}
+
+type ActorMoviesConnection {
+  edges: [ActorMoviesRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input ActorMoviesConnectionSort {
+  node: MovieSort
+}
+
+input ActorMoviesConnectionWhere {
+  AND: [ActorMoviesConnectionWhere!]
+  NOT: ActorMoviesConnectionWhere
+  OR: [ActorMoviesConnectionWhere!]
+  node: MovieWhere
+}
+
+type ActorMoviesRelationship {
+  cursor: String!
+  node: Movie!
+}
+
+input ActorOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more ActorSort objects to sort Actors by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [ActorSort!]
+}
+
+"""
+Fields to sort Actors by. The order in which sorts are applied is not guaranteed when specifying many fields in one ActorSort object.
+"""
+input ActorSort {
+  password: SortDirection
+  username: SortDirection
+}
+
+input ActorWhere {
+  AND: [ActorWhere!]
+  NOT: ActorWhere
+  OR: [ActorWhere!]
+  """
+  Return Actors where all of the related ActorMoviesConnections match this filter
+  """
+  moviesConnection_ALL: ActorMoviesConnectionWhere
+  """
+  Return Actors where none of the related ActorMoviesConnections match this filter
+  """
+  moviesConnection_NONE: ActorMoviesConnectionWhere
+  """
+  Return Actors where one of the related ActorMoviesConnections match this filter
+  """
+  moviesConnection_SINGLE: ActorMoviesConnectionWhere
+  """
+  Return Actors where some of the related ActorMoviesConnections match this filter
+  """
+  moviesConnection_SOME: ActorMoviesConnectionWhere
+  """Return Actors where all of the related Movies match this filter"""
+  movies_ALL: MovieWhere
+  """Return Actors where none of the related Movies match this filter"""
+  movies_NONE: MovieWhere
+  """Return Actors where one of the related Movies match this filter"""
+  movies_SINGLE: MovieWhere
+  """Return Actors where some of the related Movies match this filter"""
+  movies_SOME: MovieWhere
+  password: String
+  password_CONTAINS: String
+  password_ENDS_WITH: String
+  password_IN: [String!]
+  password_STARTS_WITH: String
+  username: String
+  username_CONTAINS: String
+  username_ENDS_WITH: String
+  username_IN: [String!]
+  username_STARTS_WITH: String
+}
+
+type ActorsConnection {
+  edges: [ActorEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+type Movie {
+  actors(directed: Boolean = true, options: PersonOptions, where: PersonWhere): [Person!]!
+  actorsConnection(after: String, directed: Boolean = true, first: Int, sort: [MovieActorsConnectionSort!], where: MovieActorsConnectionWhere): MovieActorsConnection!
+  title: String
+}
+
+type MovieActorsConnection {
+  edges: [MovieActorsRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input MovieActorsConnectionSort {
+  node: PersonSort
+}
+
+input MovieActorsConnectionWhere {
+  AND: [MovieActorsConnectionWhere!]
+  NOT: MovieActorsConnectionWhere
+  OR: [MovieActorsConnectionWhere!]
+  node: PersonWhere
+}
+
+type MovieActorsRelationship {
+  cursor: String!
+  node: Person!
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MovieSort!]
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
+"""
+input MovieSort {
+  title: SortDirection
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  """
+  Return Movies where all of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_ALL: MovieActorsConnectionWhere
+  """
+  Return Movies where none of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_NONE: MovieActorsConnectionWhere
+  """
+  Return Movies where one of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SINGLE: MovieActorsConnectionWhere
+  """
+  Return Movies where some of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SOME: MovieActorsConnectionWhere
+  """Return Movies where all of the related People match this filter"""
+  actors_ALL: PersonWhere
+  """Return Movies where none of the related People match this filter"""
+  actors_NONE: PersonWhere
+  """Return Movies where one of the related People match this filter"""
+  actors_SINGLE: PersonWhere
+  """Return Movies where some of the related People match this filter"""
+  actors_SOME: PersonWhere
+  title: String
+  title_CONTAINS: String
+  title_ENDS_WITH: String
+  title_IN: [String]
+  title_STARTS_WITH: String
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+type PeopleConnection {
+  edges: [PersonEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+interface Person {
+  username: String!
+}
+
+type PersonEdge {
+  cursor: String!
+  node: Person!
+}
+
+enum PersonImplementation {
+  Actor
+}
+
+input PersonOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more PersonSort objects to sort People by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [PersonSort]
+}
+
+"""
+Fields to sort People by. The order in which sorts are applied is not guaranteed when specifying many fields in one PersonSort object.
+"""
+input PersonSort {
+  username: SortDirection
+}
+
+input PersonWhere {
+  AND: [PersonWhere!]
+  NOT: PersonWhere
+  OR: [PersonWhere!]
+  typename_IN: [PersonImplementation!]
+  username: String
+  username_CONTAINS: String
+  username_ENDS_WITH: String
+  username_IN: [String!]
+  username_STARTS_WITH: String
+}
+
+type Query {
+  actors(options: ActorOptions, where: ActorWhere): [Actor!]!
+  actorsConnection(after: String, first: Int, sort: [ActorSort], where: ActorWhere): ActorsConnection!
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+  people(options: PersonOptions, where: PersonWhere): [Person!]!
+  peopleConnection(after: String, first: Int, sort: [PersonSort], where: PersonWhere): PeopleConnection!
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
+
+=== on UNION RELATIONSHIP FIELD, (aggregation does not exists on abstract types)
+
+==== default arguments should disable aggregation
+
+.Schema
+[source,graphql,schema=true]
+----
+type Actor {
+  username: String!
+  password: String!
+  movies: [Movie!]! @relationship(type: "ACTED_IN", direction: OUT)
+}
+
+type Appearance {
+  username: String!
+  password: String!
+  movies: [Movie!]! @relationship(type: "ACTED_IN", direction: OUT)
+}
+
+union Person = Actor | Appearance
+
+type Movie {
+  title: String
+  actors: [Person!]! @relationship(type: "ACTED_IN", direction: IN) @filterable
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+type Actor {
+  movies(directed: Boolean = true, options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, directed: Boolean = true, first: Int, sort: [ActorMoviesConnectionSort!], where: ActorMoviesConnectionWhere): ActorMoviesConnection!
+  password: String!
+  username: String!
+}
+
+type ActorEdge {
+  cursor: String!
+  node: Actor!
+}
+
+type ActorMoviesConnection {
+  edges: [ActorMoviesRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input ActorMoviesConnectionSort {
+  node: MovieSort
+}
+
+input ActorMoviesConnectionWhere {
+  AND: [ActorMoviesConnectionWhere!]
+  NOT: ActorMoviesConnectionWhere
+  OR: [ActorMoviesConnectionWhere!]
+  node: MovieWhere
+}
+
+type ActorMoviesRelationship {
+  cursor: String!
+  node: Movie!
+}
+
+input ActorOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more ActorSort objects to sort Actors by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [ActorSort!]
+}
+
+"""
+Fields to sort Actors by. The order in which sorts are applied is not guaranteed when specifying many fields in one ActorSort object.
+"""
+input ActorSort {
+  password: SortDirection
+  username: SortDirection
+}
+
+input ActorWhere {
+  AND: [ActorWhere!]
+  NOT: ActorWhere
+  OR: [ActorWhere!]
+  """
+  Return Actors where all of the related ActorMoviesConnections match this filter
+  """
+  moviesConnection_ALL: ActorMoviesConnectionWhere
+  """
+  Return Actors where none of the related ActorMoviesConnections match this filter
+  """
+  moviesConnection_NONE: ActorMoviesConnectionWhere
+  """
+  Return Actors where one of the related ActorMoviesConnections match this filter
+  """
+  moviesConnection_SINGLE: ActorMoviesConnectionWhere
+  """
+  Return Actors where some of the related ActorMoviesConnections match this filter
+  """
+  moviesConnection_SOME: ActorMoviesConnectionWhere
+  """Return Actors where all of the related Movies match this filter"""
+  movies_ALL: MovieWhere
+  """Return Actors where none of the related Movies match this filter"""
+  movies_NONE: MovieWhere
+  """Return Actors where one of the related Movies match this filter"""
+  movies_SINGLE: MovieWhere
+  """Return Actors where some of the related Movies match this filter"""
+  movies_SOME: MovieWhere
+  password: String
+  password_CONTAINS: String
+  password_ENDS_WITH: String
+  password_IN: [String!]
+  password_STARTS_WITH: String
+  username: String
+  username_CONTAINS: String
+  username_ENDS_WITH: String
+  username_IN: [String!]
+  username_STARTS_WITH: String
+}
+
+type ActorsConnection {
+  edges: [ActorEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+type Appearance {
+  movies(directed: Boolean = true, options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, directed: Boolean = true, first: Int, sort: [AppearanceMoviesConnectionSort!], where: AppearanceMoviesConnectionWhere): AppearanceMoviesConnection!
+  password: String!
+  username: String!
+}
+
+type AppearanceEdge {
+  cursor: String!
+  node: Appearance!
+}
+
+type AppearanceMoviesConnection {
+  edges: [AppearanceMoviesRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input AppearanceMoviesConnectionSort {
+  node: MovieSort
+}
+
+input AppearanceMoviesConnectionWhere {
+  AND: [AppearanceMoviesConnectionWhere!]
+  NOT: AppearanceMoviesConnectionWhere
+  OR: [AppearanceMoviesConnectionWhere!]
+  node: MovieWhere
+}
+
+type AppearanceMoviesRelationship {
+  cursor: String!
+  node: Movie!
+}
+
+input AppearanceOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more AppearanceSort objects to sort Appearances by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [AppearanceSort!]
+}
+
+"""
+Fields to sort Appearances by. The order in which sorts are applied is not guaranteed when specifying many fields in one AppearanceSort object.
+"""
+input AppearanceSort {
+  password: SortDirection
+  username: SortDirection
+}
+
+input AppearanceWhere {
+  AND: [AppearanceWhere!]
+  NOT: AppearanceWhere
+  OR: [AppearanceWhere!]
+  """
+  Return Appearances where all of the related AppearanceMoviesConnections match this filter
+  """
+  moviesConnection_ALL: AppearanceMoviesConnectionWhere
+  """
+  Return Appearances where none of the related AppearanceMoviesConnections match this filter
+  """
+  moviesConnection_NONE: AppearanceMoviesConnectionWhere
+  """
+  Return Appearances where one of the related AppearanceMoviesConnections match this filter
+  """
+  moviesConnection_SINGLE: AppearanceMoviesConnectionWhere
+  """
+  Return Appearances where some of the related AppearanceMoviesConnections match this filter
+  """
+  moviesConnection_SOME: AppearanceMoviesConnectionWhere
+  """Return Appearances where all of the related Movies match this filter"""
+  movies_ALL: MovieWhere
+  """Return Appearances where none of the related Movies match this filter"""
+  movies_NONE: MovieWhere
+  """Return Appearances where one of the related Movies match this filter"""
+  movies_SINGLE: MovieWhere
+  """Return Appearances where some of the related Movies match this filter"""
+  movies_SOME: MovieWhere
+  password: String
+  password_CONTAINS: String
+  password_ENDS_WITH: String
+  password_IN: [String!]
+  password_STARTS_WITH: String
+  username: String
+  username_CONTAINS: String
+  username_ENDS_WITH: String
+  username_IN: [String!]
+  username_STARTS_WITH: String
+}
+
+type AppearancesConnection {
+  edges: [AppearanceEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+type Movie {
+  actors(directed: Boolean = true, options: QueryOptions, where: PersonWhere): [Person!]!
+  actorsConnection(after: String, directed: Boolean = true, first: Int, where: MovieActorsConnectionWhere): MovieActorsConnection!
+  title: String
+}
+
+input MovieActorsActorConnectionWhere {
+  AND: [MovieActorsActorConnectionWhere!]
+  NOT: MovieActorsActorConnectionWhere
+  OR: [MovieActorsActorConnectionWhere!]
+  node: ActorWhere
+}
+
+input MovieActorsAppearanceConnectionWhere {
+  AND: [MovieActorsAppearanceConnectionWhere!]
+  NOT: MovieActorsAppearanceConnectionWhere
+  OR: [MovieActorsAppearanceConnectionWhere!]
+  node: AppearanceWhere
+}
+
+type MovieActorsConnection {
+  edges: [MovieActorsRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input MovieActorsConnectionWhere {
+  Actor: MovieActorsActorConnectionWhere
+  Appearance: MovieActorsAppearanceConnectionWhere
+}
+
+type MovieActorsRelationship {
+  cursor: String!
+  node: Person!
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MovieSort!]
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
+"""
+input MovieSort {
+  title: SortDirection
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  """
+  Return Movies where all of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_ALL: MovieActorsConnectionWhere
+  """
+  Return Movies where none of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_NONE: MovieActorsConnectionWhere
+  """
+  Return Movies where one of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SINGLE: MovieActorsConnectionWhere
+  """
+  Return Movies where some of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SOME: MovieActorsConnectionWhere
+  """Return Movies where all of the related People match this filter"""
+  actors_ALL: PersonWhere
+  """Return Movies where none of the related People match this filter"""
+  actors_NONE: PersonWhere
+  """Return Movies where one of the related People match this filter"""
+  actors_SINGLE: PersonWhere
+  """Return Movies where some of the related People match this filter"""
+  actors_SOME: PersonWhere
+  title: String
+  title_CONTAINS: String
+  title_ENDS_WITH: String
+  title_IN: [String]
+  title_STARTS_WITH: String
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+union Person = Actor | Appearance
+
+input PersonWhere {
+  Actor: ActorWhere
+  Appearance: AppearanceWhere
+}
+
+type Query {
+  actors(options: ActorOptions, where: ActorWhere): [Actor!]!
+  actorsConnection(after: String, first: Int, sort: [ActorSort], where: ActorWhere): ActorsConnection!
+  appearances(options: AppearanceOptions, where: AppearanceWhere): [Appearance!]!
+  appearancesConnection(after: String, first: Int, sort: [AppearanceSort], where: AppearanceWhere): AppearancesConnection!
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+  people(options: QueryOptions, where: PersonWhere): [Person!]!
+}
+
+"""Input type for options that can be specified on a query operation."""
+input QueryOptions {
+  limit: Int
+  offset: Int
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
+
+==== enable only value filters
+
+.Schema
+[source,graphql,schema=true]
+----
+type Actor {
+  username: String!
+  password: String!
+  movies: [Movie!]! @relationship(type: "ACTED_IN", direction: OUT)
+}
+
+type Appearance {
+  username: String!
+  password: String!
+  movies: [Movie!]! @relationship(type: "ACTED_IN", direction: OUT)
+}
+
+union Person = Actor | Appearance
+
+type Movie {
+  title: String
+  actors: [Person!]! @relationship(type: "ACTED_IN", direction: IN) @filterable(byValue: true)
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+type Actor {
+  movies(directed: Boolean = true, options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, directed: Boolean = true, first: Int, sort: [ActorMoviesConnectionSort!], where: ActorMoviesConnectionWhere): ActorMoviesConnection!
+  password: String!
+  username: String!
+}
+
+type ActorEdge {
+  cursor: String!
+  node: Actor!
+}
+
+type ActorMoviesConnection {
+  edges: [ActorMoviesRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input ActorMoviesConnectionSort {
+  node: MovieSort
+}
+
+input ActorMoviesConnectionWhere {
+  AND: [ActorMoviesConnectionWhere!]
+  NOT: ActorMoviesConnectionWhere
+  OR: [ActorMoviesConnectionWhere!]
+  node: MovieWhere
+}
+
+type ActorMoviesRelationship {
+  cursor: String!
+  node: Movie!
+}
+
+input ActorOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more ActorSort objects to sort Actors by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [ActorSort!]
+}
+
+"""
+Fields to sort Actors by. The order in which sorts are applied is not guaranteed when specifying many fields in one ActorSort object.
+"""
+input ActorSort {
+  password: SortDirection
+  username: SortDirection
+}
+
+input ActorWhere {
+  AND: [ActorWhere!]
+  NOT: ActorWhere
+  OR: [ActorWhere!]
+  """
+  Return Actors where all of the related ActorMoviesConnections match this filter
+  """
+  moviesConnection_ALL: ActorMoviesConnectionWhere
+  """
+  Return Actors where none of the related ActorMoviesConnections match this filter
+  """
+  moviesConnection_NONE: ActorMoviesConnectionWhere
+  """
+  Return Actors where one of the related ActorMoviesConnections match this filter
+  """
+  moviesConnection_SINGLE: ActorMoviesConnectionWhere
+  """
+  Return Actors where some of the related ActorMoviesConnections match this filter
+  """
+  moviesConnection_SOME: ActorMoviesConnectionWhere
+  """Return Actors where all of the related Movies match this filter"""
+  movies_ALL: MovieWhere
+  """Return Actors where none of the related Movies match this filter"""
+  movies_NONE: MovieWhere
+  """Return Actors where one of the related Movies match this filter"""
+  movies_SINGLE: MovieWhere
+  """Return Actors where some of the related Movies match this filter"""
+  movies_SOME: MovieWhere
+  password: String
+  password_CONTAINS: String
+  password_ENDS_WITH: String
+  password_IN: [String!]
+  password_STARTS_WITH: String
+  username: String
+  username_CONTAINS: String
+  username_ENDS_WITH: String
+  username_IN: [String!]
+  username_STARTS_WITH: String
+}
+
+type ActorsConnection {
+  edges: [ActorEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+type Appearance {
+  movies(directed: Boolean = true, options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, directed: Boolean = true, first: Int, sort: [AppearanceMoviesConnectionSort!], where: AppearanceMoviesConnectionWhere): AppearanceMoviesConnection!
+  password: String!
+  username: String!
+}
+
+type AppearanceEdge {
+  cursor: String!
+  node: Appearance!
+}
+
+type AppearanceMoviesConnection {
+  edges: [AppearanceMoviesRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input AppearanceMoviesConnectionSort {
+  node: MovieSort
+}
+
+input AppearanceMoviesConnectionWhere {
+  AND: [AppearanceMoviesConnectionWhere!]
+  NOT: AppearanceMoviesConnectionWhere
+  OR: [AppearanceMoviesConnectionWhere!]
+  node: MovieWhere
+}
+
+type AppearanceMoviesRelationship {
+  cursor: String!
+  node: Movie!
+}
+
+input AppearanceOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more AppearanceSort objects to sort Appearances by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [AppearanceSort!]
+}
+
+"""
+Fields to sort Appearances by. The order in which sorts are applied is not guaranteed when specifying many fields in one AppearanceSort object.
+"""
+input AppearanceSort {
+  password: SortDirection
+  username: SortDirection
+}
+
+input AppearanceWhere {
+  AND: [AppearanceWhere!]
+  NOT: AppearanceWhere
+  OR: [AppearanceWhere!]
+  """
+  Return Appearances where all of the related AppearanceMoviesConnections match this filter
+  """
+  moviesConnection_ALL: AppearanceMoviesConnectionWhere
+  """
+  Return Appearances where none of the related AppearanceMoviesConnections match this filter
+  """
+  moviesConnection_NONE: AppearanceMoviesConnectionWhere
+  """
+  Return Appearances where one of the related AppearanceMoviesConnections match this filter
+  """
+  moviesConnection_SINGLE: AppearanceMoviesConnectionWhere
+  """
+  Return Appearances where some of the related AppearanceMoviesConnections match this filter
+  """
+  moviesConnection_SOME: AppearanceMoviesConnectionWhere
+  """Return Appearances where all of the related Movies match this filter"""
+  movies_ALL: MovieWhere
+  """Return Appearances where none of the related Movies match this filter"""
+  movies_NONE: MovieWhere
+  """Return Appearances where one of the related Movies match this filter"""
+  movies_SINGLE: MovieWhere
+  """Return Appearances where some of the related Movies match this filter"""
+  movies_SOME: MovieWhere
+  password: String
+  password_CONTAINS: String
+  password_ENDS_WITH: String
+  password_IN: [String!]
+  password_STARTS_WITH: String
+  username: String
+  username_CONTAINS: String
+  username_ENDS_WITH: String
+  username_IN: [String!]
+  username_STARTS_WITH: String
+}
+
+type AppearancesConnection {
+  edges: [AppearanceEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+type Movie {
+  actors(directed: Boolean = true, options: QueryOptions, where: PersonWhere): [Person!]!
+  actorsConnection(after: String, directed: Boolean = true, first: Int, where: MovieActorsConnectionWhere): MovieActorsConnection!
+  title: String
+}
+
+input MovieActorsActorConnectionWhere {
+  AND: [MovieActorsActorConnectionWhere!]
+  NOT: MovieActorsActorConnectionWhere
+  OR: [MovieActorsActorConnectionWhere!]
+  node: ActorWhere
+}
+
+input MovieActorsAppearanceConnectionWhere {
+  AND: [MovieActorsAppearanceConnectionWhere!]
+  NOT: MovieActorsAppearanceConnectionWhere
+  OR: [MovieActorsAppearanceConnectionWhere!]
+  node: AppearanceWhere
+}
+
+type MovieActorsConnection {
+  edges: [MovieActorsRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input MovieActorsConnectionWhere {
+  Actor: MovieActorsActorConnectionWhere
+  Appearance: MovieActorsAppearanceConnectionWhere
+}
+
+type MovieActorsRelationship {
+  cursor: String!
+  node: Person!
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MovieSort!]
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
+"""
+input MovieSort {
+  title: SortDirection
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  """
+  Return Movies where all of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_ALL: MovieActorsConnectionWhere
+  """
+  Return Movies where none of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_NONE: MovieActorsConnectionWhere
+  """
+  Return Movies where one of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SINGLE: MovieActorsConnectionWhere
+  """
+  Return Movies where some of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SOME: MovieActorsConnectionWhere
+  """Return Movies where all of the related People match this filter"""
+  actors_ALL: PersonWhere
+  """Return Movies where none of the related People match this filter"""
+  actors_NONE: PersonWhere
+  """Return Movies where one of the related People match this filter"""
+  actors_SINGLE: PersonWhere
+  """Return Movies where some of the related People match this filter"""
+  actors_SOME: PersonWhere
+  title: String
+  title_CONTAINS: String
+  title_ENDS_WITH: String
+  title_IN: [String]
+  title_STARTS_WITH: String
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+union Person = Actor | Appearance
+
+input PersonWhere {
+  Actor: ActorWhere
+  Appearance: AppearanceWhere
+}
+
+type Query {
+  actors(options: ActorOptions, where: ActorWhere): [Actor!]!
+  actorsConnection(after: String, first: Int, sort: [ActorSort], where: ActorWhere): ActorsConnection!
+  appearances(options: AppearanceOptions, where: AppearanceWhere): [Appearance!]!
+  appearancesConnection(after: String, first: Int, sort: [AppearanceSort], where: AppearanceWhere): AppearancesConnection!
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+  people(options: QueryOptions, where: PersonWhere): [Person!]!
+}
+
+"""Input type for options that can be specified on a query operation."""
+input QueryOptions {
+  limit: Int
+  offset: Int
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
diff --git a/core/src/test/resources/tck-test-files/schema/v2/directives/private.adoc b/core/src/test/resources/tck-test-files/schema/v2/directives/private.adoc
index 1cf1d3e1..8c118187 100644
--- a/core/src/test/resources/tck-test-files/schema/v2/directives/private.adoc
+++ b/core/src/test/resources/tck-test-files/schema/v2/directives/private.adoc
@@ -21,7 +21,7 @@ type User implements UserInterface {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -133,8 +133,6 @@ input UserWhere {
 
 ----
 
-'''
-
 == private is not inherited
 
 .Schema
@@ -153,7 +151,7 @@ type User implements UserInterface {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -271,6 +269,3 @@ input UserWhere {
 }
 
 ----
-
-'''
-
diff --git a/core/src/test/resources/tck-test-files/schema/v2/directives/private.js.adoc b/core/src/test/resources/tck-test-files/schema/v2/directives/private.js.adoc
new file mode 100644
index 00000000..e973d526
--- /dev/null
+++ b/core/src/test/resources/tck-test-files/schema/v2/directives/private.js.adoc
@@ -0,0 +1,286 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= @private directive
+
+== does not add fields to schema
+
+.Schema
+[source,graphql,schema=true]
+----
+interface UserInterface {
+  id: ID
+  private: String @private
+}
+
+type User implements UserInterface {
+  id: ID
+  password: String @private
+  private: String @private
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+type Query {
+  userInterfaces(options: UserInterfaceOptions, where: UserInterfaceWhere): [UserInterface!]!
+  userInterfacesConnection(after: String, first: Int, sort: [UserInterfaceSort], where: UserInterfaceWhere): UserInterfacesConnection!
+  users(options: UserOptions, where: UserWhere): [User!]!
+  usersConnection(after: String, first: Int, sort: [UserSort], where: UserWhere): UsersConnection!
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+
+type User implements UserInterface {
+  id: ID
+}
+
+type UserEdge {
+  cursor: String!
+  node: User!
+}
+
+interface UserInterface {
+  id: ID
+}
+
+type UserInterfaceEdge {
+  cursor: String!
+  node: UserInterface!
+}
+
+enum UserInterfaceImplementation {
+  User
+}
+
+input UserInterfaceOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more UserInterfaceSort objects to sort UserInterfaces by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [UserInterfaceSort]
+}
+
+"""
+Fields to sort UserInterfaces by. The order in which sorts are applied is not guaranteed when specifying many fields in one UserInterfaceSort object.
+"""
+input UserInterfaceSort {
+  id: SortDirection
+}
+
+input UserInterfaceWhere {
+  AND: [UserInterfaceWhere!]
+  NOT: UserInterfaceWhere
+  OR: [UserInterfaceWhere!]
+  id: ID
+  id_CONTAINS: ID
+  id_ENDS_WITH: ID
+  id_IN: [ID]
+  id_STARTS_WITH: ID
+  typename_IN: [UserInterfaceImplementation!]
+}
+
+type UserInterfacesConnection {
+  edges: [UserInterfaceEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input UserOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more UserSort objects to sort Users by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [UserSort!]
+}
+
+"""
+Fields to sort Users by. The order in which sorts are applied is not guaranteed when specifying many fields in one UserSort object.
+"""
+input UserSort {
+  id: SortDirection
+}
+
+input UserWhere {
+  AND: [UserWhere!]
+  NOT: UserWhere
+  OR: [UserWhere!]
+  id: ID
+  id_CONTAINS: ID
+  id_ENDS_WITH: ID
+  id_IN: [ID]
+  id_STARTS_WITH: ID
+}
+
+type UsersConnection {
+  edges: [UserEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+----
+
+== private is not inherited
+
+.Schema
+[source,graphql,schema=true]
+----
+interface UserInterface {
+  id: ID
+  private: String @private
+}
+
+type User implements UserInterface {
+  id: ID
+  password: String @private
+  private: String
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+type Query {
+  userInterfaces(options: UserInterfaceOptions, where: UserInterfaceWhere): [UserInterface!]!
+  userInterfacesConnection(after: String, first: Int, sort: [UserInterfaceSort], where: UserInterfaceWhere): UserInterfacesConnection!
+  users(options: UserOptions, where: UserWhere): [User!]!
+  usersConnection(after: String, first: Int, sort: [UserSort], where: UserWhere): UsersConnection!
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+
+type User implements UserInterface {
+  id: ID
+  private: String
+}
+
+type UserEdge {
+  cursor: String!
+  node: User!
+}
+
+interface UserInterface {
+  id: ID
+}
+
+type UserInterfaceEdge {
+  cursor: String!
+  node: UserInterface!
+}
+
+enum UserInterfaceImplementation {
+  User
+}
+
+input UserInterfaceOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more UserInterfaceSort objects to sort UserInterfaces by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [UserInterfaceSort]
+}
+
+"""
+Fields to sort UserInterfaces by. The order in which sorts are applied is not guaranteed when specifying many fields in one UserInterfaceSort object.
+"""
+input UserInterfaceSort {
+  id: SortDirection
+}
+
+input UserInterfaceWhere {
+  AND: [UserInterfaceWhere!]
+  NOT: UserInterfaceWhere
+  OR: [UserInterfaceWhere!]
+  id: ID
+  id_CONTAINS: ID
+  id_ENDS_WITH: ID
+  id_IN: [ID]
+  id_STARTS_WITH: ID
+  typename_IN: [UserInterfaceImplementation!]
+}
+
+type UserInterfacesConnection {
+  edges: [UserInterfaceEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input UserOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more UserSort objects to sort Users by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [UserSort!]
+}
+
+"""
+Fields to sort Users by. The order in which sorts are applied is not guaranteed when specifying many fields in one UserSort object.
+"""
+input UserSort {
+  id: SortDirection
+  private: SortDirection
+}
+
+input UserWhere {
+  AND: [UserWhere!]
+  NOT: UserWhere
+  OR: [UserWhere!]
+  id: ID
+  id_CONTAINS: ID
+  id_ENDS_WITH: ID
+  id_IN: [ID]
+  id_STARTS_WITH: ID
+  private: String
+  private_CONTAINS: String
+  private_ENDS_WITH: String
+  private_IN: [String]
+  private_STARTS_WITH: String
+}
+
+type UsersConnection {
+  edges: [UserEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+----
diff --git a/core/src/test/resources/tck-test-files/schema/v2/directives/query.adoc b/core/src/test/resources/tck-test-files/schema/v2/directives/query.adoc
index 63baa9a2..7fbfc6c8 100644
--- a/core/src/test/resources/tck-test-files/schema/v2/directives/query.adoc
+++ b/core/src/test/resources/tck-test-files/schema/v2/directives/query.adoc
@@ -25,7 +25,7 @@ extend schema @query {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -139,8 +139,6 @@ input MovieWhere {
 
 ----
 
-'''
-
 === should disable read and aggregate
 
 .Schema
@@ -160,7 +158,7 @@ extend schema @query(read: false) {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -171,6 +169,3 @@ type Query {
 }
 
 ----
-
-'''
-
diff --git a/core/src/test/resources/tck-test-files/schema/v2/directives/query.js.adoc b/core/src/test/resources/tck-test-files/schema/v2/directives/query.js.adoc
new file mode 100644
index 00000000..503950fd
--- /dev/null
+++ b/core/src/test/resources/tck-test-files/schema/v2/directives/query.js.adoc
@@ -0,0 +1,176 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= @query directive
+
+== on SCHEMA
+
+=== default arguments should disable aggregation
+
+.Schema
+[source,graphql,schema=true]
+----
+type Actor {
+  username: String!
+  password: String!
+}
+
+type Movie {
+  title: String
+}
+
+extend schema @query {
+  query: Query
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+type Actor {
+  password: String!
+  username: String!
+}
+
+type ActorEdge {
+  cursor: String!
+  node: Actor!
+}
+
+input ActorOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more ActorSort objects to sort Actors by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [ActorSort!]
+}
+
+"""
+Fields to sort Actors by. The order in which sorts are applied is not guaranteed when specifying many fields in one ActorSort object.
+"""
+input ActorSort {
+  password: SortDirection
+  username: SortDirection
+}
+
+input ActorWhere {
+  AND: [ActorWhere!]
+  NOT: ActorWhere
+  OR: [ActorWhere!]
+  password: String
+  password_CONTAINS: String
+  password_ENDS_WITH: String
+  password_IN: [String!]
+  password_STARTS_WITH: String
+  username: String
+  username_CONTAINS: String
+  username_ENDS_WITH: String
+  username_IN: [String!]
+  username_STARTS_WITH: String
+}
+
+type ActorsConnection {
+  edges: [ActorEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+type Movie {
+  title: String
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MovieSort!]
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
+"""
+input MovieSort {
+  title: SortDirection
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  title: String
+  title_CONTAINS: String
+  title_ENDS_WITH: String
+  title_IN: [String]
+  title_STARTS_WITH: String
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+type Query {
+  actors(options: ActorOptions, where: ActorWhere): [Actor!]!
+  actorsConnection(after: String, first: Int, sort: [ActorSort], where: ActorWhere): ActorsConnection!
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
+
+=== should disable read and aggregate
+
+.Schema
+[source,graphql,schema=true]
+----
+type Actor {
+  name: String
+}
+
+type Movie {
+  title: String
+}
+
+extend schema @query(read: false) {
+  query: Query
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+type Query
+----
diff --git a/core/src/test/resources/tck-test-files/schema/v2/directives/relationship-aggregate.adoc b/core/src/test/resources/tck-test-files/schema/v2/directives/relationship-aggregate.adoc
index 69443bd0..f4448ffa 100644
--- a/core/src/test/resources/tck-test-files/schema/v2/directives/relationship-aggregate.adoc
+++ b/core/src/test/resources/tck-test-files/schema/v2/directives/relationship-aggregate.adoc
@@ -20,7 +20,7 @@ type Movie {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -174,8 +174,6 @@ input MovieWhere {
 
 ----
 
-'''
-
 == snapshot tests
 
 === aggregate argument set as false
@@ -195,7 +193,7 @@ type Movie {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -349,8 +347,6 @@ input MovieWhere {
 
 ----
 
-'''
-
 === on INTERFACE
 
 ==== aggregate argument set as false, (no-op as abstract does not support aggregation)
@@ -375,7 +371,7 @@ type Movie {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -581,8 +577,6 @@ input PersonWhere {
 
 ----
 
-'''
-
 === on UNION
 
 ==== aggregate argument set as false, (no-op as abstract does not support aggregation)
@@ -608,7 +602,7 @@ type Movie {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -823,6 +817,3 @@ input QueryOptions {
 }
 
 ----
-
-'''
-
diff --git a/core/src/test/resources/tck-test-files/schema/v2/directives/relationship-aggregate.js.adoc b/core/src/test/resources/tck-test-files/schema/v2/directives/relationship-aggregate.js.adoc
new file mode 100644
index 00000000..b5c6940a
--- /dev/null
+++ b/core/src/test/resources/tck-test-files/schema/v2/directives/relationship-aggregate.js.adoc
@@ -0,0 +1,888 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= @relationship directive, aggregate argument
+
+== should disable nested aggregation
+
+.Schema
+[source,graphql,schema=true]
+----
+type Actor {
+  username: String!
+  password: String!
+}
+
+type Movie {
+  title: String
+  actors: [Actor!]! @relationship(type: "ACTED_IN", direction: IN)
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+type Actor {
+  password: String!
+  username: String!
+}
+
+type ActorEdge {
+  cursor: String!
+  node: Actor!
+}
+
+input ActorOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more ActorSort objects to sort Actors by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [ActorSort!]
+}
+
+"""
+Fields to sort Actors by. The order in which sorts are applied is not guaranteed when specifying many fields in one ActorSort object.
+"""
+input ActorSort {
+  password: SortDirection
+  username: SortDirection
+}
+
+input ActorWhere {
+  AND: [ActorWhere!]
+  NOT: ActorWhere
+  OR: [ActorWhere!]
+  password: String
+  password_CONTAINS: String
+  password_ENDS_WITH: String
+  password_IN: [String!]
+  password_STARTS_WITH: String
+  username: String
+  username_CONTAINS: String
+  username_ENDS_WITH: String
+  username_IN: [String!]
+  username_STARTS_WITH: String
+}
+
+type ActorsConnection {
+  edges: [ActorEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+type Movie {
+  actors(directed: Boolean = true, options: ActorOptions, where: ActorWhere): [Actor!]!
+  actorsConnection(after: String, directed: Boolean = true, first: Int, sort: [MovieActorsConnectionSort!], where: MovieActorsConnectionWhere): MovieActorsConnection!
+  title: String
+}
+
+type MovieActorsConnection {
+  edges: [MovieActorsRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input MovieActorsConnectionSort {
+  node: ActorSort
+}
+
+input MovieActorsConnectionWhere {
+  AND: [MovieActorsConnectionWhere!]
+  NOT: MovieActorsConnectionWhere
+  OR: [MovieActorsConnectionWhere!]
+  node: ActorWhere
+}
+
+type MovieActorsRelationship {
+  cursor: String!
+  node: Actor!
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MovieSort!]
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
+"""
+input MovieSort {
+  title: SortDirection
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  """
+  Return Movies where all of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_ALL: MovieActorsConnectionWhere
+  """
+  Return Movies where none of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_NONE: MovieActorsConnectionWhere
+  """
+  Return Movies where one of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SINGLE: MovieActorsConnectionWhere
+  """
+  Return Movies where some of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SOME: MovieActorsConnectionWhere
+  """Return Movies where all of the related Actors match this filter"""
+  actors_ALL: ActorWhere
+  """Return Movies where none of the related Actors match this filter"""
+  actors_NONE: ActorWhere
+  """Return Movies where one of the related Actors match this filter"""
+  actors_SINGLE: ActorWhere
+  """Return Movies where some of the related Actors match this filter"""
+  actors_SOME: ActorWhere
+  title: String
+  title_CONTAINS: String
+  title_ENDS_WITH: String
+  title_IN: [String]
+  title_STARTS_WITH: String
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+type Query {
+  actors(options: ActorOptions, where: ActorWhere): [Actor!]!
+  actorsConnection(after: String, first: Int, sort: [ActorSort], where: ActorWhere): ActorsConnection!
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
+
+== snapshot tests
+
+=== aggregate argument set as false
+
+.Schema
+[source,graphql,schema=true]
+----
+type Actor {
+  username: String!
+  password: String!
+}
+
+type Movie {
+  title: String
+  actors: [Actor!]! @relationship(type: "ACTED_IN", direction: IN)
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+type Actor {
+  password: String!
+  username: String!
+}
+
+type ActorEdge {
+  cursor: String!
+  node: Actor!
+}
+
+input ActorOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more ActorSort objects to sort Actors by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [ActorSort!]
+}
+
+"""
+Fields to sort Actors by. The order in which sorts are applied is not guaranteed when specifying many fields in one ActorSort object.
+"""
+input ActorSort {
+  password: SortDirection
+  username: SortDirection
+}
+
+input ActorWhere {
+  AND: [ActorWhere!]
+  NOT: ActorWhere
+  OR: [ActorWhere!]
+  password: String
+  password_CONTAINS: String
+  password_ENDS_WITH: String
+  password_IN: [String!]
+  password_STARTS_WITH: String
+  username: String
+  username_CONTAINS: String
+  username_ENDS_WITH: String
+  username_IN: [String!]
+  username_STARTS_WITH: String
+}
+
+type ActorsConnection {
+  edges: [ActorEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+type Movie {
+  actors(directed: Boolean = true, options: ActorOptions, where: ActorWhere): [Actor!]!
+  actorsConnection(after: String, directed: Boolean = true, first: Int, sort: [MovieActorsConnectionSort!], where: MovieActorsConnectionWhere): MovieActorsConnection!
+  title: String
+}
+
+type MovieActorsConnection {
+  edges: [MovieActorsRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input MovieActorsConnectionSort {
+  node: ActorSort
+}
+
+input MovieActorsConnectionWhere {
+  AND: [MovieActorsConnectionWhere!]
+  NOT: MovieActorsConnectionWhere
+  OR: [MovieActorsConnectionWhere!]
+  node: ActorWhere
+}
+
+type MovieActorsRelationship {
+  cursor: String!
+  node: Actor!
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MovieSort!]
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
+"""
+input MovieSort {
+  title: SortDirection
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  """
+  Return Movies where all of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_ALL: MovieActorsConnectionWhere
+  """
+  Return Movies where none of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_NONE: MovieActorsConnectionWhere
+  """
+  Return Movies where one of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SINGLE: MovieActorsConnectionWhere
+  """
+  Return Movies where some of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SOME: MovieActorsConnectionWhere
+  """Return Movies where all of the related Actors match this filter"""
+  actors_ALL: ActorWhere
+  """Return Movies where none of the related Actors match this filter"""
+  actors_NONE: ActorWhere
+  """Return Movies where one of the related Actors match this filter"""
+  actors_SINGLE: ActorWhere
+  """Return Movies where some of the related Actors match this filter"""
+  actors_SOME: ActorWhere
+  title: String
+  title_CONTAINS: String
+  title_ENDS_WITH: String
+  title_IN: [String]
+  title_STARTS_WITH: String
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+type Query {
+  actors(options: ActorOptions, where: ActorWhere): [Actor!]!
+  actorsConnection(after: String, first: Int, sort: [ActorSort], where: ActorWhere): ActorsConnection!
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
+
+=== on INTERFACE
+
+==== aggregate argument set as false, (no-op as abstract does not support aggregation)
+
+.Schema
+[source,graphql,schema=true]
+----
+type Actor implements Person {
+  username: String!
+  password: String!
+}
+
+interface Person {
+  username: String!
+  password: String!
+}
+
+type Movie {
+  title: String
+  actors: [Person!]! @relationship(type: "ACTED_IN", direction: IN)
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+type Actor implements Person {
+  password: String!
+  username: String!
+}
+
+type ActorEdge {
+  cursor: String!
+  node: Actor!
+}
+
+input ActorOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more ActorSort objects to sort Actors by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [ActorSort!]
+}
+
+"""
+Fields to sort Actors by. The order in which sorts are applied is not guaranteed when specifying many fields in one ActorSort object.
+"""
+input ActorSort {
+  password: SortDirection
+  username: SortDirection
+}
+
+input ActorWhere {
+  AND: [ActorWhere!]
+  NOT: ActorWhere
+  OR: [ActorWhere!]
+  password: String
+  password_CONTAINS: String
+  password_ENDS_WITH: String
+  password_IN: [String!]
+  password_STARTS_WITH: String
+  username: String
+  username_CONTAINS: String
+  username_ENDS_WITH: String
+  username_IN: [String!]
+  username_STARTS_WITH: String
+}
+
+type ActorsConnection {
+  edges: [ActorEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+type Movie {
+  actors(directed: Boolean = true, options: PersonOptions, where: PersonWhere): [Person!]!
+  actorsConnection(after: String, directed: Boolean = true, first: Int, sort: [MovieActorsConnectionSort!], where: MovieActorsConnectionWhere): MovieActorsConnection!
+  title: String
+}
+
+type MovieActorsConnection {
+  edges: [MovieActorsRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input MovieActorsConnectionSort {
+  node: PersonSort
+}
+
+input MovieActorsConnectionWhere {
+  AND: [MovieActorsConnectionWhere!]
+  NOT: MovieActorsConnectionWhere
+  OR: [MovieActorsConnectionWhere!]
+  node: PersonWhere
+}
+
+type MovieActorsRelationship {
+  cursor: String!
+  node: Person!
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MovieSort!]
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
+"""
+input MovieSort {
+  title: SortDirection
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  """
+  Return Movies where all of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_ALL: MovieActorsConnectionWhere
+  """
+  Return Movies where none of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_NONE: MovieActorsConnectionWhere
+  """
+  Return Movies where one of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SINGLE: MovieActorsConnectionWhere
+  """
+  Return Movies where some of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SOME: MovieActorsConnectionWhere
+  """Return Movies where all of the related People match this filter"""
+  actors_ALL: PersonWhere
+  """Return Movies where none of the related People match this filter"""
+  actors_NONE: PersonWhere
+  """Return Movies where one of the related People match this filter"""
+  actors_SINGLE: PersonWhere
+  """Return Movies where some of the related People match this filter"""
+  actors_SOME: PersonWhere
+  title: String
+  title_CONTAINS: String
+  title_ENDS_WITH: String
+  title_IN: [String]
+  title_STARTS_WITH: String
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+type PeopleConnection {
+  edges: [PersonEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+interface Person {
+  password: String!
+  username: String!
+}
+
+type PersonEdge {
+  cursor: String!
+  node: Person!
+}
+
+enum PersonImplementation {
+  Actor
+}
+
+input PersonOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more PersonSort objects to sort People by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [PersonSort]
+}
+
+"""
+Fields to sort People by. The order in which sorts are applied is not guaranteed when specifying many fields in one PersonSort object.
+"""
+input PersonSort {
+  password: SortDirection
+  username: SortDirection
+}
+
+input PersonWhere {
+  AND: [PersonWhere!]
+  NOT: PersonWhere
+  OR: [PersonWhere!]
+  password: String
+  password_CONTAINS: String
+  password_ENDS_WITH: String
+  password_IN: [String!]
+  password_STARTS_WITH: String
+  typename_IN: [PersonImplementation!]
+  username: String
+  username_CONTAINS: String
+  username_ENDS_WITH: String
+  username_IN: [String!]
+  username_STARTS_WITH: String
+}
+
+type Query {
+  actors(options: ActorOptions, where: ActorWhere): [Actor!]!
+  actorsConnection(after: String, first: Int, sort: [ActorSort], where: ActorWhere): ActorsConnection!
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+  people(options: PersonOptions, where: PersonWhere): [Person!]!
+  peopleConnection(after: String, first: Int, sort: [PersonSort], where: PersonWhere): PeopleConnection!
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
+
+=== on UNION
+
+==== aggregate argument set as false, (no-op as abstract does not support aggregation)
+
+.Schema
+[source,graphql,schema=true]
+----
+type Actor {
+  username: String!
+  password: String!
+}
+
+type Person {
+  name: String!
+}
+
+union CastMember = Actor | Person
+
+type Movie {
+  title: String
+  actors: [CastMember!]! @relationship(type: "ACTED_IN", direction: IN)
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+type Actor {
+  password: String!
+  username: String!
+}
+
+type ActorEdge {
+  cursor: String!
+  node: Actor!
+}
+
+input ActorOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more ActorSort objects to sort Actors by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [ActorSort!]
+}
+
+"""
+Fields to sort Actors by. The order in which sorts are applied is not guaranteed when specifying many fields in one ActorSort object.
+"""
+input ActorSort {
+  password: SortDirection
+  username: SortDirection
+}
+
+input ActorWhere {
+  AND: [ActorWhere!]
+  NOT: ActorWhere
+  OR: [ActorWhere!]
+  password: String
+  password_CONTAINS: String
+  password_ENDS_WITH: String
+  password_IN: [String!]
+  password_STARTS_WITH: String
+  username: String
+  username_CONTAINS: String
+  username_ENDS_WITH: String
+  username_IN: [String!]
+  username_STARTS_WITH: String
+}
+
+type ActorsConnection {
+  edges: [ActorEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+union CastMember = Actor | Person
+
+input CastMemberWhere {
+  Actor: ActorWhere
+  Person: PersonWhere
+}
+
+type Movie {
+  actors(directed: Boolean = true, options: QueryOptions, where: CastMemberWhere): [CastMember!]!
+  actorsConnection(after: String, directed: Boolean = true, first: Int, where: MovieActorsConnectionWhere): MovieActorsConnection!
+  title: String
+}
+
+input MovieActorsActorConnectionWhere {
+  AND: [MovieActorsActorConnectionWhere!]
+  NOT: MovieActorsActorConnectionWhere
+  OR: [MovieActorsActorConnectionWhere!]
+  node: ActorWhere
+}
+
+type MovieActorsConnection {
+  edges: [MovieActorsRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input MovieActorsConnectionWhere {
+  Actor: MovieActorsActorConnectionWhere
+  Person: MovieActorsPersonConnectionWhere
+}
+
+input MovieActorsPersonConnectionWhere {
+  AND: [MovieActorsPersonConnectionWhere!]
+  NOT: MovieActorsPersonConnectionWhere
+  OR: [MovieActorsPersonConnectionWhere!]
+  node: PersonWhere
+}
+
+type MovieActorsRelationship {
+  cursor: String!
+  node: CastMember!
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MovieSort!]
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
+"""
+input MovieSort {
+  title: SortDirection
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  """
+  Return Movies where all of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_ALL: MovieActorsConnectionWhere
+  """
+  Return Movies where none of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_NONE: MovieActorsConnectionWhere
+  """
+  Return Movies where one of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SINGLE: MovieActorsConnectionWhere
+  """
+  Return Movies where some of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SOME: MovieActorsConnectionWhere
+  """Return Movies where all of the related CastMembers match this filter"""
+  actors_ALL: CastMemberWhere
+  """Return Movies where none of the related CastMembers match this filter"""
+  actors_NONE: CastMemberWhere
+  """Return Movies where one of the related CastMembers match this filter"""
+  actors_SINGLE: CastMemberWhere
+  """Return Movies where some of the related CastMembers match this filter"""
+  actors_SOME: CastMemberWhere
+  title: String
+  title_CONTAINS: String
+  title_ENDS_WITH: String
+  title_IN: [String]
+  title_STARTS_WITH: String
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+type PeopleConnection {
+  edges: [PersonEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+type Person {
+  name: String!
+}
+
+type PersonEdge {
+  cursor: String!
+  node: Person!
+}
+
+input PersonOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more PersonSort objects to sort People by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [PersonSort!]
+}
+
+"""
+Fields to sort People by. The order in which sorts are applied is not guaranteed when specifying many fields in one PersonSort object.
+"""
+input PersonSort {
+  name: SortDirection
+}
+
+input PersonWhere {
+  AND: [PersonWhere!]
+  NOT: PersonWhere
+  OR: [PersonWhere!]
+  name: String
+  name_CONTAINS: String
+  name_ENDS_WITH: String
+  name_IN: [String!]
+  name_STARTS_WITH: String
+}
+
+type Query {
+  actors(options: ActorOptions, where: ActorWhere): [Actor!]!
+  actorsConnection(after: String, first: Int, sort: [ActorSort], where: ActorWhere): ActorsConnection!
+  castMembers(options: QueryOptions, where: CastMemberWhere): [CastMember!]!
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+  people(options: PersonOptions, where: PersonWhere): [Person!]!
+  peopleConnection(after: String, first: Int, sort: [PersonSort], where: PersonWhere): PeopleConnection!
+}
+
+"""Input type for options that can be specified on a query operation."""
+input QueryOptions {
+  limit: Int
+  offset: Int
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
diff --git a/core/src/test/resources/tck-test-files/schema/v2/directives/relationship-nested-operations.adoc b/core/src/test/resources/tck-test-files/schema/v2/directives/relationship-nested-operations.adoc
index 5cdc0577..a5cb6654 100644
--- a/core/src/test/resources/tck-test-files/schema/v2/directives/relationship-nested-operations.adoc
+++ b/core/src/test/resources/tck-test-files/schema/v2/directives/relationship-nested-operations.adoc
@@ -21,7 +21,7 @@ type Movie {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -168,8 +168,6 @@ input PersonWhere {
 
 ----
 
-'''
-
 === Single relationship with nested operation CREATE specified
 
 .Schema
@@ -186,7 +184,7 @@ type Movie {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -333,8 +331,6 @@ input PersonWhere {
 
 ----
 
-'''
-
 === Single relationship with nested operation CONNECT specified
 
 .Schema
@@ -351,7 +347,7 @@ type Movie {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -498,8 +494,6 @@ input PersonWhere {
 
 ----
 
-'''
-
 === Single relationship with nested operation UPDATE specified
 
 .Schema
@@ -516,7 +510,7 @@ type Movie {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -663,8 +657,6 @@ input PersonWhere {
 
 ----
 
-'''
-
 === Single relationship with nested operation DELETE specified
 
 .Schema
@@ -681,7 +673,7 @@ type Movie {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -828,8 +820,6 @@ input PersonWhere {
 
 ----
 
-'''
-
 === Single relationship with nested operation DISCONNECT specified
 
 .Schema
@@ -846,7 +836,7 @@ type Movie {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -993,8 +983,6 @@ input PersonWhere {
 
 ----
 
-'''
-
 === Should not generate any nested operations if only CONNECT_OR_CREATE is specified and the related type does not have a unique field
 
 .Schema
@@ -1011,7 +999,7 @@ type Movie {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -1158,8 +1146,6 @@ input PersonWhere {
 
 ----
 
-'''
-
 === Two relationships with nested operations specified on one
 
 .Schema
@@ -1177,7 +1163,7 @@ type Movie {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -1364,8 +1350,6 @@ input PersonWhere {
 
 ----
 
-'''
-
 === Two relationships with nested operations specified on both
 
 .Schema
@@ -1383,7 +1367,7 @@ type Movie {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -1570,8 +1554,6 @@ input PersonWhere {
 
 ----
 
-'''
-
 == Related to a union type
 
 === Should not generate UpdateFieldInput input with no nested operations
@@ -1596,7 +1578,7 @@ type Movie {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -1805,8 +1787,6 @@ input QueryOptions {
 
 ----
 
-'''
-
 === Single relationship with nested operation CREATE specified
 
 .Schema
@@ -1829,7 +1809,7 @@ type Movie {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -2038,8 +2018,6 @@ input QueryOptions {
 
 ----
 
-'''
-
 === Single relationship with nested operation CONNECT specified
 
 .Schema
@@ -2062,7 +2040,7 @@ type Movie {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -2271,8 +2249,6 @@ input QueryOptions {
 
 ----
 
-'''
-
 === Single relationship with nested operation UPDATE specified
 
 .Schema
@@ -2295,7 +2271,7 @@ type Movie {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -2504,8 +2480,6 @@ input QueryOptions {
 
 ----
 
-'''
-
 === Single relationship with nested operation DELETE specified
 
 .Schema
@@ -2528,7 +2502,7 @@ type Movie {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -2737,8 +2711,6 @@ input QueryOptions {
 
 ----
 
-'''
-
 === Single relationship with nested operation DISCONNECT specified
 
 .Schema
@@ -2761,7 +2733,7 @@ type Movie {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -2970,8 +2942,6 @@ input QueryOptions {
 
 ----
 
-'''
-
 === Should not generate any nested operations if only CONNECT_OR_CREATE is specified and the related type does not have a unique field
 
 .Schema
@@ -2994,7 +2964,7 @@ type Movie {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -3203,8 +3173,6 @@ input QueryOptions {
 
 ----
 
-'''
-
 === Two relationships with nested operations specified on one
 
 .Schema
@@ -3228,7 +3196,7 @@ type Movie {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -3485,8 +3453,6 @@ input QueryOptions {
 
 ----
 
-'''
-
 === Two relationships with nested operations specified on both
 
 .Schema
@@ -3510,7 +3476,7 @@ type Movie {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -3767,8 +3733,6 @@ input QueryOptions {
 
 ----
 
-'''
-
 == Related to an interface type
 
 === Should not generate UpdateFieldInput input with no nested operations
@@ -3796,7 +3760,7 @@ type Movie {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -4032,8 +3996,6 @@ input PersonWhere {
 
 ----
 
-'''
-
 === Single relationship with nested operation CREATE specified
 
 .Schema
@@ -4059,7 +4021,7 @@ type Movie {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -4295,8 +4257,6 @@ input PersonWhere {
 
 ----
 
-'''
-
 === Single relationship with nested operation CONNECT specified
 
 .Schema
@@ -4322,7 +4282,7 @@ type Movie {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -4558,8 +4518,6 @@ input PersonWhere {
 
 ----
 
-'''
-
 === Single relationship with nested operation UPDATE specified
 
 .Schema
@@ -4585,7 +4543,7 @@ type Movie {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -4821,8 +4779,6 @@ input PersonWhere {
 
 ----
 
-'''
-
 === Single relationship with nested operation DELETE specified
 
 .Schema
@@ -4848,7 +4804,7 @@ type Movie {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -5084,8 +5040,6 @@ input PersonWhere {
 
 ----
 
-'''
-
 === Single relationship with nested operation DISCONNECT specified
 
 .Schema
@@ -5111,7 +5065,7 @@ type Movie {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -5347,8 +5301,6 @@ input PersonWhere {
 
 ----
 
-'''
-
 === Two relationships with nested operations specified on one
 
 .Schema
@@ -5375,7 +5327,7 @@ type Movie {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -5651,8 +5603,6 @@ input PersonWhere {
 
 ----
 
-'''
-
 === Two relationships with nested operations specified on both
 
 .Schema
@@ -5679,7 +5629,7 @@ type Movie {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -5954,6 +5904,3 @@ input PersonWhere {
 }
 
 ----
-
-'''
-
diff --git a/core/src/test/resources/tck-test-files/schema/v2/directives/relationship-nested-operations.js.adoc b/core/src/test/resources/tck-test-files/schema/v2/directives/relationship-nested-operations.js.adoc
new file mode 100644
index 00000000..0589c83f
--- /dev/null
+++ b/core/src/test/resources/tck-test-files/schema/v2/directives/relationship-nested-operations.js.adoc
@@ -0,0 +1,6445 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= Relationship nested operations
+
+== Related to a concrete type
+
+=== Should not generate UpdateFieldInput input with no nested operations
+
+.Schema
+[source,graphql,schema=true]
+----
+type Person {
+  name: String
+}
+
+type Movie {
+  id: ID
+  actors: [Person!]! @relationship(type: "ACTED_IN", direction: IN, nestedOperations: [])
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+type Movie {
+  actors(directed: Boolean = true, options: PersonOptions, where: PersonWhere): [Person!]!
+  actorsConnection(after: String, directed: Boolean = true, first: Int, sort: [MovieActorsConnectionSort!], where: MovieActorsConnectionWhere): MovieActorsConnection!
+  id: ID
+}
+
+type MovieActorsConnection {
+  edges: [MovieActorsRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input MovieActorsConnectionSort {
+  node: PersonSort
+}
+
+input MovieActorsConnectionWhere {
+  AND: [MovieActorsConnectionWhere!]
+  NOT: MovieActorsConnectionWhere
+  OR: [MovieActorsConnectionWhere!]
+  node: PersonWhere
+}
+
+type MovieActorsRelationship {
+  cursor: String!
+  node: Person!
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MovieSort!]
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
+"""
+input MovieSort {
+  id: SortDirection
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  """
+  Return Movies where all of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_ALL: MovieActorsConnectionWhere
+  """
+  Return Movies where none of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_NONE: MovieActorsConnectionWhere
+  """
+  Return Movies where one of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SINGLE: MovieActorsConnectionWhere
+  """
+  Return Movies where some of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SOME: MovieActorsConnectionWhere
+  """Return Movies where all of the related People match this filter"""
+  actors_ALL: PersonWhere
+  """Return Movies where none of the related People match this filter"""
+  actors_NONE: PersonWhere
+  """Return Movies where one of the related People match this filter"""
+  actors_SINGLE: PersonWhere
+  """Return Movies where some of the related People match this filter"""
+  actors_SOME: PersonWhere
+  id: ID
+  id_CONTAINS: ID
+  id_ENDS_WITH: ID
+  id_IN: [ID]
+  id_STARTS_WITH: ID
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+type PeopleConnection {
+  edges: [PersonEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+type Person {
+  name: String
+}
+
+type PersonEdge {
+  cursor: String!
+  node: Person!
+}
+
+input PersonOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more PersonSort objects to sort People by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [PersonSort!]
+}
+
+"""
+Fields to sort People by. The order in which sorts are applied is not guaranteed when specifying many fields in one PersonSort object.
+"""
+input PersonSort {
+  name: SortDirection
+}
+
+input PersonWhere {
+  AND: [PersonWhere!]
+  NOT: PersonWhere
+  OR: [PersonWhere!]
+  name: String
+  name_CONTAINS: String
+  name_ENDS_WITH: String
+  name_IN: [String]
+  name_STARTS_WITH: String
+}
+
+type Query {
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+  people(options: PersonOptions, where: PersonWhere): [Person!]!
+  peopleConnection(after: String, first: Int, sort: [PersonSort], where: PersonWhere): PeopleConnection!
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
+
+=== Single relationship with nested operation CREATE specified
+
+.Schema
+[source,graphql,schema=true]
+----
+type Person {
+  name: String
+}
+
+type Movie {
+  id: ID
+  actors: [Person!]! @relationship(type: "ACTED_IN", direction: IN, nestedOperations: [CREATE])
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+type Movie {
+  actors(directed: Boolean = true, options: PersonOptions, where: PersonWhere): [Person!]!
+  actorsConnection(after: String, directed: Boolean = true, first: Int, sort: [MovieActorsConnectionSort!], where: MovieActorsConnectionWhere): MovieActorsConnection!
+  id: ID
+}
+
+type MovieActorsConnection {
+  edges: [MovieActorsRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input MovieActorsConnectionSort {
+  node: PersonSort
+}
+
+input MovieActorsConnectionWhere {
+  AND: [MovieActorsConnectionWhere!]
+  NOT: MovieActorsConnectionWhere
+  OR: [MovieActorsConnectionWhere!]
+  node: PersonWhere
+}
+
+type MovieActorsRelationship {
+  cursor: String!
+  node: Person!
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MovieSort!]
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
+"""
+input MovieSort {
+  id: SortDirection
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  """
+  Return Movies where all of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_ALL: MovieActorsConnectionWhere
+  """
+  Return Movies where none of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_NONE: MovieActorsConnectionWhere
+  """
+  Return Movies where one of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SINGLE: MovieActorsConnectionWhere
+  """
+  Return Movies where some of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SOME: MovieActorsConnectionWhere
+  """Return Movies where all of the related People match this filter"""
+  actors_ALL: PersonWhere
+  """Return Movies where none of the related People match this filter"""
+  actors_NONE: PersonWhere
+  """Return Movies where one of the related People match this filter"""
+  actors_SINGLE: PersonWhere
+  """Return Movies where some of the related People match this filter"""
+  actors_SOME: PersonWhere
+  id: ID
+  id_CONTAINS: ID
+  id_ENDS_WITH: ID
+  id_IN: [ID]
+  id_STARTS_WITH: ID
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+type PeopleConnection {
+  edges: [PersonEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+type Person {
+  name: String
+}
+
+type PersonEdge {
+  cursor: String!
+  node: Person!
+}
+
+input PersonOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more PersonSort objects to sort People by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [PersonSort!]
+}
+
+"""
+Fields to sort People by. The order in which sorts are applied is not guaranteed when specifying many fields in one PersonSort object.
+"""
+input PersonSort {
+  name: SortDirection
+}
+
+input PersonWhere {
+  AND: [PersonWhere!]
+  NOT: PersonWhere
+  OR: [PersonWhere!]
+  name: String
+  name_CONTAINS: String
+  name_ENDS_WITH: String
+  name_IN: [String]
+  name_STARTS_WITH: String
+}
+
+type Query {
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+  people(options: PersonOptions, where: PersonWhere): [Person!]!
+  peopleConnection(after: String, first: Int, sort: [PersonSort], where: PersonWhere): PeopleConnection!
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
+
+=== Single relationship with nested operation CONNECT specified
+
+.Schema
+[source,graphql,schema=true]
+----
+type Person {
+  name: String
+}
+
+type Movie {
+  id: ID
+  actors: [Person!]! @relationship(type: "ACTED_IN", direction: IN, nestedOperations: [CONNECT])
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+type Movie {
+  actors(directed: Boolean = true, options: PersonOptions, where: PersonWhere): [Person!]!
+  actorsConnection(after: String, directed: Boolean = true, first: Int, sort: [MovieActorsConnectionSort!], where: MovieActorsConnectionWhere): MovieActorsConnection!
+  id: ID
+}
+
+type MovieActorsConnection {
+  edges: [MovieActorsRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input MovieActorsConnectionSort {
+  node: PersonSort
+}
+
+input MovieActorsConnectionWhere {
+  AND: [MovieActorsConnectionWhere!]
+  NOT: MovieActorsConnectionWhere
+  OR: [MovieActorsConnectionWhere!]
+  node: PersonWhere
+}
+
+type MovieActorsRelationship {
+  cursor: String!
+  node: Person!
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MovieSort!]
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
+"""
+input MovieSort {
+  id: SortDirection
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  """
+  Return Movies where all of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_ALL: MovieActorsConnectionWhere
+  """
+  Return Movies where none of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_NONE: MovieActorsConnectionWhere
+  """
+  Return Movies where one of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SINGLE: MovieActorsConnectionWhere
+  """
+  Return Movies where some of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SOME: MovieActorsConnectionWhere
+  """Return Movies where all of the related People match this filter"""
+  actors_ALL: PersonWhere
+  """Return Movies where none of the related People match this filter"""
+  actors_NONE: PersonWhere
+  """Return Movies where one of the related People match this filter"""
+  actors_SINGLE: PersonWhere
+  """Return Movies where some of the related People match this filter"""
+  actors_SOME: PersonWhere
+  id: ID
+  id_CONTAINS: ID
+  id_ENDS_WITH: ID
+  id_IN: [ID]
+  id_STARTS_WITH: ID
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+type PeopleConnection {
+  edges: [PersonEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+type Person {
+  name: String
+}
+
+type PersonEdge {
+  cursor: String!
+  node: Person!
+}
+
+input PersonOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more PersonSort objects to sort People by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [PersonSort!]
+}
+
+"""
+Fields to sort People by. The order in which sorts are applied is not guaranteed when specifying many fields in one PersonSort object.
+"""
+input PersonSort {
+  name: SortDirection
+}
+
+input PersonWhere {
+  AND: [PersonWhere!]
+  NOT: PersonWhere
+  OR: [PersonWhere!]
+  name: String
+  name_CONTAINS: String
+  name_ENDS_WITH: String
+  name_IN: [String]
+  name_STARTS_WITH: String
+}
+
+type Query {
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+  people(options: PersonOptions, where: PersonWhere): [Person!]!
+  peopleConnection(after: String, first: Int, sort: [PersonSort], where: PersonWhere): PeopleConnection!
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
+
+=== Single relationship with nested operation UPDATE specified
+
+.Schema
+[source,graphql,schema=true]
+----
+type Person {
+  name: String
+}
+
+type Movie {
+  id: ID
+  actors: [Person!]! @relationship(type: "ACTED_IN", direction: IN, nestedOperations: [UPDATE])
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+type Movie {
+  actors(directed: Boolean = true, options: PersonOptions, where: PersonWhere): [Person!]!
+  actorsConnection(after: String, directed: Boolean = true, first: Int, sort: [MovieActorsConnectionSort!], where: MovieActorsConnectionWhere): MovieActorsConnection!
+  id: ID
+}
+
+type MovieActorsConnection {
+  edges: [MovieActorsRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input MovieActorsConnectionSort {
+  node: PersonSort
+}
+
+input MovieActorsConnectionWhere {
+  AND: [MovieActorsConnectionWhere!]
+  NOT: MovieActorsConnectionWhere
+  OR: [MovieActorsConnectionWhere!]
+  node: PersonWhere
+}
+
+type MovieActorsRelationship {
+  cursor: String!
+  node: Person!
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MovieSort!]
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
+"""
+input MovieSort {
+  id: SortDirection
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  """
+  Return Movies where all of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_ALL: MovieActorsConnectionWhere
+  """
+  Return Movies where none of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_NONE: MovieActorsConnectionWhere
+  """
+  Return Movies where one of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SINGLE: MovieActorsConnectionWhere
+  """
+  Return Movies where some of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SOME: MovieActorsConnectionWhere
+  """Return Movies where all of the related People match this filter"""
+  actors_ALL: PersonWhere
+  """Return Movies where none of the related People match this filter"""
+  actors_NONE: PersonWhere
+  """Return Movies where one of the related People match this filter"""
+  actors_SINGLE: PersonWhere
+  """Return Movies where some of the related People match this filter"""
+  actors_SOME: PersonWhere
+  id: ID
+  id_CONTAINS: ID
+  id_ENDS_WITH: ID
+  id_IN: [ID]
+  id_STARTS_WITH: ID
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+type PeopleConnection {
+  edges: [PersonEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+type Person {
+  name: String
+}
+
+type PersonEdge {
+  cursor: String!
+  node: Person!
+}
+
+input PersonOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more PersonSort objects to sort People by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [PersonSort!]
+}
+
+"""
+Fields to sort People by. The order in which sorts are applied is not guaranteed when specifying many fields in one PersonSort object.
+"""
+input PersonSort {
+  name: SortDirection
+}
+
+input PersonWhere {
+  AND: [PersonWhere!]
+  NOT: PersonWhere
+  OR: [PersonWhere!]
+  name: String
+  name_CONTAINS: String
+  name_ENDS_WITH: String
+  name_IN: [String]
+  name_STARTS_WITH: String
+}
+
+type Query {
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+  people(options: PersonOptions, where: PersonWhere): [Person!]!
+  peopleConnection(after: String, first: Int, sort: [PersonSort], where: PersonWhere): PeopleConnection!
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
+
+=== Single relationship with nested operation DELETE specified
+
+.Schema
+[source,graphql,schema=true]
+----
+type Person {
+  name: String
+}
+
+type Movie {
+  id: ID
+  actors: [Person!]! @relationship(type: "ACTED_IN", direction: IN, nestedOperations: [DELETE])
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+type Movie {
+  actors(directed: Boolean = true, options: PersonOptions, where: PersonWhere): [Person!]!
+  actorsConnection(after: String, directed: Boolean = true, first: Int, sort: [MovieActorsConnectionSort!], where: MovieActorsConnectionWhere): MovieActorsConnection!
+  id: ID
+}
+
+type MovieActorsConnection {
+  edges: [MovieActorsRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input MovieActorsConnectionSort {
+  node: PersonSort
+}
+
+input MovieActorsConnectionWhere {
+  AND: [MovieActorsConnectionWhere!]
+  NOT: MovieActorsConnectionWhere
+  OR: [MovieActorsConnectionWhere!]
+  node: PersonWhere
+}
+
+type MovieActorsRelationship {
+  cursor: String!
+  node: Person!
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MovieSort!]
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
+"""
+input MovieSort {
+  id: SortDirection
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  """
+  Return Movies where all of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_ALL: MovieActorsConnectionWhere
+  """
+  Return Movies where none of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_NONE: MovieActorsConnectionWhere
+  """
+  Return Movies where one of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SINGLE: MovieActorsConnectionWhere
+  """
+  Return Movies where some of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SOME: MovieActorsConnectionWhere
+  """Return Movies where all of the related People match this filter"""
+  actors_ALL: PersonWhere
+  """Return Movies where none of the related People match this filter"""
+  actors_NONE: PersonWhere
+  """Return Movies where one of the related People match this filter"""
+  actors_SINGLE: PersonWhere
+  """Return Movies where some of the related People match this filter"""
+  actors_SOME: PersonWhere
+  id: ID
+  id_CONTAINS: ID
+  id_ENDS_WITH: ID
+  id_IN: [ID]
+  id_STARTS_WITH: ID
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+type PeopleConnection {
+  edges: [PersonEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+type Person {
+  name: String
+}
+
+type PersonEdge {
+  cursor: String!
+  node: Person!
+}
+
+input PersonOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more PersonSort objects to sort People by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [PersonSort!]
+}
+
+"""
+Fields to sort People by. The order in which sorts are applied is not guaranteed when specifying many fields in one PersonSort object.
+"""
+input PersonSort {
+  name: SortDirection
+}
+
+input PersonWhere {
+  AND: [PersonWhere!]
+  NOT: PersonWhere
+  OR: [PersonWhere!]
+  name: String
+  name_CONTAINS: String
+  name_ENDS_WITH: String
+  name_IN: [String]
+  name_STARTS_WITH: String
+}
+
+type Query {
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+  people(options: PersonOptions, where: PersonWhere): [Person!]!
+  peopleConnection(after: String, first: Int, sort: [PersonSort], where: PersonWhere): PeopleConnection!
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
+
+=== Single relationship with nested operation DISCONNECT specified
+
+.Schema
+[source,graphql,schema=true]
+----
+type Person {
+  name: String
+}
+
+type Movie {
+  id: ID
+  actors: [Person!]! @relationship(type: "ACTED_IN", direction: IN, nestedOperations: [DISCONNECT])
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+type Movie {
+  actors(directed: Boolean = true, options: PersonOptions, where: PersonWhere): [Person!]!
+  actorsConnection(after: String, directed: Boolean = true, first: Int, sort: [MovieActorsConnectionSort!], where: MovieActorsConnectionWhere): MovieActorsConnection!
+  id: ID
+}
+
+type MovieActorsConnection {
+  edges: [MovieActorsRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input MovieActorsConnectionSort {
+  node: PersonSort
+}
+
+input MovieActorsConnectionWhere {
+  AND: [MovieActorsConnectionWhere!]
+  NOT: MovieActorsConnectionWhere
+  OR: [MovieActorsConnectionWhere!]
+  node: PersonWhere
+}
+
+type MovieActorsRelationship {
+  cursor: String!
+  node: Person!
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MovieSort!]
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
+"""
+input MovieSort {
+  id: SortDirection
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  """
+  Return Movies where all of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_ALL: MovieActorsConnectionWhere
+  """
+  Return Movies where none of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_NONE: MovieActorsConnectionWhere
+  """
+  Return Movies where one of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SINGLE: MovieActorsConnectionWhere
+  """
+  Return Movies where some of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SOME: MovieActorsConnectionWhere
+  """Return Movies where all of the related People match this filter"""
+  actors_ALL: PersonWhere
+  """Return Movies where none of the related People match this filter"""
+  actors_NONE: PersonWhere
+  """Return Movies where one of the related People match this filter"""
+  actors_SINGLE: PersonWhere
+  """Return Movies where some of the related People match this filter"""
+  actors_SOME: PersonWhere
+  id: ID
+  id_CONTAINS: ID
+  id_ENDS_WITH: ID
+  id_IN: [ID]
+  id_STARTS_WITH: ID
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+type PeopleConnection {
+  edges: [PersonEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+type Person {
+  name: String
+}
+
+type PersonEdge {
+  cursor: String!
+  node: Person!
+}
+
+input PersonOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more PersonSort objects to sort People by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [PersonSort!]
+}
+
+"""
+Fields to sort People by. The order in which sorts are applied is not guaranteed when specifying many fields in one PersonSort object.
+"""
+input PersonSort {
+  name: SortDirection
+}
+
+input PersonWhere {
+  AND: [PersonWhere!]
+  NOT: PersonWhere
+  OR: [PersonWhere!]
+  name: String
+  name_CONTAINS: String
+  name_ENDS_WITH: String
+  name_IN: [String]
+  name_STARTS_WITH: String
+}
+
+type Query {
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+  people(options: PersonOptions, where: PersonWhere): [Person!]!
+  peopleConnection(after: String, first: Int, sort: [PersonSort], where: PersonWhere): PeopleConnection!
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
+
+=== Should not generate any nested operations if only CONNECT_OR_CREATE is specified and the related type does not have a unique field
+
+.Schema
+[source,graphql,schema=true]
+----
+type Person {
+  name: String
+}
+
+type Movie {
+  id: ID
+  actors: [Person!]! @relationship(type: "ACTED_IN", direction: IN, nestedOperations: [CONNECT_OR_CREATE])
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+type Movie {
+  actors(directed: Boolean = true, options: PersonOptions, where: PersonWhere): [Person!]!
+  actorsConnection(after: String, directed: Boolean = true, first: Int, sort: [MovieActorsConnectionSort!], where: MovieActorsConnectionWhere): MovieActorsConnection!
+  id: ID
+}
+
+type MovieActorsConnection {
+  edges: [MovieActorsRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input MovieActorsConnectionSort {
+  node: PersonSort
+}
+
+input MovieActorsConnectionWhere {
+  AND: [MovieActorsConnectionWhere!]
+  NOT: MovieActorsConnectionWhere
+  OR: [MovieActorsConnectionWhere!]
+  node: PersonWhere
+}
+
+type MovieActorsRelationship {
+  cursor: String!
+  node: Person!
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MovieSort!]
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
+"""
+input MovieSort {
+  id: SortDirection
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  """
+  Return Movies where all of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_ALL: MovieActorsConnectionWhere
+  """
+  Return Movies where none of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_NONE: MovieActorsConnectionWhere
+  """
+  Return Movies where one of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SINGLE: MovieActorsConnectionWhere
+  """
+  Return Movies where some of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SOME: MovieActorsConnectionWhere
+  """Return Movies where all of the related People match this filter"""
+  actors_ALL: PersonWhere
+  """Return Movies where none of the related People match this filter"""
+  actors_NONE: PersonWhere
+  """Return Movies where one of the related People match this filter"""
+  actors_SINGLE: PersonWhere
+  """Return Movies where some of the related People match this filter"""
+  actors_SOME: PersonWhere
+  id: ID
+  id_CONTAINS: ID
+  id_ENDS_WITH: ID
+  id_IN: [ID]
+  id_STARTS_WITH: ID
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+type PeopleConnection {
+  edges: [PersonEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+type Person {
+  name: String
+}
+
+type PersonEdge {
+  cursor: String!
+  node: Person!
+}
+
+input PersonOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more PersonSort objects to sort People by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [PersonSort!]
+}
+
+"""
+Fields to sort People by. The order in which sorts are applied is not guaranteed when specifying many fields in one PersonSort object.
+"""
+input PersonSort {
+  name: SortDirection
+}
+
+input PersonWhere {
+  AND: [PersonWhere!]
+  NOT: PersonWhere
+  OR: [PersonWhere!]
+  name: String
+  name_CONTAINS: String
+  name_ENDS_WITH: String
+  name_IN: [String]
+  name_STARTS_WITH: String
+}
+
+type Query {
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+  people(options: PersonOptions, where: PersonWhere): [Person!]!
+  peopleConnection(after: String, first: Int, sort: [PersonSort], where: PersonWhere): PeopleConnection!
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
+
+=== Two relationships with nested operations specified on one
+
+.Schema
+[source,graphql,schema=true]
+----
+type Person {
+  name: String
+}
+
+type Movie {
+  id: ID
+  actors: [Person!]! @relationship(type: "ACTED_IN", direction: IN)
+  producers: [Person!]! @relationship(type: "PRODUCED", direction: IN, nestedOperations: [DISCONNECT])
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+type Movie {
+  actors(directed: Boolean = true, options: PersonOptions, where: PersonWhere): [Person!]!
+  actorsConnection(after: String, directed: Boolean = true, first: Int, sort: [MovieActorsConnectionSort!], where: MovieActorsConnectionWhere): MovieActorsConnection!
+  id: ID
+  producers(directed: Boolean = true, options: PersonOptions, where: PersonWhere): [Person!]!
+  producersConnection(after: String, directed: Boolean = true, first: Int, sort: [MovieProducersConnectionSort!], where: MovieProducersConnectionWhere): MovieProducersConnection!
+}
+
+type MovieActorsConnection {
+  edges: [MovieActorsRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input MovieActorsConnectionSort {
+  node: PersonSort
+}
+
+input MovieActorsConnectionWhere {
+  AND: [MovieActorsConnectionWhere!]
+  NOT: MovieActorsConnectionWhere
+  OR: [MovieActorsConnectionWhere!]
+  node: PersonWhere
+}
+
+type MovieActorsRelationship {
+  cursor: String!
+  node: Person!
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MovieSort!]
+}
+
+type MovieProducersConnection {
+  edges: [MovieProducersRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input MovieProducersConnectionSort {
+  node: PersonSort
+}
+
+input MovieProducersConnectionWhere {
+  AND: [MovieProducersConnectionWhere!]
+  NOT: MovieProducersConnectionWhere
+  OR: [MovieProducersConnectionWhere!]
+  node: PersonWhere
+}
+
+type MovieProducersRelationship {
+  cursor: String!
+  node: Person!
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
+"""
+input MovieSort {
+  id: SortDirection
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  """
+  Return Movies where all of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_ALL: MovieActorsConnectionWhere
+  """
+  Return Movies where none of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_NONE: MovieActorsConnectionWhere
+  """
+  Return Movies where one of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SINGLE: MovieActorsConnectionWhere
+  """
+  Return Movies where some of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SOME: MovieActorsConnectionWhere
+  """Return Movies where all of the related People match this filter"""
+  actors_ALL: PersonWhere
+  """Return Movies where none of the related People match this filter"""
+  actors_NONE: PersonWhere
+  """Return Movies where one of the related People match this filter"""
+  actors_SINGLE: PersonWhere
+  """Return Movies where some of the related People match this filter"""
+  actors_SOME: PersonWhere
+  id: ID
+  id_CONTAINS: ID
+  id_ENDS_WITH: ID
+  id_IN: [ID]
+  id_STARTS_WITH: ID
+  """
+  Return Movies where all of the related MovieProducersConnections match this filter
+  """
+  producersConnection_ALL: MovieProducersConnectionWhere
+  """
+  Return Movies where none of the related MovieProducersConnections match this filter
+  """
+  producersConnection_NONE: MovieProducersConnectionWhere
+  """
+  Return Movies where one of the related MovieProducersConnections match this filter
+  """
+  producersConnection_SINGLE: MovieProducersConnectionWhere
+  """
+  Return Movies where some of the related MovieProducersConnections match this filter
+  """
+  producersConnection_SOME: MovieProducersConnectionWhere
+  """Return Movies where all of the related People match this filter"""
+  producers_ALL: PersonWhere
+  """Return Movies where none of the related People match this filter"""
+  producers_NONE: PersonWhere
+  """Return Movies where one of the related People match this filter"""
+  producers_SINGLE: PersonWhere
+  """Return Movies where some of the related People match this filter"""
+  producers_SOME: PersonWhere
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+type PeopleConnection {
+  edges: [PersonEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+type Person {
+  name: String
+}
+
+type PersonEdge {
+  cursor: String!
+  node: Person!
+}
+
+input PersonOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more PersonSort objects to sort People by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [PersonSort!]
+}
+
+"""
+Fields to sort People by. The order in which sorts are applied is not guaranteed when specifying many fields in one PersonSort object.
+"""
+input PersonSort {
+  name: SortDirection
+}
+
+input PersonWhere {
+  AND: [PersonWhere!]
+  NOT: PersonWhere
+  OR: [PersonWhere!]
+  name: String
+  name_CONTAINS: String
+  name_ENDS_WITH: String
+  name_IN: [String]
+  name_STARTS_WITH: String
+}
+
+type Query {
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+  people(options: PersonOptions, where: PersonWhere): [Person!]!
+  peopleConnection(after: String, first: Int, sort: [PersonSort], where: PersonWhere): PeopleConnection!
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
+
+=== Two relationships with nested operations specified on both
+
+.Schema
+[source,graphql,schema=true]
+----
+type Person {
+  name: String
+}
+
+type Movie {
+  id: ID
+  actors: [Person!]! @relationship(type: "ACTED_IN", direction: IN, nestedOperations: [CREATE])
+  producers: [Person!]! @relationship(type: "PRODUCED", direction: IN, nestedOperations: [DISCONNECT])
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+type Movie {
+  actors(directed: Boolean = true, options: PersonOptions, where: PersonWhere): [Person!]!
+  actorsConnection(after: String, directed: Boolean = true, first: Int, sort: [MovieActorsConnectionSort!], where: MovieActorsConnectionWhere): MovieActorsConnection!
+  id: ID
+  producers(directed: Boolean = true, options: PersonOptions, where: PersonWhere): [Person!]!
+  producersConnection(after: String, directed: Boolean = true, first: Int, sort: [MovieProducersConnectionSort!], where: MovieProducersConnectionWhere): MovieProducersConnection!
+}
+
+type MovieActorsConnection {
+  edges: [MovieActorsRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input MovieActorsConnectionSort {
+  node: PersonSort
+}
+
+input MovieActorsConnectionWhere {
+  AND: [MovieActorsConnectionWhere!]
+  NOT: MovieActorsConnectionWhere
+  OR: [MovieActorsConnectionWhere!]
+  node: PersonWhere
+}
+
+type MovieActorsRelationship {
+  cursor: String!
+  node: Person!
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MovieSort!]
+}
+
+type MovieProducersConnection {
+  edges: [MovieProducersRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input MovieProducersConnectionSort {
+  node: PersonSort
+}
+
+input MovieProducersConnectionWhere {
+  AND: [MovieProducersConnectionWhere!]
+  NOT: MovieProducersConnectionWhere
+  OR: [MovieProducersConnectionWhere!]
+  node: PersonWhere
+}
+
+type MovieProducersRelationship {
+  cursor: String!
+  node: Person!
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
+"""
+input MovieSort {
+  id: SortDirection
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  """
+  Return Movies where all of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_ALL: MovieActorsConnectionWhere
+  """
+  Return Movies where none of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_NONE: MovieActorsConnectionWhere
+  """
+  Return Movies where one of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SINGLE: MovieActorsConnectionWhere
+  """
+  Return Movies where some of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SOME: MovieActorsConnectionWhere
+  """Return Movies where all of the related People match this filter"""
+  actors_ALL: PersonWhere
+  """Return Movies where none of the related People match this filter"""
+  actors_NONE: PersonWhere
+  """Return Movies where one of the related People match this filter"""
+  actors_SINGLE: PersonWhere
+  """Return Movies where some of the related People match this filter"""
+  actors_SOME: PersonWhere
+  id: ID
+  id_CONTAINS: ID
+  id_ENDS_WITH: ID
+  id_IN: [ID]
+  id_STARTS_WITH: ID
+  """
+  Return Movies where all of the related MovieProducersConnections match this filter
+  """
+  producersConnection_ALL: MovieProducersConnectionWhere
+  """
+  Return Movies where none of the related MovieProducersConnections match this filter
+  """
+  producersConnection_NONE: MovieProducersConnectionWhere
+  """
+  Return Movies where one of the related MovieProducersConnections match this filter
+  """
+  producersConnection_SINGLE: MovieProducersConnectionWhere
+  """
+  Return Movies where some of the related MovieProducersConnections match this filter
+  """
+  producersConnection_SOME: MovieProducersConnectionWhere
+  """Return Movies where all of the related People match this filter"""
+  producers_ALL: PersonWhere
+  """Return Movies where none of the related People match this filter"""
+  producers_NONE: PersonWhere
+  """Return Movies where one of the related People match this filter"""
+  producers_SINGLE: PersonWhere
+  """Return Movies where some of the related People match this filter"""
+  producers_SOME: PersonWhere
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+type PeopleConnection {
+  edges: [PersonEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+type Person {
+  name: String
+}
+
+type PersonEdge {
+  cursor: String!
+  node: Person!
+}
+
+input PersonOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more PersonSort objects to sort People by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [PersonSort!]
+}
+
+"""
+Fields to sort People by. The order in which sorts are applied is not guaranteed when specifying many fields in one PersonSort object.
+"""
+input PersonSort {
+  name: SortDirection
+}
+
+input PersonWhere {
+  AND: [PersonWhere!]
+  NOT: PersonWhere
+  OR: [PersonWhere!]
+  name: String
+  name_CONTAINS: String
+  name_ENDS_WITH: String
+  name_IN: [String]
+  name_STARTS_WITH: String
+}
+
+type Query {
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+  people(options: PersonOptions, where: PersonWhere): [Person!]!
+  peopleConnection(after: String, first: Int, sort: [PersonSort], where: PersonWhere): PeopleConnection!
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
+
+== Related to a union type
+
+=== Should not generate UpdateFieldInput input with no nested operations
+
+.Schema
+[source,graphql,schema=true]
+----
+type PersonOne {
+  name: String
+}
+
+type PersonTwo {
+  nameTwo: String
+}
+
+union Person = PersonOne | PersonTwo
+
+type Movie {
+  id: ID
+  actors: [Person!]! @relationship(type: "ACTED_IN", direction: IN, nestedOperations: [])
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+type Movie {
+  actors(directed: Boolean = true, options: QueryOptions, where: PersonWhere): [Person!]!
+  actorsConnection(after: String, directed: Boolean = true, first: Int, where: MovieActorsConnectionWhere): MovieActorsConnection!
+  id: ID
+}
+
+type MovieActorsConnection {
+  edges: [MovieActorsRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input MovieActorsConnectionWhere {
+  PersonOne: MovieActorsPersonOneConnectionWhere
+  PersonTwo: MovieActorsPersonTwoConnectionWhere
+}
+
+input MovieActorsPersonOneConnectionWhere {
+  AND: [MovieActorsPersonOneConnectionWhere!]
+  NOT: MovieActorsPersonOneConnectionWhere
+  OR: [MovieActorsPersonOneConnectionWhere!]
+  node: PersonOneWhere
+}
+
+input MovieActorsPersonTwoConnectionWhere {
+  AND: [MovieActorsPersonTwoConnectionWhere!]
+  NOT: MovieActorsPersonTwoConnectionWhere
+  OR: [MovieActorsPersonTwoConnectionWhere!]
+  node: PersonTwoWhere
+}
+
+type MovieActorsRelationship {
+  cursor: String!
+  node: Person!
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MovieSort!]
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
+"""
+input MovieSort {
+  id: SortDirection
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  """
+  Return Movies where all of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_ALL: MovieActorsConnectionWhere
+  """
+  Return Movies where none of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_NONE: MovieActorsConnectionWhere
+  """
+  Return Movies where one of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SINGLE: MovieActorsConnectionWhere
+  """
+  Return Movies where some of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SOME: MovieActorsConnectionWhere
+  """Return Movies where all of the related People match this filter"""
+  actors_ALL: PersonWhere
+  """Return Movies where none of the related People match this filter"""
+  actors_NONE: PersonWhere
+  """Return Movies where one of the related People match this filter"""
+  actors_SINGLE: PersonWhere
+  """Return Movies where some of the related People match this filter"""
+  actors_SOME: PersonWhere
+  id: ID
+  id_CONTAINS: ID
+  id_ENDS_WITH: ID
+  id_IN: [ID]
+  id_STARTS_WITH: ID
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+union Person = PersonOne | PersonTwo
+
+type PersonOne {
+  name: String
+}
+
+type PersonOneEdge {
+  cursor: String!
+  node: PersonOne!
+}
+
+input PersonOneOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more PersonOneSort objects to sort PersonOnes by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [PersonOneSort!]
+}
+
+"""
+Fields to sort PersonOnes by. The order in which sorts are applied is not guaranteed when specifying many fields in one PersonOneSort object.
+"""
+input PersonOneSort {
+  name: SortDirection
+}
+
+input PersonOneWhere {
+  AND: [PersonOneWhere!]
+  NOT: PersonOneWhere
+  OR: [PersonOneWhere!]
+  name: String
+  name_CONTAINS: String
+  name_ENDS_WITH: String
+  name_IN: [String]
+  name_STARTS_WITH: String
+}
+
+type PersonOnesConnection {
+  edges: [PersonOneEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+type PersonTwo {
+  nameTwo: String
+}
+
+type PersonTwoEdge {
+  cursor: String!
+  node: PersonTwo!
+}
+
+input PersonTwoOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more PersonTwoSort objects to sort PersonTwos by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [PersonTwoSort!]
+}
+
+"""
+Fields to sort PersonTwos by. The order in which sorts are applied is not guaranteed when specifying many fields in one PersonTwoSort object.
+"""
+input PersonTwoSort {
+  nameTwo: SortDirection
+}
+
+input PersonTwoWhere {
+  AND: [PersonTwoWhere!]
+  NOT: PersonTwoWhere
+  OR: [PersonTwoWhere!]
+  nameTwo: String
+  nameTwo_CONTAINS: String
+  nameTwo_ENDS_WITH: String
+  nameTwo_IN: [String]
+  nameTwo_STARTS_WITH: String
+}
+
+type PersonTwosConnection {
+  edges: [PersonTwoEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input PersonWhere {
+  PersonOne: PersonOneWhere
+  PersonTwo: PersonTwoWhere
+}
+
+type Query {
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+  people(options: QueryOptions, where: PersonWhere): [Person!]!
+  personOnes(options: PersonOneOptions, where: PersonOneWhere): [PersonOne!]!
+  personOnesConnection(after: String, first: Int, sort: [PersonOneSort], where: PersonOneWhere): PersonOnesConnection!
+  personTwos(options: PersonTwoOptions, where: PersonTwoWhere): [PersonTwo!]!
+  personTwosConnection(after: String, first: Int, sort: [PersonTwoSort], where: PersonTwoWhere): PersonTwosConnection!
+}
+
+"""Input type for options that can be specified on a query operation."""
+input QueryOptions {
+  limit: Int
+  offset: Int
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
+
+=== Single relationship with nested operation CREATE specified
+
+.Schema
+[source,graphql,schema=true]
+----
+type PersonOne {
+  name: String
+}
+
+type PersonTwo {
+  nameTwo: String
+}
+
+union Person = PersonOne | PersonTwo
+
+type Movie {
+  id: ID
+  actors: [Person!]! @relationship(type: "ACTED_IN", direction: IN, nestedOperations: [CREATE])
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+type Movie {
+  actors(directed: Boolean = true, options: QueryOptions, where: PersonWhere): [Person!]!
+  actorsConnection(after: String, directed: Boolean = true, first: Int, where: MovieActorsConnectionWhere): MovieActorsConnection!
+  id: ID
+}
+
+type MovieActorsConnection {
+  edges: [MovieActorsRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input MovieActorsConnectionWhere {
+  PersonOne: MovieActorsPersonOneConnectionWhere
+  PersonTwo: MovieActorsPersonTwoConnectionWhere
+}
+
+input MovieActorsPersonOneConnectionWhere {
+  AND: [MovieActorsPersonOneConnectionWhere!]
+  NOT: MovieActorsPersonOneConnectionWhere
+  OR: [MovieActorsPersonOneConnectionWhere!]
+  node: PersonOneWhere
+}
+
+input MovieActorsPersonTwoConnectionWhere {
+  AND: [MovieActorsPersonTwoConnectionWhere!]
+  NOT: MovieActorsPersonTwoConnectionWhere
+  OR: [MovieActorsPersonTwoConnectionWhere!]
+  node: PersonTwoWhere
+}
+
+type MovieActorsRelationship {
+  cursor: String!
+  node: Person!
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MovieSort!]
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
+"""
+input MovieSort {
+  id: SortDirection
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  """
+  Return Movies where all of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_ALL: MovieActorsConnectionWhere
+  """
+  Return Movies where none of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_NONE: MovieActorsConnectionWhere
+  """
+  Return Movies where one of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SINGLE: MovieActorsConnectionWhere
+  """
+  Return Movies where some of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SOME: MovieActorsConnectionWhere
+  """Return Movies where all of the related People match this filter"""
+  actors_ALL: PersonWhere
+  """Return Movies where none of the related People match this filter"""
+  actors_NONE: PersonWhere
+  """Return Movies where one of the related People match this filter"""
+  actors_SINGLE: PersonWhere
+  """Return Movies where some of the related People match this filter"""
+  actors_SOME: PersonWhere
+  id: ID
+  id_CONTAINS: ID
+  id_ENDS_WITH: ID
+  id_IN: [ID]
+  id_STARTS_WITH: ID
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+union Person = PersonOne | PersonTwo
+
+type PersonOne {
+  name: String
+}
+
+type PersonOneEdge {
+  cursor: String!
+  node: PersonOne!
+}
+
+input PersonOneOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more PersonOneSort objects to sort PersonOnes by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [PersonOneSort!]
+}
+
+"""
+Fields to sort PersonOnes by. The order in which sorts are applied is not guaranteed when specifying many fields in one PersonOneSort object.
+"""
+input PersonOneSort {
+  name: SortDirection
+}
+
+input PersonOneWhere {
+  AND: [PersonOneWhere!]
+  NOT: PersonOneWhere
+  OR: [PersonOneWhere!]
+  name: String
+  name_CONTAINS: String
+  name_ENDS_WITH: String
+  name_IN: [String]
+  name_STARTS_WITH: String
+}
+
+type PersonOnesConnection {
+  edges: [PersonOneEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+type PersonTwo {
+  nameTwo: String
+}
+
+type PersonTwoEdge {
+  cursor: String!
+  node: PersonTwo!
+}
+
+input PersonTwoOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more PersonTwoSort objects to sort PersonTwos by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [PersonTwoSort!]
+}
+
+"""
+Fields to sort PersonTwos by. The order in which sorts are applied is not guaranteed when specifying many fields in one PersonTwoSort object.
+"""
+input PersonTwoSort {
+  nameTwo: SortDirection
+}
+
+input PersonTwoWhere {
+  AND: [PersonTwoWhere!]
+  NOT: PersonTwoWhere
+  OR: [PersonTwoWhere!]
+  nameTwo: String
+  nameTwo_CONTAINS: String
+  nameTwo_ENDS_WITH: String
+  nameTwo_IN: [String]
+  nameTwo_STARTS_WITH: String
+}
+
+type PersonTwosConnection {
+  edges: [PersonTwoEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input PersonWhere {
+  PersonOne: PersonOneWhere
+  PersonTwo: PersonTwoWhere
+}
+
+type Query {
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+  people(options: QueryOptions, where: PersonWhere): [Person!]!
+  personOnes(options: PersonOneOptions, where: PersonOneWhere): [PersonOne!]!
+  personOnesConnection(after: String, first: Int, sort: [PersonOneSort], where: PersonOneWhere): PersonOnesConnection!
+  personTwos(options: PersonTwoOptions, where: PersonTwoWhere): [PersonTwo!]!
+  personTwosConnection(after: String, first: Int, sort: [PersonTwoSort], where: PersonTwoWhere): PersonTwosConnection!
+}
+
+"""Input type for options that can be specified on a query operation."""
+input QueryOptions {
+  limit: Int
+  offset: Int
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
+
+=== Single relationship with nested operation CONNECT specified
+
+.Schema
+[source,graphql,schema=true]
+----
+type PersonOne {
+  name: String
+}
+
+type PersonTwo {
+  nameTwo: String
+}
+
+union Person = PersonOne | PersonTwo
+
+type Movie {
+  id: ID
+  actors: [Person!]! @relationship(type: "ACTED_IN", direction: IN, nestedOperations: [CONNECT])
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+type Movie {
+  actors(directed: Boolean = true, options: QueryOptions, where: PersonWhere): [Person!]!
+  actorsConnection(after: String, directed: Boolean = true, first: Int, where: MovieActorsConnectionWhere): MovieActorsConnection!
+  id: ID
+}
+
+type MovieActorsConnection {
+  edges: [MovieActorsRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input MovieActorsConnectionWhere {
+  PersonOne: MovieActorsPersonOneConnectionWhere
+  PersonTwo: MovieActorsPersonTwoConnectionWhere
+}
+
+input MovieActorsPersonOneConnectionWhere {
+  AND: [MovieActorsPersonOneConnectionWhere!]
+  NOT: MovieActorsPersonOneConnectionWhere
+  OR: [MovieActorsPersonOneConnectionWhere!]
+  node: PersonOneWhere
+}
+
+input MovieActorsPersonTwoConnectionWhere {
+  AND: [MovieActorsPersonTwoConnectionWhere!]
+  NOT: MovieActorsPersonTwoConnectionWhere
+  OR: [MovieActorsPersonTwoConnectionWhere!]
+  node: PersonTwoWhere
+}
+
+type MovieActorsRelationship {
+  cursor: String!
+  node: Person!
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MovieSort!]
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
+"""
+input MovieSort {
+  id: SortDirection
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  """
+  Return Movies where all of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_ALL: MovieActorsConnectionWhere
+  """
+  Return Movies where none of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_NONE: MovieActorsConnectionWhere
+  """
+  Return Movies where one of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SINGLE: MovieActorsConnectionWhere
+  """
+  Return Movies where some of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SOME: MovieActorsConnectionWhere
+  """Return Movies where all of the related People match this filter"""
+  actors_ALL: PersonWhere
+  """Return Movies where none of the related People match this filter"""
+  actors_NONE: PersonWhere
+  """Return Movies where one of the related People match this filter"""
+  actors_SINGLE: PersonWhere
+  """Return Movies where some of the related People match this filter"""
+  actors_SOME: PersonWhere
+  id: ID
+  id_CONTAINS: ID
+  id_ENDS_WITH: ID
+  id_IN: [ID]
+  id_STARTS_WITH: ID
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+union Person = PersonOne | PersonTwo
+
+type PersonOne {
+  name: String
+}
+
+type PersonOneEdge {
+  cursor: String!
+  node: PersonOne!
+}
+
+input PersonOneOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more PersonOneSort objects to sort PersonOnes by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [PersonOneSort!]
+}
+
+"""
+Fields to sort PersonOnes by. The order in which sorts are applied is not guaranteed when specifying many fields in one PersonOneSort object.
+"""
+input PersonOneSort {
+  name: SortDirection
+}
+
+input PersonOneWhere {
+  AND: [PersonOneWhere!]
+  NOT: PersonOneWhere
+  OR: [PersonOneWhere!]
+  name: String
+  name_CONTAINS: String
+  name_ENDS_WITH: String
+  name_IN: [String]
+  name_STARTS_WITH: String
+}
+
+type PersonOnesConnection {
+  edges: [PersonOneEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+type PersonTwo {
+  nameTwo: String
+}
+
+type PersonTwoEdge {
+  cursor: String!
+  node: PersonTwo!
+}
+
+input PersonTwoOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more PersonTwoSort objects to sort PersonTwos by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [PersonTwoSort!]
+}
+
+"""
+Fields to sort PersonTwos by. The order in which sorts are applied is not guaranteed when specifying many fields in one PersonTwoSort object.
+"""
+input PersonTwoSort {
+  nameTwo: SortDirection
+}
+
+input PersonTwoWhere {
+  AND: [PersonTwoWhere!]
+  NOT: PersonTwoWhere
+  OR: [PersonTwoWhere!]
+  nameTwo: String
+  nameTwo_CONTAINS: String
+  nameTwo_ENDS_WITH: String
+  nameTwo_IN: [String]
+  nameTwo_STARTS_WITH: String
+}
+
+type PersonTwosConnection {
+  edges: [PersonTwoEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input PersonWhere {
+  PersonOne: PersonOneWhere
+  PersonTwo: PersonTwoWhere
+}
+
+type Query {
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+  people(options: QueryOptions, where: PersonWhere): [Person!]!
+  personOnes(options: PersonOneOptions, where: PersonOneWhere): [PersonOne!]!
+  personOnesConnection(after: String, first: Int, sort: [PersonOneSort], where: PersonOneWhere): PersonOnesConnection!
+  personTwos(options: PersonTwoOptions, where: PersonTwoWhere): [PersonTwo!]!
+  personTwosConnection(after: String, first: Int, sort: [PersonTwoSort], where: PersonTwoWhere): PersonTwosConnection!
+}
+
+"""Input type for options that can be specified on a query operation."""
+input QueryOptions {
+  limit: Int
+  offset: Int
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
+
+=== Single relationship with nested operation UPDATE specified
+
+.Schema
+[source,graphql,schema=true]
+----
+type PersonOne {
+  name: String
+}
+
+type PersonTwo {
+  nameTwo: String
+}
+
+union Person = PersonOne | PersonTwo
+
+type Movie {
+  id: ID
+  actors: [Person!]! @relationship(type: "ACTED_IN", direction: IN, nestedOperations: [UPDATE])
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+type Movie {
+  actors(directed: Boolean = true, options: QueryOptions, where: PersonWhere): [Person!]!
+  actorsConnection(after: String, directed: Boolean = true, first: Int, where: MovieActorsConnectionWhere): MovieActorsConnection!
+  id: ID
+}
+
+type MovieActorsConnection {
+  edges: [MovieActorsRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input MovieActorsConnectionWhere {
+  PersonOne: MovieActorsPersonOneConnectionWhere
+  PersonTwo: MovieActorsPersonTwoConnectionWhere
+}
+
+input MovieActorsPersonOneConnectionWhere {
+  AND: [MovieActorsPersonOneConnectionWhere!]
+  NOT: MovieActorsPersonOneConnectionWhere
+  OR: [MovieActorsPersonOneConnectionWhere!]
+  node: PersonOneWhere
+}
+
+input MovieActorsPersonTwoConnectionWhere {
+  AND: [MovieActorsPersonTwoConnectionWhere!]
+  NOT: MovieActorsPersonTwoConnectionWhere
+  OR: [MovieActorsPersonTwoConnectionWhere!]
+  node: PersonTwoWhere
+}
+
+type MovieActorsRelationship {
+  cursor: String!
+  node: Person!
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MovieSort!]
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
+"""
+input MovieSort {
+  id: SortDirection
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  """
+  Return Movies where all of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_ALL: MovieActorsConnectionWhere
+  """
+  Return Movies where none of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_NONE: MovieActorsConnectionWhere
+  """
+  Return Movies where one of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SINGLE: MovieActorsConnectionWhere
+  """
+  Return Movies where some of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SOME: MovieActorsConnectionWhere
+  """Return Movies where all of the related People match this filter"""
+  actors_ALL: PersonWhere
+  """Return Movies where none of the related People match this filter"""
+  actors_NONE: PersonWhere
+  """Return Movies where one of the related People match this filter"""
+  actors_SINGLE: PersonWhere
+  """Return Movies where some of the related People match this filter"""
+  actors_SOME: PersonWhere
+  id: ID
+  id_CONTAINS: ID
+  id_ENDS_WITH: ID
+  id_IN: [ID]
+  id_STARTS_WITH: ID
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+union Person = PersonOne | PersonTwo
+
+type PersonOne {
+  name: String
+}
+
+type PersonOneEdge {
+  cursor: String!
+  node: PersonOne!
+}
+
+input PersonOneOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more PersonOneSort objects to sort PersonOnes by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [PersonOneSort!]
+}
+
+"""
+Fields to sort PersonOnes by. The order in which sorts are applied is not guaranteed when specifying many fields in one PersonOneSort object.
+"""
+input PersonOneSort {
+  name: SortDirection
+}
+
+input PersonOneWhere {
+  AND: [PersonOneWhere!]
+  NOT: PersonOneWhere
+  OR: [PersonOneWhere!]
+  name: String
+  name_CONTAINS: String
+  name_ENDS_WITH: String
+  name_IN: [String]
+  name_STARTS_WITH: String
+}
+
+type PersonOnesConnection {
+  edges: [PersonOneEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+type PersonTwo {
+  nameTwo: String
+}
+
+type PersonTwoEdge {
+  cursor: String!
+  node: PersonTwo!
+}
+
+input PersonTwoOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more PersonTwoSort objects to sort PersonTwos by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [PersonTwoSort!]
+}
+
+"""
+Fields to sort PersonTwos by. The order in which sorts are applied is not guaranteed when specifying many fields in one PersonTwoSort object.
+"""
+input PersonTwoSort {
+  nameTwo: SortDirection
+}
+
+input PersonTwoWhere {
+  AND: [PersonTwoWhere!]
+  NOT: PersonTwoWhere
+  OR: [PersonTwoWhere!]
+  nameTwo: String
+  nameTwo_CONTAINS: String
+  nameTwo_ENDS_WITH: String
+  nameTwo_IN: [String]
+  nameTwo_STARTS_WITH: String
+}
+
+type PersonTwosConnection {
+  edges: [PersonTwoEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input PersonWhere {
+  PersonOne: PersonOneWhere
+  PersonTwo: PersonTwoWhere
+}
+
+type Query {
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+  people(options: QueryOptions, where: PersonWhere): [Person!]!
+  personOnes(options: PersonOneOptions, where: PersonOneWhere): [PersonOne!]!
+  personOnesConnection(after: String, first: Int, sort: [PersonOneSort], where: PersonOneWhere): PersonOnesConnection!
+  personTwos(options: PersonTwoOptions, where: PersonTwoWhere): [PersonTwo!]!
+  personTwosConnection(after: String, first: Int, sort: [PersonTwoSort], where: PersonTwoWhere): PersonTwosConnection!
+}
+
+"""Input type for options that can be specified on a query operation."""
+input QueryOptions {
+  limit: Int
+  offset: Int
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
+
+=== Single relationship with nested operation DELETE specified
+
+.Schema
+[source,graphql,schema=true]
+----
+type PersonOne {
+  name: String
+}
+
+type PersonTwo {
+  nameTwo: String
+}
+
+union Person = PersonOne | PersonTwo
+
+type Movie {
+  id: ID
+  actors: [Person!]! @relationship(type: "ACTED_IN", direction: IN, nestedOperations: [DELETE])
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+type Movie {
+  actors(directed: Boolean = true, options: QueryOptions, where: PersonWhere): [Person!]!
+  actorsConnection(after: String, directed: Boolean = true, first: Int, where: MovieActorsConnectionWhere): MovieActorsConnection!
+  id: ID
+}
+
+type MovieActorsConnection {
+  edges: [MovieActorsRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input MovieActorsConnectionWhere {
+  PersonOne: MovieActorsPersonOneConnectionWhere
+  PersonTwo: MovieActorsPersonTwoConnectionWhere
+}
+
+input MovieActorsPersonOneConnectionWhere {
+  AND: [MovieActorsPersonOneConnectionWhere!]
+  NOT: MovieActorsPersonOneConnectionWhere
+  OR: [MovieActorsPersonOneConnectionWhere!]
+  node: PersonOneWhere
+}
+
+input MovieActorsPersonTwoConnectionWhere {
+  AND: [MovieActorsPersonTwoConnectionWhere!]
+  NOT: MovieActorsPersonTwoConnectionWhere
+  OR: [MovieActorsPersonTwoConnectionWhere!]
+  node: PersonTwoWhere
+}
+
+type MovieActorsRelationship {
+  cursor: String!
+  node: Person!
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MovieSort!]
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
+"""
+input MovieSort {
+  id: SortDirection
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  """
+  Return Movies where all of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_ALL: MovieActorsConnectionWhere
+  """
+  Return Movies where none of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_NONE: MovieActorsConnectionWhere
+  """
+  Return Movies where one of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SINGLE: MovieActorsConnectionWhere
+  """
+  Return Movies where some of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SOME: MovieActorsConnectionWhere
+  """Return Movies where all of the related People match this filter"""
+  actors_ALL: PersonWhere
+  """Return Movies where none of the related People match this filter"""
+  actors_NONE: PersonWhere
+  """Return Movies where one of the related People match this filter"""
+  actors_SINGLE: PersonWhere
+  """Return Movies where some of the related People match this filter"""
+  actors_SOME: PersonWhere
+  id: ID
+  id_CONTAINS: ID
+  id_ENDS_WITH: ID
+  id_IN: [ID]
+  id_STARTS_WITH: ID
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+union Person = PersonOne | PersonTwo
+
+type PersonOne {
+  name: String
+}
+
+type PersonOneEdge {
+  cursor: String!
+  node: PersonOne!
+}
+
+input PersonOneOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more PersonOneSort objects to sort PersonOnes by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [PersonOneSort!]
+}
+
+"""
+Fields to sort PersonOnes by. The order in which sorts are applied is not guaranteed when specifying many fields in one PersonOneSort object.
+"""
+input PersonOneSort {
+  name: SortDirection
+}
+
+input PersonOneWhere {
+  AND: [PersonOneWhere!]
+  NOT: PersonOneWhere
+  OR: [PersonOneWhere!]
+  name: String
+  name_CONTAINS: String
+  name_ENDS_WITH: String
+  name_IN: [String]
+  name_STARTS_WITH: String
+}
+
+type PersonOnesConnection {
+  edges: [PersonOneEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+type PersonTwo {
+  nameTwo: String
+}
+
+type PersonTwoEdge {
+  cursor: String!
+  node: PersonTwo!
+}
+
+input PersonTwoOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more PersonTwoSort objects to sort PersonTwos by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [PersonTwoSort!]
+}
+
+"""
+Fields to sort PersonTwos by. The order in which sorts are applied is not guaranteed when specifying many fields in one PersonTwoSort object.
+"""
+input PersonTwoSort {
+  nameTwo: SortDirection
+}
+
+input PersonTwoWhere {
+  AND: [PersonTwoWhere!]
+  NOT: PersonTwoWhere
+  OR: [PersonTwoWhere!]
+  nameTwo: String
+  nameTwo_CONTAINS: String
+  nameTwo_ENDS_WITH: String
+  nameTwo_IN: [String]
+  nameTwo_STARTS_WITH: String
+}
+
+type PersonTwosConnection {
+  edges: [PersonTwoEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input PersonWhere {
+  PersonOne: PersonOneWhere
+  PersonTwo: PersonTwoWhere
+}
+
+type Query {
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+  people(options: QueryOptions, where: PersonWhere): [Person!]!
+  personOnes(options: PersonOneOptions, where: PersonOneWhere): [PersonOne!]!
+  personOnesConnection(after: String, first: Int, sort: [PersonOneSort], where: PersonOneWhere): PersonOnesConnection!
+  personTwos(options: PersonTwoOptions, where: PersonTwoWhere): [PersonTwo!]!
+  personTwosConnection(after: String, first: Int, sort: [PersonTwoSort], where: PersonTwoWhere): PersonTwosConnection!
+}
+
+"""Input type for options that can be specified on a query operation."""
+input QueryOptions {
+  limit: Int
+  offset: Int
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
+
+=== Single relationship with nested operation DISCONNECT specified
+
+.Schema
+[source,graphql,schema=true]
+----
+type PersonOne {
+  name: String
+}
+
+type PersonTwo {
+  nameTwo: String
+}
+
+union Person = PersonOne | PersonTwo
+
+type Movie {
+  id: ID
+  actors: [Person!]! @relationship(type: "ACTED_IN", direction: IN, nestedOperations: [DISCONNECT])
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+type Movie {
+  actors(directed: Boolean = true, options: QueryOptions, where: PersonWhere): [Person!]!
+  actorsConnection(after: String, directed: Boolean = true, first: Int, where: MovieActorsConnectionWhere): MovieActorsConnection!
+  id: ID
+}
+
+type MovieActorsConnection {
+  edges: [MovieActorsRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input MovieActorsConnectionWhere {
+  PersonOne: MovieActorsPersonOneConnectionWhere
+  PersonTwo: MovieActorsPersonTwoConnectionWhere
+}
+
+input MovieActorsPersonOneConnectionWhere {
+  AND: [MovieActorsPersonOneConnectionWhere!]
+  NOT: MovieActorsPersonOneConnectionWhere
+  OR: [MovieActorsPersonOneConnectionWhere!]
+  node: PersonOneWhere
+}
+
+input MovieActorsPersonTwoConnectionWhere {
+  AND: [MovieActorsPersonTwoConnectionWhere!]
+  NOT: MovieActorsPersonTwoConnectionWhere
+  OR: [MovieActorsPersonTwoConnectionWhere!]
+  node: PersonTwoWhere
+}
+
+type MovieActorsRelationship {
+  cursor: String!
+  node: Person!
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MovieSort!]
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
+"""
+input MovieSort {
+  id: SortDirection
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  """
+  Return Movies where all of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_ALL: MovieActorsConnectionWhere
+  """
+  Return Movies where none of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_NONE: MovieActorsConnectionWhere
+  """
+  Return Movies where one of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SINGLE: MovieActorsConnectionWhere
+  """
+  Return Movies where some of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SOME: MovieActorsConnectionWhere
+  """Return Movies where all of the related People match this filter"""
+  actors_ALL: PersonWhere
+  """Return Movies where none of the related People match this filter"""
+  actors_NONE: PersonWhere
+  """Return Movies where one of the related People match this filter"""
+  actors_SINGLE: PersonWhere
+  """Return Movies where some of the related People match this filter"""
+  actors_SOME: PersonWhere
+  id: ID
+  id_CONTAINS: ID
+  id_ENDS_WITH: ID
+  id_IN: [ID]
+  id_STARTS_WITH: ID
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+union Person = PersonOne | PersonTwo
+
+type PersonOne {
+  name: String
+}
+
+type PersonOneEdge {
+  cursor: String!
+  node: PersonOne!
+}
+
+input PersonOneOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more PersonOneSort objects to sort PersonOnes by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [PersonOneSort!]
+}
+
+"""
+Fields to sort PersonOnes by. The order in which sorts are applied is not guaranteed when specifying many fields in one PersonOneSort object.
+"""
+input PersonOneSort {
+  name: SortDirection
+}
+
+input PersonOneWhere {
+  AND: [PersonOneWhere!]
+  NOT: PersonOneWhere
+  OR: [PersonOneWhere!]
+  name: String
+  name_CONTAINS: String
+  name_ENDS_WITH: String
+  name_IN: [String]
+  name_STARTS_WITH: String
+}
+
+type PersonOnesConnection {
+  edges: [PersonOneEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+type PersonTwo {
+  nameTwo: String
+}
+
+type PersonTwoEdge {
+  cursor: String!
+  node: PersonTwo!
+}
+
+input PersonTwoOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more PersonTwoSort objects to sort PersonTwos by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [PersonTwoSort!]
+}
+
+"""
+Fields to sort PersonTwos by. The order in which sorts are applied is not guaranteed when specifying many fields in one PersonTwoSort object.
+"""
+input PersonTwoSort {
+  nameTwo: SortDirection
+}
+
+input PersonTwoWhere {
+  AND: [PersonTwoWhere!]
+  NOT: PersonTwoWhere
+  OR: [PersonTwoWhere!]
+  nameTwo: String
+  nameTwo_CONTAINS: String
+  nameTwo_ENDS_WITH: String
+  nameTwo_IN: [String]
+  nameTwo_STARTS_WITH: String
+}
+
+type PersonTwosConnection {
+  edges: [PersonTwoEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input PersonWhere {
+  PersonOne: PersonOneWhere
+  PersonTwo: PersonTwoWhere
+}
+
+type Query {
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+  people(options: QueryOptions, where: PersonWhere): [Person!]!
+  personOnes(options: PersonOneOptions, where: PersonOneWhere): [PersonOne!]!
+  personOnesConnection(after: String, first: Int, sort: [PersonOneSort], where: PersonOneWhere): PersonOnesConnection!
+  personTwos(options: PersonTwoOptions, where: PersonTwoWhere): [PersonTwo!]!
+  personTwosConnection(after: String, first: Int, sort: [PersonTwoSort], where: PersonTwoWhere): PersonTwosConnection!
+}
+
+"""Input type for options that can be specified on a query operation."""
+input QueryOptions {
+  limit: Int
+  offset: Int
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
+
+=== Should not generate any nested operations if only CONNECT_OR_CREATE is specified and the related type does not have a unique field
+
+.Schema
+[source,graphql,schema=true]
+----
+type PersonOne {
+  name: String
+}
+
+type PersonTwo {
+  nameTwo: String
+}
+
+union Person = PersonOne | PersonTwo
+
+type Movie {
+  id: ID
+  actors: [Person!]! @relationship(type: "ACTED_IN", direction: IN, nestedOperations: [CONNECT_OR_CREATE])
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+type Movie {
+  actors(directed: Boolean = true, options: QueryOptions, where: PersonWhere): [Person!]!
+  actorsConnection(after: String, directed: Boolean = true, first: Int, where: MovieActorsConnectionWhere): MovieActorsConnection!
+  id: ID
+}
+
+type MovieActorsConnection {
+  edges: [MovieActorsRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input MovieActorsConnectionWhere {
+  PersonOne: MovieActorsPersonOneConnectionWhere
+  PersonTwo: MovieActorsPersonTwoConnectionWhere
+}
+
+input MovieActorsPersonOneConnectionWhere {
+  AND: [MovieActorsPersonOneConnectionWhere!]
+  NOT: MovieActorsPersonOneConnectionWhere
+  OR: [MovieActorsPersonOneConnectionWhere!]
+  node: PersonOneWhere
+}
+
+input MovieActorsPersonTwoConnectionWhere {
+  AND: [MovieActorsPersonTwoConnectionWhere!]
+  NOT: MovieActorsPersonTwoConnectionWhere
+  OR: [MovieActorsPersonTwoConnectionWhere!]
+  node: PersonTwoWhere
+}
+
+type MovieActorsRelationship {
+  cursor: String!
+  node: Person!
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MovieSort!]
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
+"""
+input MovieSort {
+  id: SortDirection
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  """
+  Return Movies where all of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_ALL: MovieActorsConnectionWhere
+  """
+  Return Movies where none of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_NONE: MovieActorsConnectionWhere
+  """
+  Return Movies where one of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SINGLE: MovieActorsConnectionWhere
+  """
+  Return Movies where some of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SOME: MovieActorsConnectionWhere
+  """Return Movies where all of the related People match this filter"""
+  actors_ALL: PersonWhere
+  """Return Movies where none of the related People match this filter"""
+  actors_NONE: PersonWhere
+  """Return Movies where one of the related People match this filter"""
+  actors_SINGLE: PersonWhere
+  """Return Movies where some of the related People match this filter"""
+  actors_SOME: PersonWhere
+  id: ID
+  id_CONTAINS: ID
+  id_ENDS_WITH: ID
+  id_IN: [ID]
+  id_STARTS_WITH: ID
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+union Person = PersonOne | PersonTwo
+
+type PersonOne {
+  name: String
+}
+
+type PersonOneEdge {
+  cursor: String!
+  node: PersonOne!
+}
+
+input PersonOneOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more PersonOneSort objects to sort PersonOnes by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [PersonOneSort!]
+}
+
+"""
+Fields to sort PersonOnes by. The order in which sorts are applied is not guaranteed when specifying many fields in one PersonOneSort object.
+"""
+input PersonOneSort {
+  name: SortDirection
+}
+
+input PersonOneWhere {
+  AND: [PersonOneWhere!]
+  NOT: PersonOneWhere
+  OR: [PersonOneWhere!]
+  name: String
+  name_CONTAINS: String
+  name_ENDS_WITH: String
+  name_IN: [String]
+  name_STARTS_WITH: String
+}
+
+type PersonOnesConnection {
+  edges: [PersonOneEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+type PersonTwo {
+  nameTwo: String
+}
+
+type PersonTwoEdge {
+  cursor: String!
+  node: PersonTwo!
+}
+
+input PersonTwoOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more PersonTwoSort objects to sort PersonTwos by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [PersonTwoSort!]
+}
+
+"""
+Fields to sort PersonTwos by. The order in which sorts are applied is not guaranteed when specifying many fields in one PersonTwoSort object.
+"""
+input PersonTwoSort {
+  nameTwo: SortDirection
+}
+
+input PersonTwoWhere {
+  AND: [PersonTwoWhere!]
+  NOT: PersonTwoWhere
+  OR: [PersonTwoWhere!]
+  nameTwo: String
+  nameTwo_CONTAINS: String
+  nameTwo_ENDS_WITH: String
+  nameTwo_IN: [String]
+  nameTwo_STARTS_WITH: String
+}
+
+type PersonTwosConnection {
+  edges: [PersonTwoEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input PersonWhere {
+  PersonOne: PersonOneWhere
+  PersonTwo: PersonTwoWhere
+}
+
+type Query {
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+  people(options: QueryOptions, where: PersonWhere): [Person!]!
+  personOnes(options: PersonOneOptions, where: PersonOneWhere): [PersonOne!]!
+  personOnesConnection(after: String, first: Int, sort: [PersonOneSort], where: PersonOneWhere): PersonOnesConnection!
+  personTwos(options: PersonTwoOptions, where: PersonTwoWhere): [PersonTwo!]!
+  personTwosConnection(after: String, first: Int, sort: [PersonTwoSort], where: PersonTwoWhere): PersonTwosConnection!
+}
+
+"""Input type for options that can be specified on a query operation."""
+input QueryOptions {
+  limit: Int
+  offset: Int
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
+
+=== Two relationships with nested operations specified on one
+
+.Schema
+[source,graphql,schema=true]
+----
+type PersonOne {
+  name: String
+}
+
+type PersonTwo {
+  nameTwo: String
+}
+
+union Person = PersonOne | PersonTwo
+
+type Movie {
+  id: ID
+  actors: [Person!]! @relationship(type: "ACTED_IN", direction: IN)
+  producers: [Person!]! @relationship(type: "PRODUCED", direction: IN, nestedOperations: [DISCONNECT])
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+type Movie {
+  actors(directed: Boolean = true, options: QueryOptions, where: PersonWhere): [Person!]!
+  actorsConnection(after: String, directed: Boolean = true, first: Int, where: MovieActorsConnectionWhere): MovieActorsConnection!
+  id: ID
+  producers(directed: Boolean = true, options: QueryOptions, where: PersonWhere): [Person!]!
+  producersConnection(after: String, directed: Boolean = true, first: Int, where: MovieProducersConnectionWhere): MovieProducersConnection!
+}
+
+type MovieActorsConnection {
+  edges: [MovieActorsRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input MovieActorsConnectionWhere {
+  PersonOne: MovieActorsPersonOneConnectionWhere
+  PersonTwo: MovieActorsPersonTwoConnectionWhere
+}
+
+input MovieActorsPersonOneConnectionWhere {
+  AND: [MovieActorsPersonOneConnectionWhere!]
+  NOT: MovieActorsPersonOneConnectionWhere
+  OR: [MovieActorsPersonOneConnectionWhere!]
+  node: PersonOneWhere
+}
+
+input MovieActorsPersonTwoConnectionWhere {
+  AND: [MovieActorsPersonTwoConnectionWhere!]
+  NOT: MovieActorsPersonTwoConnectionWhere
+  OR: [MovieActorsPersonTwoConnectionWhere!]
+  node: PersonTwoWhere
+}
+
+type MovieActorsRelationship {
+  cursor: String!
+  node: Person!
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MovieSort!]
+}
+
+type MovieProducersConnection {
+  edges: [MovieProducersRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input MovieProducersConnectionWhere {
+  PersonOne: MovieProducersPersonOneConnectionWhere
+  PersonTwo: MovieProducersPersonTwoConnectionWhere
+}
+
+input MovieProducersPersonOneConnectionWhere {
+  AND: [MovieProducersPersonOneConnectionWhere!]
+  NOT: MovieProducersPersonOneConnectionWhere
+  OR: [MovieProducersPersonOneConnectionWhere!]
+  node: PersonOneWhere
+}
+
+input MovieProducersPersonTwoConnectionWhere {
+  AND: [MovieProducersPersonTwoConnectionWhere!]
+  NOT: MovieProducersPersonTwoConnectionWhere
+  OR: [MovieProducersPersonTwoConnectionWhere!]
+  node: PersonTwoWhere
+}
+
+type MovieProducersRelationship {
+  cursor: String!
+  node: Person!
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
+"""
+input MovieSort {
+  id: SortDirection
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  """
+  Return Movies where all of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_ALL: MovieActorsConnectionWhere
+  """
+  Return Movies where none of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_NONE: MovieActorsConnectionWhere
+  """
+  Return Movies where one of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SINGLE: MovieActorsConnectionWhere
+  """
+  Return Movies where some of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SOME: MovieActorsConnectionWhere
+  """Return Movies where all of the related People match this filter"""
+  actors_ALL: PersonWhere
+  """Return Movies where none of the related People match this filter"""
+  actors_NONE: PersonWhere
+  """Return Movies where one of the related People match this filter"""
+  actors_SINGLE: PersonWhere
+  """Return Movies where some of the related People match this filter"""
+  actors_SOME: PersonWhere
+  id: ID
+  id_CONTAINS: ID
+  id_ENDS_WITH: ID
+  id_IN: [ID]
+  id_STARTS_WITH: ID
+  """
+  Return Movies where all of the related MovieProducersConnections match this filter
+  """
+  producersConnection_ALL: MovieProducersConnectionWhere
+  """
+  Return Movies where none of the related MovieProducersConnections match this filter
+  """
+  producersConnection_NONE: MovieProducersConnectionWhere
+  """
+  Return Movies where one of the related MovieProducersConnections match this filter
+  """
+  producersConnection_SINGLE: MovieProducersConnectionWhere
+  """
+  Return Movies where some of the related MovieProducersConnections match this filter
+  """
+  producersConnection_SOME: MovieProducersConnectionWhere
+  """Return Movies where all of the related People match this filter"""
+  producers_ALL: PersonWhere
+  """Return Movies where none of the related People match this filter"""
+  producers_NONE: PersonWhere
+  """Return Movies where one of the related People match this filter"""
+  producers_SINGLE: PersonWhere
+  """Return Movies where some of the related People match this filter"""
+  producers_SOME: PersonWhere
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+union Person = PersonOne | PersonTwo
+
+type PersonOne {
+  name: String
+}
+
+type PersonOneEdge {
+  cursor: String!
+  node: PersonOne!
+}
+
+input PersonOneOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more PersonOneSort objects to sort PersonOnes by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [PersonOneSort!]
+}
+
+"""
+Fields to sort PersonOnes by. The order in which sorts are applied is not guaranteed when specifying many fields in one PersonOneSort object.
+"""
+input PersonOneSort {
+  name: SortDirection
+}
+
+input PersonOneWhere {
+  AND: [PersonOneWhere!]
+  NOT: PersonOneWhere
+  OR: [PersonOneWhere!]
+  name: String
+  name_CONTAINS: String
+  name_ENDS_WITH: String
+  name_IN: [String]
+  name_STARTS_WITH: String
+}
+
+type PersonOnesConnection {
+  edges: [PersonOneEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+type PersonTwo {
+  nameTwo: String
+}
+
+type PersonTwoEdge {
+  cursor: String!
+  node: PersonTwo!
+}
+
+input PersonTwoOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more PersonTwoSort objects to sort PersonTwos by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [PersonTwoSort!]
+}
+
+"""
+Fields to sort PersonTwos by. The order in which sorts are applied is not guaranteed when specifying many fields in one PersonTwoSort object.
+"""
+input PersonTwoSort {
+  nameTwo: SortDirection
+}
+
+input PersonTwoWhere {
+  AND: [PersonTwoWhere!]
+  NOT: PersonTwoWhere
+  OR: [PersonTwoWhere!]
+  nameTwo: String
+  nameTwo_CONTAINS: String
+  nameTwo_ENDS_WITH: String
+  nameTwo_IN: [String]
+  nameTwo_STARTS_WITH: String
+}
+
+type PersonTwosConnection {
+  edges: [PersonTwoEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input PersonWhere {
+  PersonOne: PersonOneWhere
+  PersonTwo: PersonTwoWhere
+}
+
+type Query {
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+  people(options: QueryOptions, where: PersonWhere): [Person!]!
+  personOnes(options: PersonOneOptions, where: PersonOneWhere): [PersonOne!]!
+  personOnesConnection(after: String, first: Int, sort: [PersonOneSort], where: PersonOneWhere): PersonOnesConnection!
+  personTwos(options: PersonTwoOptions, where: PersonTwoWhere): [PersonTwo!]!
+  personTwosConnection(after: String, first: Int, sort: [PersonTwoSort], where: PersonTwoWhere): PersonTwosConnection!
+}
+
+"""Input type for options that can be specified on a query operation."""
+input QueryOptions {
+  limit: Int
+  offset: Int
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
+
+=== Two relationships with nested operations specified on both
+
+.Schema
+[source,graphql,schema=true]
+----
+type PersonOne {
+  name: String
+}
+
+type PersonTwo {
+  nameTwo: String
+}
+
+union Person = PersonOne | PersonTwo
+
+type Movie {
+  id: ID
+  actors: [Person!]! @relationship(type: "ACTED_IN", direction: IN, nestedOperations: [CREATE])
+  producers: [Person!]! @relationship(type: "PRODUCED", direction: IN, nestedOperations: [DISCONNECT])
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+type Movie {
+  actors(directed: Boolean = true, options: QueryOptions, where: PersonWhere): [Person!]!
+  actorsConnection(after: String, directed: Boolean = true, first: Int, where: MovieActorsConnectionWhere): MovieActorsConnection!
+  id: ID
+  producers(directed: Boolean = true, options: QueryOptions, where: PersonWhere): [Person!]!
+  producersConnection(after: String, directed: Boolean = true, first: Int, where: MovieProducersConnectionWhere): MovieProducersConnection!
+}
+
+type MovieActorsConnection {
+  edges: [MovieActorsRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input MovieActorsConnectionWhere {
+  PersonOne: MovieActorsPersonOneConnectionWhere
+  PersonTwo: MovieActorsPersonTwoConnectionWhere
+}
+
+input MovieActorsPersonOneConnectionWhere {
+  AND: [MovieActorsPersonOneConnectionWhere!]
+  NOT: MovieActorsPersonOneConnectionWhere
+  OR: [MovieActorsPersonOneConnectionWhere!]
+  node: PersonOneWhere
+}
+
+input MovieActorsPersonTwoConnectionWhere {
+  AND: [MovieActorsPersonTwoConnectionWhere!]
+  NOT: MovieActorsPersonTwoConnectionWhere
+  OR: [MovieActorsPersonTwoConnectionWhere!]
+  node: PersonTwoWhere
+}
+
+type MovieActorsRelationship {
+  cursor: String!
+  node: Person!
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MovieSort!]
+}
+
+type MovieProducersConnection {
+  edges: [MovieProducersRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input MovieProducersConnectionWhere {
+  PersonOne: MovieProducersPersonOneConnectionWhere
+  PersonTwo: MovieProducersPersonTwoConnectionWhere
+}
+
+input MovieProducersPersonOneConnectionWhere {
+  AND: [MovieProducersPersonOneConnectionWhere!]
+  NOT: MovieProducersPersonOneConnectionWhere
+  OR: [MovieProducersPersonOneConnectionWhere!]
+  node: PersonOneWhere
+}
+
+input MovieProducersPersonTwoConnectionWhere {
+  AND: [MovieProducersPersonTwoConnectionWhere!]
+  NOT: MovieProducersPersonTwoConnectionWhere
+  OR: [MovieProducersPersonTwoConnectionWhere!]
+  node: PersonTwoWhere
+}
+
+type MovieProducersRelationship {
+  cursor: String!
+  node: Person!
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
+"""
+input MovieSort {
+  id: SortDirection
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  """
+  Return Movies where all of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_ALL: MovieActorsConnectionWhere
+  """
+  Return Movies where none of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_NONE: MovieActorsConnectionWhere
+  """
+  Return Movies where one of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SINGLE: MovieActorsConnectionWhere
+  """
+  Return Movies where some of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SOME: MovieActorsConnectionWhere
+  """Return Movies where all of the related People match this filter"""
+  actors_ALL: PersonWhere
+  """Return Movies where none of the related People match this filter"""
+  actors_NONE: PersonWhere
+  """Return Movies where one of the related People match this filter"""
+  actors_SINGLE: PersonWhere
+  """Return Movies where some of the related People match this filter"""
+  actors_SOME: PersonWhere
+  id: ID
+  id_CONTAINS: ID
+  id_ENDS_WITH: ID
+  id_IN: [ID]
+  id_STARTS_WITH: ID
+  """
+  Return Movies where all of the related MovieProducersConnections match this filter
+  """
+  producersConnection_ALL: MovieProducersConnectionWhere
+  """
+  Return Movies where none of the related MovieProducersConnections match this filter
+  """
+  producersConnection_NONE: MovieProducersConnectionWhere
+  """
+  Return Movies where one of the related MovieProducersConnections match this filter
+  """
+  producersConnection_SINGLE: MovieProducersConnectionWhere
+  """
+  Return Movies where some of the related MovieProducersConnections match this filter
+  """
+  producersConnection_SOME: MovieProducersConnectionWhere
+  """Return Movies where all of the related People match this filter"""
+  producers_ALL: PersonWhere
+  """Return Movies where none of the related People match this filter"""
+  producers_NONE: PersonWhere
+  """Return Movies where one of the related People match this filter"""
+  producers_SINGLE: PersonWhere
+  """Return Movies where some of the related People match this filter"""
+  producers_SOME: PersonWhere
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+union Person = PersonOne | PersonTwo
+
+type PersonOne {
+  name: String
+}
+
+type PersonOneEdge {
+  cursor: String!
+  node: PersonOne!
+}
+
+input PersonOneOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more PersonOneSort objects to sort PersonOnes by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [PersonOneSort!]
+}
+
+"""
+Fields to sort PersonOnes by. The order in which sorts are applied is not guaranteed when specifying many fields in one PersonOneSort object.
+"""
+input PersonOneSort {
+  name: SortDirection
+}
+
+input PersonOneWhere {
+  AND: [PersonOneWhere!]
+  NOT: PersonOneWhere
+  OR: [PersonOneWhere!]
+  name: String
+  name_CONTAINS: String
+  name_ENDS_WITH: String
+  name_IN: [String]
+  name_STARTS_WITH: String
+}
+
+type PersonOnesConnection {
+  edges: [PersonOneEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+type PersonTwo {
+  nameTwo: String
+}
+
+type PersonTwoEdge {
+  cursor: String!
+  node: PersonTwo!
+}
+
+input PersonTwoOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more PersonTwoSort objects to sort PersonTwos by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [PersonTwoSort!]
+}
+
+"""
+Fields to sort PersonTwos by. The order in which sorts are applied is not guaranteed when specifying many fields in one PersonTwoSort object.
+"""
+input PersonTwoSort {
+  nameTwo: SortDirection
+}
+
+input PersonTwoWhere {
+  AND: [PersonTwoWhere!]
+  NOT: PersonTwoWhere
+  OR: [PersonTwoWhere!]
+  nameTwo: String
+  nameTwo_CONTAINS: String
+  nameTwo_ENDS_WITH: String
+  nameTwo_IN: [String]
+  nameTwo_STARTS_WITH: String
+}
+
+type PersonTwosConnection {
+  edges: [PersonTwoEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input PersonWhere {
+  PersonOne: PersonOneWhere
+  PersonTwo: PersonTwoWhere
+}
+
+type Query {
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+  people(options: QueryOptions, where: PersonWhere): [Person!]!
+  personOnes(options: PersonOneOptions, where: PersonOneWhere): [PersonOne!]!
+  personOnesConnection(after: String, first: Int, sort: [PersonOneSort], where: PersonOneWhere): PersonOnesConnection!
+  personTwos(options: PersonTwoOptions, where: PersonTwoWhere): [PersonTwo!]!
+  personTwosConnection(after: String, first: Int, sort: [PersonTwoSort], where: PersonTwoWhere): PersonTwosConnection!
+}
+
+"""Input type for options that can be specified on a query operation."""
+input QueryOptions {
+  limit: Int
+  offset: Int
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
+
+== Related to an interface type
+
+=== Should not generate UpdateFieldInput input with no nested operations
+
+.Schema
+[source,graphql,schema=true]
+----
+interface Person {
+  name: String
+}
+
+type PersonOne implements Person {
+  name: String
+  someExtraProp: [Int!]!
+}
+
+type PersonTwo implements Person {
+  name: String
+}
+
+type Movie {
+  id: ID
+  actors: [Person!]! @relationship(type: "ACTED_IN", direction: IN, nestedOperations: [])
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+type Movie {
+  actors(directed: Boolean = true, options: PersonOptions, where: PersonWhere): [Person!]!
+  actorsConnection(after: String, directed: Boolean = true, first: Int, sort: [MovieActorsConnectionSort!], where: MovieActorsConnectionWhere): MovieActorsConnection!
+  id: ID
+}
+
+type MovieActorsConnection {
+  edges: [MovieActorsRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input MovieActorsConnectionSort {
+  node: PersonSort
+}
+
+input MovieActorsConnectionWhere {
+  AND: [MovieActorsConnectionWhere!]
+  NOT: MovieActorsConnectionWhere
+  OR: [MovieActorsConnectionWhere!]
+  node: PersonWhere
+}
+
+type MovieActorsRelationship {
+  cursor: String!
+  node: Person!
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MovieSort!]
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
+"""
+input MovieSort {
+  id: SortDirection
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  """
+  Return Movies where all of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_ALL: MovieActorsConnectionWhere
+  """
+  Return Movies where none of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_NONE: MovieActorsConnectionWhere
+  """
+  Return Movies where one of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SINGLE: MovieActorsConnectionWhere
+  """
+  Return Movies where some of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SOME: MovieActorsConnectionWhere
+  """Return Movies where all of the related People match this filter"""
+  actors_ALL: PersonWhere
+  """Return Movies where none of the related People match this filter"""
+  actors_NONE: PersonWhere
+  """Return Movies where one of the related People match this filter"""
+  actors_SINGLE: PersonWhere
+  """Return Movies where some of the related People match this filter"""
+  actors_SOME: PersonWhere
+  id: ID
+  id_CONTAINS: ID
+  id_ENDS_WITH: ID
+  id_IN: [ID]
+  id_STARTS_WITH: ID
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+type PeopleConnection {
+  edges: [PersonEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+interface Person {
+  name: String
+}
+
+type PersonEdge {
+  cursor: String!
+  node: Person!
+}
+
+enum PersonImplementation {
+  PersonOne
+  PersonTwo
+}
+
+type PersonOne implements Person {
+  name: String
+  someExtraProp: [Int!]!
+}
+
+type PersonOneEdge {
+  cursor: String!
+  node: PersonOne!
+}
+
+input PersonOneOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more PersonOneSort objects to sort PersonOnes by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [PersonOneSort!]
+}
+
+"""
+Fields to sort PersonOnes by. The order in which sorts are applied is not guaranteed when specifying many fields in one PersonOneSort object.
+"""
+input PersonOneSort {
+  name: SortDirection
+}
+
+input PersonOneWhere {
+  AND: [PersonOneWhere!]
+  NOT: PersonOneWhere
+  OR: [PersonOneWhere!]
+  name: String
+  name_CONTAINS: String
+  name_ENDS_WITH: String
+  name_IN: [String]
+  name_STARTS_WITH: String
+  someExtraProp: [Int!]
+  someExtraProp_INCLUDES: Int
+}
+
+type PersonOnesConnection {
+  edges: [PersonOneEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input PersonOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more PersonSort objects to sort People by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [PersonSort]
+}
+
+"""
+Fields to sort People by. The order in which sorts are applied is not guaranteed when specifying many fields in one PersonSort object.
+"""
+input PersonSort {
+  name: SortDirection
+}
+
+type PersonTwo implements Person {
+  name: String
+}
+
+type PersonTwoEdge {
+  cursor: String!
+  node: PersonTwo!
+}
+
+input PersonTwoOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more PersonTwoSort objects to sort PersonTwos by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [PersonTwoSort!]
+}
+
+"""
+Fields to sort PersonTwos by. The order in which sorts are applied is not guaranteed when specifying many fields in one PersonTwoSort object.
+"""
+input PersonTwoSort {
+  name: SortDirection
+}
+
+input PersonTwoWhere {
+  AND: [PersonTwoWhere!]
+  NOT: PersonTwoWhere
+  OR: [PersonTwoWhere!]
+  name: String
+  name_CONTAINS: String
+  name_ENDS_WITH: String
+  name_IN: [String]
+  name_STARTS_WITH: String
+}
+
+type PersonTwosConnection {
+  edges: [PersonTwoEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input PersonWhere {
+  AND: [PersonWhere!]
+  NOT: PersonWhere
+  OR: [PersonWhere!]
+  name: String
+  name_CONTAINS: String
+  name_ENDS_WITH: String
+  name_IN: [String]
+  name_STARTS_WITH: String
+  typename_IN: [PersonImplementation!]
+}
+
+type Query {
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+  people(options: PersonOptions, where: PersonWhere): [Person!]!
+  peopleConnection(after: String, first: Int, sort: [PersonSort], where: PersonWhere): PeopleConnection!
+  personOnes(options: PersonOneOptions, where: PersonOneWhere): [PersonOne!]!
+  personOnesConnection(after: String, first: Int, sort: [PersonOneSort], where: PersonOneWhere): PersonOnesConnection!
+  personTwos(options: PersonTwoOptions, where: PersonTwoWhere): [PersonTwo!]!
+  personTwosConnection(after: String, first: Int, sort: [PersonTwoSort], where: PersonTwoWhere): PersonTwosConnection!
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
+
+=== Single relationship with nested operation CREATE specified
+
+.Schema
+[source,graphql,schema=true]
+----
+interface Person {
+  name: String
+}
+
+type PersonOne implements Person {
+  name: String
+  someExtraProp: [Int!]!
+}
+
+type PersonTwo implements Person {
+  name: String
+}
+
+type Movie {
+  id: ID
+  actors: [Person!]! @relationship(type: "ACTED_IN", direction: IN, nestedOperations: [CREATE])
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+type Movie {
+  actors(directed: Boolean = true, options: PersonOptions, where: PersonWhere): [Person!]!
+  actorsConnection(after: String, directed: Boolean = true, first: Int, sort: [MovieActorsConnectionSort!], where: MovieActorsConnectionWhere): MovieActorsConnection!
+  id: ID
+}
+
+type MovieActorsConnection {
+  edges: [MovieActorsRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input MovieActorsConnectionSort {
+  node: PersonSort
+}
+
+input MovieActorsConnectionWhere {
+  AND: [MovieActorsConnectionWhere!]
+  NOT: MovieActorsConnectionWhere
+  OR: [MovieActorsConnectionWhere!]
+  node: PersonWhere
+}
+
+type MovieActorsRelationship {
+  cursor: String!
+  node: Person!
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MovieSort!]
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
+"""
+input MovieSort {
+  id: SortDirection
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  """
+  Return Movies where all of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_ALL: MovieActorsConnectionWhere
+  """
+  Return Movies where none of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_NONE: MovieActorsConnectionWhere
+  """
+  Return Movies where one of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SINGLE: MovieActorsConnectionWhere
+  """
+  Return Movies where some of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SOME: MovieActorsConnectionWhere
+  """Return Movies where all of the related People match this filter"""
+  actors_ALL: PersonWhere
+  """Return Movies where none of the related People match this filter"""
+  actors_NONE: PersonWhere
+  """Return Movies where one of the related People match this filter"""
+  actors_SINGLE: PersonWhere
+  """Return Movies where some of the related People match this filter"""
+  actors_SOME: PersonWhere
+  id: ID
+  id_CONTAINS: ID
+  id_ENDS_WITH: ID
+  id_IN: [ID]
+  id_STARTS_WITH: ID
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+type PeopleConnection {
+  edges: [PersonEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+interface Person {
+  name: String
+}
+
+type PersonEdge {
+  cursor: String!
+  node: Person!
+}
+
+enum PersonImplementation {
+  PersonOne
+  PersonTwo
+}
+
+type PersonOne implements Person {
+  name: String
+  someExtraProp: [Int!]!
+}
+
+type PersonOneEdge {
+  cursor: String!
+  node: PersonOne!
+}
+
+input PersonOneOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more PersonOneSort objects to sort PersonOnes by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [PersonOneSort!]
+}
+
+"""
+Fields to sort PersonOnes by. The order in which sorts are applied is not guaranteed when specifying many fields in one PersonOneSort object.
+"""
+input PersonOneSort {
+  name: SortDirection
+}
+
+input PersonOneWhere {
+  AND: [PersonOneWhere!]
+  NOT: PersonOneWhere
+  OR: [PersonOneWhere!]
+  name: String
+  name_CONTAINS: String
+  name_ENDS_WITH: String
+  name_IN: [String]
+  name_STARTS_WITH: String
+  someExtraProp: [Int!]
+  someExtraProp_INCLUDES: Int
+}
+
+type PersonOnesConnection {
+  edges: [PersonOneEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input PersonOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more PersonSort objects to sort People by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [PersonSort]
+}
+
+"""
+Fields to sort People by. The order in which sorts are applied is not guaranteed when specifying many fields in one PersonSort object.
+"""
+input PersonSort {
+  name: SortDirection
+}
+
+type PersonTwo implements Person {
+  name: String
+}
+
+type PersonTwoEdge {
+  cursor: String!
+  node: PersonTwo!
+}
+
+input PersonTwoOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more PersonTwoSort objects to sort PersonTwos by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [PersonTwoSort!]
+}
+
+"""
+Fields to sort PersonTwos by. The order in which sorts are applied is not guaranteed when specifying many fields in one PersonTwoSort object.
+"""
+input PersonTwoSort {
+  name: SortDirection
+}
+
+input PersonTwoWhere {
+  AND: [PersonTwoWhere!]
+  NOT: PersonTwoWhere
+  OR: [PersonTwoWhere!]
+  name: String
+  name_CONTAINS: String
+  name_ENDS_WITH: String
+  name_IN: [String]
+  name_STARTS_WITH: String
+}
+
+type PersonTwosConnection {
+  edges: [PersonTwoEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input PersonWhere {
+  AND: [PersonWhere!]
+  NOT: PersonWhere
+  OR: [PersonWhere!]
+  name: String
+  name_CONTAINS: String
+  name_ENDS_WITH: String
+  name_IN: [String]
+  name_STARTS_WITH: String
+  typename_IN: [PersonImplementation!]
+}
+
+type Query {
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+  people(options: PersonOptions, where: PersonWhere): [Person!]!
+  peopleConnection(after: String, first: Int, sort: [PersonSort], where: PersonWhere): PeopleConnection!
+  personOnes(options: PersonOneOptions, where: PersonOneWhere): [PersonOne!]!
+  personOnesConnection(after: String, first: Int, sort: [PersonOneSort], where: PersonOneWhere): PersonOnesConnection!
+  personTwos(options: PersonTwoOptions, where: PersonTwoWhere): [PersonTwo!]!
+  personTwosConnection(after: String, first: Int, sort: [PersonTwoSort], where: PersonTwoWhere): PersonTwosConnection!
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
+
+=== Single relationship with nested operation CONNECT specified
+
+.Schema
+[source,graphql,schema=true]
+----
+interface Person {
+  name: String
+}
+
+type PersonOne implements Person {
+  name: String
+  someExtraProp: [Int!]!
+}
+
+type PersonTwo implements Person {
+  name: String
+}
+
+type Movie {
+  id: ID
+  actors: [Person!]! @relationship(type: "ACTED_IN", direction: IN, nestedOperations: [CONNECT])
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+type Movie {
+  actors(directed: Boolean = true, options: PersonOptions, where: PersonWhere): [Person!]!
+  actorsConnection(after: String, directed: Boolean = true, first: Int, sort: [MovieActorsConnectionSort!], where: MovieActorsConnectionWhere): MovieActorsConnection!
+  id: ID
+}
+
+type MovieActorsConnection {
+  edges: [MovieActorsRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input MovieActorsConnectionSort {
+  node: PersonSort
+}
+
+input MovieActorsConnectionWhere {
+  AND: [MovieActorsConnectionWhere!]
+  NOT: MovieActorsConnectionWhere
+  OR: [MovieActorsConnectionWhere!]
+  node: PersonWhere
+}
+
+type MovieActorsRelationship {
+  cursor: String!
+  node: Person!
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MovieSort!]
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
+"""
+input MovieSort {
+  id: SortDirection
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  """
+  Return Movies where all of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_ALL: MovieActorsConnectionWhere
+  """
+  Return Movies where none of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_NONE: MovieActorsConnectionWhere
+  """
+  Return Movies where one of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SINGLE: MovieActorsConnectionWhere
+  """
+  Return Movies where some of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SOME: MovieActorsConnectionWhere
+  """Return Movies where all of the related People match this filter"""
+  actors_ALL: PersonWhere
+  """Return Movies where none of the related People match this filter"""
+  actors_NONE: PersonWhere
+  """Return Movies where one of the related People match this filter"""
+  actors_SINGLE: PersonWhere
+  """Return Movies where some of the related People match this filter"""
+  actors_SOME: PersonWhere
+  id: ID
+  id_CONTAINS: ID
+  id_ENDS_WITH: ID
+  id_IN: [ID]
+  id_STARTS_WITH: ID
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+type PeopleConnection {
+  edges: [PersonEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+interface Person {
+  name: String
+}
+
+type PersonEdge {
+  cursor: String!
+  node: Person!
+}
+
+enum PersonImplementation {
+  PersonOne
+  PersonTwo
+}
+
+type PersonOne implements Person {
+  name: String
+  someExtraProp: [Int!]!
+}
+
+type PersonOneEdge {
+  cursor: String!
+  node: PersonOne!
+}
+
+input PersonOneOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more PersonOneSort objects to sort PersonOnes by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [PersonOneSort!]
+}
+
+"""
+Fields to sort PersonOnes by. The order in which sorts are applied is not guaranteed when specifying many fields in one PersonOneSort object.
+"""
+input PersonOneSort {
+  name: SortDirection
+}
+
+input PersonOneWhere {
+  AND: [PersonOneWhere!]
+  NOT: PersonOneWhere
+  OR: [PersonOneWhere!]
+  name: String
+  name_CONTAINS: String
+  name_ENDS_WITH: String
+  name_IN: [String]
+  name_STARTS_WITH: String
+  someExtraProp: [Int!]
+  someExtraProp_INCLUDES: Int
+}
+
+type PersonOnesConnection {
+  edges: [PersonOneEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input PersonOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more PersonSort objects to sort People by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [PersonSort]
+}
+
+"""
+Fields to sort People by. The order in which sorts are applied is not guaranteed when specifying many fields in one PersonSort object.
+"""
+input PersonSort {
+  name: SortDirection
+}
+
+type PersonTwo implements Person {
+  name: String
+}
+
+type PersonTwoEdge {
+  cursor: String!
+  node: PersonTwo!
+}
+
+input PersonTwoOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more PersonTwoSort objects to sort PersonTwos by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [PersonTwoSort!]
+}
+
+"""
+Fields to sort PersonTwos by. The order in which sorts are applied is not guaranteed when specifying many fields in one PersonTwoSort object.
+"""
+input PersonTwoSort {
+  name: SortDirection
+}
+
+input PersonTwoWhere {
+  AND: [PersonTwoWhere!]
+  NOT: PersonTwoWhere
+  OR: [PersonTwoWhere!]
+  name: String
+  name_CONTAINS: String
+  name_ENDS_WITH: String
+  name_IN: [String]
+  name_STARTS_WITH: String
+}
+
+type PersonTwosConnection {
+  edges: [PersonTwoEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input PersonWhere {
+  AND: [PersonWhere!]
+  NOT: PersonWhere
+  OR: [PersonWhere!]
+  name: String
+  name_CONTAINS: String
+  name_ENDS_WITH: String
+  name_IN: [String]
+  name_STARTS_WITH: String
+  typename_IN: [PersonImplementation!]
+}
+
+type Query {
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+  people(options: PersonOptions, where: PersonWhere): [Person!]!
+  peopleConnection(after: String, first: Int, sort: [PersonSort], where: PersonWhere): PeopleConnection!
+  personOnes(options: PersonOneOptions, where: PersonOneWhere): [PersonOne!]!
+  personOnesConnection(after: String, first: Int, sort: [PersonOneSort], where: PersonOneWhere): PersonOnesConnection!
+  personTwos(options: PersonTwoOptions, where: PersonTwoWhere): [PersonTwo!]!
+  personTwosConnection(after: String, first: Int, sort: [PersonTwoSort], where: PersonTwoWhere): PersonTwosConnection!
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
+
+=== Single relationship with nested operation UPDATE specified
+
+.Schema
+[source,graphql,schema=true]
+----
+interface Person {
+  name: String
+}
+
+type PersonOne implements Person {
+  name: String
+  someExtraProp: [Int!]!
+}
+
+type PersonTwo implements Person {
+  name: String
+}
+
+type Movie {
+  id: ID
+  actors: [Person!]! @relationship(type: "ACTED_IN", direction: IN, nestedOperations: [UPDATE])
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+type Movie {
+  actors(directed: Boolean = true, options: PersonOptions, where: PersonWhere): [Person!]!
+  actorsConnection(after: String, directed: Boolean = true, first: Int, sort: [MovieActorsConnectionSort!], where: MovieActorsConnectionWhere): MovieActorsConnection!
+  id: ID
+}
+
+type MovieActorsConnection {
+  edges: [MovieActorsRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input MovieActorsConnectionSort {
+  node: PersonSort
+}
+
+input MovieActorsConnectionWhere {
+  AND: [MovieActorsConnectionWhere!]
+  NOT: MovieActorsConnectionWhere
+  OR: [MovieActorsConnectionWhere!]
+  node: PersonWhere
+}
+
+type MovieActorsRelationship {
+  cursor: String!
+  node: Person!
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MovieSort!]
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
+"""
+input MovieSort {
+  id: SortDirection
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  """
+  Return Movies where all of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_ALL: MovieActorsConnectionWhere
+  """
+  Return Movies where none of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_NONE: MovieActorsConnectionWhere
+  """
+  Return Movies where one of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SINGLE: MovieActorsConnectionWhere
+  """
+  Return Movies where some of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SOME: MovieActorsConnectionWhere
+  """Return Movies where all of the related People match this filter"""
+  actors_ALL: PersonWhere
+  """Return Movies where none of the related People match this filter"""
+  actors_NONE: PersonWhere
+  """Return Movies where one of the related People match this filter"""
+  actors_SINGLE: PersonWhere
+  """Return Movies where some of the related People match this filter"""
+  actors_SOME: PersonWhere
+  id: ID
+  id_CONTAINS: ID
+  id_ENDS_WITH: ID
+  id_IN: [ID]
+  id_STARTS_WITH: ID
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+type PeopleConnection {
+  edges: [PersonEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+interface Person {
+  name: String
+}
+
+type PersonEdge {
+  cursor: String!
+  node: Person!
+}
+
+enum PersonImplementation {
+  PersonOne
+  PersonTwo
+}
+
+type PersonOne implements Person {
+  name: String
+  someExtraProp: [Int!]!
+}
+
+type PersonOneEdge {
+  cursor: String!
+  node: PersonOne!
+}
+
+input PersonOneOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more PersonOneSort objects to sort PersonOnes by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [PersonOneSort!]
+}
+
+"""
+Fields to sort PersonOnes by. The order in which sorts are applied is not guaranteed when specifying many fields in one PersonOneSort object.
+"""
+input PersonOneSort {
+  name: SortDirection
+}
+
+input PersonOneWhere {
+  AND: [PersonOneWhere!]
+  NOT: PersonOneWhere
+  OR: [PersonOneWhere!]
+  name: String
+  name_CONTAINS: String
+  name_ENDS_WITH: String
+  name_IN: [String]
+  name_STARTS_WITH: String
+  someExtraProp: [Int!]
+  someExtraProp_INCLUDES: Int
+}
+
+type PersonOnesConnection {
+  edges: [PersonOneEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input PersonOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more PersonSort objects to sort People by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [PersonSort]
+}
+
+"""
+Fields to sort People by. The order in which sorts are applied is not guaranteed when specifying many fields in one PersonSort object.
+"""
+input PersonSort {
+  name: SortDirection
+}
+
+type PersonTwo implements Person {
+  name: String
+}
+
+type PersonTwoEdge {
+  cursor: String!
+  node: PersonTwo!
+}
+
+input PersonTwoOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more PersonTwoSort objects to sort PersonTwos by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [PersonTwoSort!]
+}
+
+"""
+Fields to sort PersonTwos by. The order in which sorts are applied is not guaranteed when specifying many fields in one PersonTwoSort object.
+"""
+input PersonTwoSort {
+  name: SortDirection
+}
+
+input PersonTwoWhere {
+  AND: [PersonTwoWhere!]
+  NOT: PersonTwoWhere
+  OR: [PersonTwoWhere!]
+  name: String
+  name_CONTAINS: String
+  name_ENDS_WITH: String
+  name_IN: [String]
+  name_STARTS_WITH: String
+}
+
+type PersonTwosConnection {
+  edges: [PersonTwoEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input PersonWhere {
+  AND: [PersonWhere!]
+  NOT: PersonWhere
+  OR: [PersonWhere!]
+  name: String
+  name_CONTAINS: String
+  name_ENDS_WITH: String
+  name_IN: [String]
+  name_STARTS_WITH: String
+  typename_IN: [PersonImplementation!]
+}
+
+type Query {
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+  people(options: PersonOptions, where: PersonWhere): [Person!]!
+  peopleConnection(after: String, first: Int, sort: [PersonSort], where: PersonWhere): PeopleConnection!
+  personOnes(options: PersonOneOptions, where: PersonOneWhere): [PersonOne!]!
+  personOnesConnection(after: String, first: Int, sort: [PersonOneSort], where: PersonOneWhere): PersonOnesConnection!
+  personTwos(options: PersonTwoOptions, where: PersonTwoWhere): [PersonTwo!]!
+  personTwosConnection(after: String, first: Int, sort: [PersonTwoSort], where: PersonTwoWhere): PersonTwosConnection!
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
+
+=== Single relationship with nested operation DELETE specified
+
+.Schema
+[source,graphql,schema=true]
+----
+interface Person {
+  name: String
+}
+
+type PersonOne implements Person {
+  name: String
+  someExtraProp: [Int!]!
+}
+
+type PersonTwo implements Person {
+  name: String
+}
+
+type Movie {
+  id: ID
+  actors: [Person!]! @relationship(type: "ACTED_IN", direction: IN, nestedOperations: [DELETE])
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+type Movie {
+  actors(directed: Boolean = true, options: PersonOptions, where: PersonWhere): [Person!]!
+  actorsConnection(after: String, directed: Boolean = true, first: Int, sort: [MovieActorsConnectionSort!], where: MovieActorsConnectionWhere): MovieActorsConnection!
+  id: ID
+}
+
+type MovieActorsConnection {
+  edges: [MovieActorsRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input MovieActorsConnectionSort {
+  node: PersonSort
+}
+
+input MovieActorsConnectionWhere {
+  AND: [MovieActorsConnectionWhere!]
+  NOT: MovieActorsConnectionWhere
+  OR: [MovieActorsConnectionWhere!]
+  node: PersonWhere
+}
+
+type MovieActorsRelationship {
+  cursor: String!
+  node: Person!
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MovieSort!]
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
+"""
+input MovieSort {
+  id: SortDirection
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  """
+  Return Movies where all of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_ALL: MovieActorsConnectionWhere
+  """
+  Return Movies where none of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_NONE: MovieActorsConnectionWhere
+  """
+  Return Movies where one of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SINGLE: MovieActorsConnectionWhere
+  """
+  Return Movies where some of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SOME: MovieActorsConnectionWhere
+  """Return Movies where all of the related People match this filter"""
+  actors_ALL: PersonWhere
+  """Return Movies where none of the related People match this filter"""
+  actors_NONE: PersonWhere
+  """Return Movies where one of the related People match this filter"""
+  actors_SINGLE: PersonWhere
+  """Return Movies where some of the related People match this filter"""
+  actors_SOME: PersonWhere
+  id: ID
+  id_CONTAINS: ID
+  id_ENDS_WITH: ID
+  id_IN: [ID]
+  id_STARTS_WITH: ID
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+type PeopleConnection {
+  edges: [PersonEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+interface Person {
+  name: String
+}
+
+type PersonEdge {
+  cursor: String!
+  node: Person!
+}
+
+enum PersonImplementation {
+  PersonOne
+  PersonTwo
+}
+
+type PersonOne implements Person {
+  name: String
+  someExtraProp: [Int!]!
+}
+
+type PersonOneEdge {
+  cursor: String!
+  node: PersonOne!
+}
+
+input PersonOneOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more PersonOneSort objects to sort PersonOnes by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [PersonOneSort!]
+}
+
+"""
+Fields to sort PersonOnes by. The order in which sorts are applied is not guaranteed when specifying many fields in one PersonOneSort object.
+"""
+input PersonOneSort {
+  name: SortDirection
+}
+
+input PersonOneWhere {
+  AND: [PersonOneWhere!]
+  NOT: PersonOneWhere
+  OR: [PersonOneWhere!]
+  name: String
+  name_CONTAINS: String
+  name_ENDS_WITH: String
+  name_IN: [String]
+  name_STARTS_WITH: String
+  someExtraProp: [Int!]
+  someExtraProp_INCLUDES: Int
+}
+
+type PersonOnesConnection {
+  edges: [PersonOneEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input PersonOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more PersonSort objects to sort People by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [PersonSort]
+}
+
+"""
+Fields to sort People by. The order in which sorts are applied is not guaranteed when specifying many fields in one PersonSort object.
+"""
+input PersonSort {
+  name: SortDirection
+}
+
+type PersonTwo implements Person {
+  name: String
+}
+
+type PersonTwoEdge {
+  cursor: String!
+  node: PersonTwo!
+}
+
+input PersonTwoOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more PersonTwoSort objects to sort PersonTwos by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [PersonTwoSort!]
+}
+
+"""
+Fields to sort PersonTwos by. The order in which sorts are applied is not guaranteed when specifying many fields in one PersonTwoSort object.
+"""
+input PersonTwoSort {
+  name: SortDirection
+}
+
+input PersonTwoWhere {
+  AND: [PersonTwoWhere!]
+  NOT: PersonTwoWhere
+  OR: [PersonTwoWhere!]
+  name: String
+  name_CONTAINS: String
+  name_ENDS_WITH: String
+  name_IN: [String]
+  name_STARTS_WITH: String
+}
+
+type PersonTwosConnection {
+  edges: [PersonTwoEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input PersonWhere {
+  AND: [PersonWhere!]
+  NOT: PersonWhere
+  OR: [PersonWhere!]
+  name: String
+  name_CONTAINS: String
+  name_ENDS_WITH: String
+  name_IN: [String]
+  name_STARTS_WITH: String
+  typename_IN: [PersonImplementation!]
+}
+
+type Query {
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+  people(options: PersonOptions, where: PersonWhere): [Person!]!
+  peopleConnection(after: String, first: Int, sort: [PersonSort], where: PersonWhere): PeopleConnection!
+  personOnes(options: PersonOneOptions, where: PersonOneWhere): [PersonOne!]!
+  personOnesConnection(after: String, first: Int, sort: [PersonOneSort], where: PersonOneWhere): PersonOnesConnection!
+  personTwos(options: PersonTwoOptions, where: PersonTwoWhere): [PersonTwo!]!
+  personTwosConnection(after: String, first: Int, sort: [PersonTwoSort], where: PersonTwoWhere): PersonTwosConnection!
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
+
+=== Single relationship with nested operation DISCONNECT specified
+
+.Schema
+[source,graphql,schema=true]
+----
+interface Person {
+  name: String
+}
+
+type PersonOne implements Person {
+  name: String
+  someExtraProp: [Int!]!
+}
+
+type PersonTwo implements Person {
+  name: String
+}
+
+type Movie {
+  id: ID
+  actors: [Person!]! @relationship(type: "ACTED_IN", direction: IN, nestedOperations: [DISCONNECT])
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+type Movie {
+  actors(directed: Boolean = true, options: PersonOptions, where: PersonWhere): [Person!]!
+  actorsConnection(after: String, directed: Boolean = true, first: Int, sort: [MovieActorsConnectionSort!], where: MovieActorsConnectionWhere): MovieActorsConnection!
+  id: ID
+}
+
+type MovieActorsConnection {
+  edges: [MovieActorsRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input MovieActorsConnectionSort {
+  node: PersonSort
+}
+
+input MovieActorsConnectionWhere {
+  AND: [MovieActorsConnectionWhere!]
+  NOT: MovieActorsConnectionWhere
+  OR: [MovieActorsConnectionWhere!]
+  node: PersonWhere
+}
+
+type MovieActorsRelationship {
+  cursor: String!
+  node: Person!
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MovieSort!]
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
+"""
+input MovieSort {
+  id: SortDirection
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  """
+  Return Movies where all of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_ALL: MovieActorsConnectionWhere
+  """
+  Return Movies where none of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_NONE: MovieActorsConnectionWhere
+  """
+  Return Movies where one of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SINGLE: MovieActorsConnectionWhere
+  """
+  Return Movies where some of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SOME: MovieActorsConnectionWhere
+  """Return Movies where all of the related People match this filter"""
+  actors_ALL: PersonWhere
+  """Return Movies where none of the related People match this filter"""
+  actors_NONE: PersonWhere
+  """Return Movies where one of the related People match this filter"""
+  actors_SINGLE: PersonWhere
+  """Return Movies where some of the related People match this filter"""
+  actors_SOME: PersonWhere
+  id: ID
+  id_CONTAINS: ID
+  id_ENDS_WITH: ID
+  id_IN: [ID]
+  id_STARTS_WITH: ID
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+type PeopleConnection {
+  edges: [PersonEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+interface Person {
+  name: String
+}
+
+type PersonEdge {
+  cursor: String!
+  node: Person!
+}
+
+enum PersonImplementation {
+  PersonOne
+  PersonTwo
+}
+
+type PersonOne implements Person {
+  name: String
+  someExtraProp: [Int!]!
+}
+
+type PersonOneEdge {
+  cursor: String!
+  node: PersonOne!
+}
+
+input PersonOneOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more PersonOneSort objects to sort PersonOnes by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [PersonOneSort!]
+}
+
+"""
+Fields to sort PersonOnes by. The order in which sorts are applied is not guaranteed when specifying many fields in one PersonOneSort object.
+"""
+input PersonOneSort {
+  name: SortDirection
+}
+
+input PersonOneWhere {
+  AND: [PersonOneWhere!]
+  NOT: PersonOneWhere
+  OR: [PersonOneWhere!]
+  name: String
+  name_CONTAINS: String
+  name_ENDS_WITH: String
+  name_IN: [String]
+  name_STARTS_WITH: String
+  someExtraProp: [Int!]
+  someExtraProp_INCLUDES: Int
+}
+
+type PersonOnesConnection {
+  edges: [PersonOneEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input PersonOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more PersonSort objects to sort People by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [PersonSort]
+}
+
+"""
+Fields to sort People by. The order in which sorts are applied is not guaranteed when specifying many fields in one PersonSort object.
+"""
+input PersonSort {
+  name: SortDirection
+}
+
+type PersonTwo implements Person {
+  name: String
+}
+
+type PersonTwoEdge {
+  cursor: String!
+  node: PersonTwo!
+}
+
+input PersonTwoOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more PersonTwoSort objects to sort PersonTwos by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [PersonTwoSort!]
+}
+
+"""
+Fields to sort PersonTwos by. The order in which sorts are applied is not guaranteed when specifying many fields in one PersonTwoSort object.
+"""
+input PersonTwoSort {
+  name: SortDirection
+}
+
+input PersonTwoWhere {
+  AND: [PersonTwoWhere!]
+  NOT: PersonTwoWhere
+  OR: [PersonTwoWhere!]
+  name: String
+  name_CONTAINS: String
+  name_ENDS_WITH: String
+  name_IN: [String]
+  name_STARTS_WITH: String
+}
+
+type PersonTwosConnection {
+  edges: [PersonTwoEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input PersonWhere {
+  AND: [PersonWhere!]
+  NOT: PersonWhere
+  OR: [PersonWhere!]
+  name: String
+  name_CONTAINS: String
+  name_ENDS_WITH: String
+  name_IN: [String]
+  name_STARTS_WITH: String
+  typename_IN: [PersonImplementation!]
+}
+
+type Query {
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+  people(options: PersonOptions, where: PersonWhere): [Person!]!
+  peopleConnection(after: String, first: Int, sort: [PersonSort], where: PersonWhere): PeopleConnection!
+  personOnes(options: PersonOneOptions, where: PersonOneWhere): [PersonOne!]!
+  personOnesConnection(after: String, first: Int, sort: [PersonOneSort], where: PersonOneWhere): PersonOnesConnection!
+  personTwos(options: PersonTwoOptions, where: PersonTwoWhere): [PersonTwo!]!
+  personTwosConnection(after: String, first: Int, sort: [PersonTwoSort], where: PersonTwoWhere): PersonTwosConnection!
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
+
+=== Two relationships with nested operations specified on one
+
+.Schema
+[source,graphql,schema=true]
+----
+interface Person {
+  name: String
+}
+
+type PersonOne implements Person {
+  name: String
+  someExtraProp: [Int!]!
+}
+
+type PersonTwo implements Person {
+  name: String
+}
+
+type Movie {
+  id: ID
+  actors: [Person!]! @relationship(type: "ACTED_IN", direction: IN)
+  producers: [Person!]! @relationship(type: "PRODUCED", direction: IN, nestedOperations: [DISCONNECT])
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+type Movie {
+  actors(directed: Boolean = true, options: PersonOptions, where: PersonWhere): [Person!]!
+  actorsConnection(after: String, directed: Boolean = true, first: Int, sort: [MovieActorsConnectionSort!], where: MovieActorsConnectionWhere): MovieActorsConnection!
+  id: ID
+  producers(directed: Boolean = true, options: PersonOptions, where: PersonWhere): [Person!]!
+  producersConnection(after: String, directed: Boolean = true, first: Int, sort: [MovieProducersConnectionSort!], where: MovieProducersConnectionWhere): MovieProducersConnection!
+}
+
+type MovieActorsConnection {
+  edges: [MovieActorsRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input MovieActorsConnectionSort {
+  node: PersonSort
+}
+
+input MovieActorsConnectionWhere {
+  AND: [MovieActorsConnectionWhere!]
+  NOT: MovieActorsConnectionWhere
+  OR: [MovieActorsConnectionWhere!]
+  node: PersonWhere
+}
+
+type MovieActorsRelationship {
+  cursor: String!
+  node: Person!
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MovieSort!]
+}
+
+type MovieProducersConnection {
+  edges: [MovieProducersRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input MovieProducersConnectionSort {
+  node: PersonSort
+}
+
+input MovieProducersConnectionWhere {
+  AND: [MovieProducersConnectionWhere!]
+  NOT: MovieProducersConnectionWhere
+  OR: [MovieProducersConnectionWhere!]
+  node: PersonWhere
+}
+
+type MovieProducersRelationship {
+  cursor: String!
+  node: Person!
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
+"""
+input MovieSort {
+  id: SortDirection
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  """
+  Return Movies where all of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_ALL: MovieActorsConnectionWhere
+  """
+  Return Movies where none of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_NONE: MovieActorsConnectionWhere
+  """
+  Return Movies where one of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SINGLE: MovieActorsConnectionWhere
+  """
+  Return Movies where some of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SOME: MovieActorsConnectionWhere
+  """Return Movies where all of the related People match this filter"""
+  actors_ALL: PersonWhere
+  """Return Movies where none of the related People match this filter"""
+  actors_NONE: PersonWhere
+  """Return Movies where one of the related People match this filter"""
+  actors_SINGLE: PersonWhere
+  """Return Movies where some of the related People match this filter"""
+  actors_SOME: PersonWhere
+  id: ID
+  id_CONTAINS: ID
+  id_ENDS_WITH: ID
+  id_IN: [ID]
+  id_STARTS_WITH: ID
+  """
+  Return Movies where all of the related MovieProducersConnections match this filter
+  """
+  producersConnection_ALL: MovieProducersConnectionWhere
+  """
+  Return Movies where none of the related MovieProducersConnections match this filter
+  """
+  producersConnection_NONE: MovieProducersConnectionWhere
+  """
+  Return Movies where one of the related MovieProducersConnections match this filter
+  """
+  producersConnection_SINGLE: MovieProducersConnectionWhere
+  """
+  Return Movies where some of the related MovieProducersConnections match this filter
+  """
+  producersConnection_SOME: MovieProducersConnectionWhere
+  """Return Movies where all of the related People match this filter"""
+  producers_ALL: PersonWhere
+  """Return Movies where none of the related People match this filter"""
+  producers_NONE: PersonWhere
+  """Return Movies where one of the related People match this filter"""
+  producers_SINGLE: PersonWhere
+  """Return Movies where some of the related People match this filter"""
+  producers_SOME: PersonWhere
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+type PeopleConnection {
+  edges: [PersonEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+interface Person {
+  name: String
+}
+
+type PersonEdge {
+  cursor: String!
+  node: Person!
+}
+
+enum PersonImplementation {
+  PersonOne
+  PersonTwo
+}
+
+type PersonOne implements Person {
+  name: String
+  someExtraProp: [Int!]!
+}
+
+type PersonOneEdge {
+  cursor: String!
+  node: PersonOne!
+}
+
+input PersonOneOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more PersonOneSort objects to sort PersonOnes by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [PersonOneSort!]
+}
+
+"""
+Fields to sort PersonOnes by. The order in which sorts are applied is not guaranteed when specifying many fields in one PersonOneSort object.
+"""
+input PersonOneSort {
+  name: SortDirection
+}
+
+input PersonOneWhere {
+  AND: [PersonOneWhere!]
+  NOT: PersonOneWhere
+  OR: [PersonOneWhere!]
+  name: String
+  name_CONTAINS: String
+  name_ENDS_WITH: String
+  name_IN: [String]
+  name_STARTS_WITH: String
+  someExtraProp: [Int!]
+  someExtraProp_INCLUDES: Int
+}
+
+type PersonOnesConnection {
+  edges: [PersonOneEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input PersonOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more PersonSort objects to sort People by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [PersonSort]
+}
+
+"""
+Fields to sort People by. The order in which sorts are applied is not guaranteed when specifying many fields in one PersonSort object.
+"""
+input PersonSort {
+  name: SortDirection
+}
+
+type PersonTwo implements Person {
+  name: String
+}
+
+type PersonTwoEdge {
+  cursor: String!
+  node: PersonTwo!
+}
+
+input PersonTwoOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more PersonTwoSort objects to sort PersonTwos by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [PersonTwoSort!]
+}
+
+"""
+Fields to sort PersonTwos by. The order in which sorts are applied is not guaranteed when specifying many fields in one PersonTwoSort object.
+"""
+input PersonTwoSort {
+  name: SortDirection
+}
+
+input PersonTwoWhere {
+  AND: [PersonTwoWhere!]
+  NOT: PersonTwoWhere
+  OR: [PersonTwoWhere!]
+  name: String
+  name_CONTAINS: String
+  name_ENDS_WITH: String
+  name_IN: [String]
+  name_STARTS_WITH: String
+}
+
+type PersonTwosConnection {
+  edges: [PersonTwoEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input PersonWhere {
+  AND: [PersonWhere!]
+  NOT: PersonWhere
+  OR: [PersonWhere!]
+  name: String
+  name_CONTAINS: String
+  name_ENDS_WITH: String
+  name_IN: [String]
+  name_STARTS_WITH: String
+  typename_IN: [PersonImplementation!]
+}
+
+type Query {
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+  people(options: PersonOptions, where: PersonWhere): [Person!]!
+  peopleConnection(after: String, first: Int, sort: [PersonSort], where: PersonWhere): PeopleConnection!
+  personOnes(options: PersonOneOptions, where: PersonOneWhere): [PersonOne!]!
+  personOnesConnection(after: String, first: Int, sort: [PersonOneSort], where: PersonOneWhere): PersonOnesConnection!
+  personTwos(options: PersonTwoOptions, where: PersonTwoWhere): [PersonTwo!]!
+  personTwosConnection(after: String, first: Int, sort: [PersonTwoSort], where: PersonTwoWhere): PersonTwosConnection!
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
+
+=== Two relationships with nested operations specified on both
+
+.Schema
+[source,graphql,schema=true]
+----
+interface Person {
+  name: String
+}
+
+type PersonOne implements Person {
+  name: String
+  someExtraProp: [Int!]!
+}
+
+type PersonTwo implements Person {
+  name: String
+}
+
+type Movie {
+  id: ID
+  actors: [Person!]! @relationship(type: "ACTED_IN", direction: IN, nestedOperations: [CREATE, DELETE])
+  producers: [Person!]! @relationship(type: "PRODUCED", direction: IN, nestedOperations: [DISCONNECT])
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+type Movie {
+  actors(directed: Boolean = true, options: PersonOptions, where: PersonWhere): [Person!]!
+  actorsConnection(after: String, directed: Boolean = true, first: Int, sort: [MovieActorsConnectionSort!], where: MovieActorsConnectionWhere): MovieActorsConnection!
+  id: ID
+  producers(directed: Boolean = true, options: PersonOptions, where: PersonWhere): [Person!]!
+  producersConnection(after: String, directed: Boolean = true, first: Int, sort: [MovieProducersConnectionSort!], where: MovieProducersConnectionWhere): MovieProducersConnection!
+}
+
+type MovieActorsConnection {
+  edges: [MovieActorsRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input MovieActorsConnectionSort {
+  node: PersonSort
+}
+
+input MovieActorsConnectionWhere {
+  AND: [MovieActorsConnectionWhere!]
+  NOT: MovieActorsConnectionWhere
+  OR: [MovieActorsConnectionWhere!]
+  node: PersonWhere
+}
+
+type MovieActorsRelationship {
+  cursor: String!
+  node: Person!
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MovieSort!]
+}
+
+type MovieProducersConnection {
+  edges: [MovieProducersRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input MovieProducersConnectionSort {
+  node: PersonSort
+}
+
+input MovieProducersConnectionWhere {
+  AND: [MovieProducersConnectionWhere!]
+  NOT: MovieProducersConnectionWhere
+  OR: [MovieProducersConnectionWhere!]
+  node: PersonWhere
+}
+
+type MovieProducersRelationship {
+  cursor: String!
+  node: Person!
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
+"""
+input MovieSort {
+  id: SortDirection
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  """
+  Return Movies where all of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_ALL: MovieActorsConnectionWhere
+  """
+  Return Movies where none of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_NONE: MovieActorsConnectionWhere
+  """
+  Return Movies where one of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SINGLE: MovieActorsConnectionWhere
+  """
+  Return Movies where some of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SOME: MovieActorsConnectionWhere
+  """Return Movies where all of the related People match this filter"""
+  actors_ALL: PersonWhere
+  """Return Movies where none of the related People match this filter"""
+  actors_NONE: PersonWhere
+  """Return Movies where one of the related People match this filter"""
+  actors_SINGLE: PersonWhere
+  """Return Movies where some of the related People match this filter"""
+  actors_SOME: PersonWhere
+  id: ID
+  id_CONTAINS: ID
+  id_ENDS_WITH: ID
+  id_IN: [ID]
+  id_STARTS_WITH: ID
+  """
+  Return Movies where all of the related MovieProducersConnections match this filter
+  """
+  producersConnection_ALL: MovieProducersConnectionWhere
+  """
+  Return Movies where none of the related MovieProducersConnections match this filter
+  """
+  producersConnection_NONE: MovieProducersConnectionWhere
+  """
+  Return Movies where one of the related MovieProducersConnections match this filter
+  """
+  producersConnection_SINGLE: MovieProducersConnectionWhere
+  """
+  Return Movies where some of the related MovieProducersConnections match this filter
+  """
+  producersConnection_SOME: MovieProducersConnectionWhere
+  """Return Movies where all of the related People match this filter"""
+  producers_ALL: PersonWhere
+  """Return Movies where none of the related People match this filter"""
+  producers_NONE: PersonWhere
+  """Return Movies where one of the related People match this filter"""
+  producers_SINGLE: PersonWhere
+  """Return Movies where some of the related People match this filter"""
+  producers_SOME: PersonWhere
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+type PeopleConnection {
+  edges: [PersonEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+interface Person {
+  name: String
+}
+
+type PersonEdge {
+  cursor: String!
+  node: Person!
+}
+
+enum PersonImplementation {
+  PersonOne
+  PersonTwo
+}
+
+type PersonOne implements Person {
+  name: String
+  someExtraProp: [Int!]!
+}
+
+type PersonOneEdge {
+  cursor: String!
+  node: PersonOne!
+}
+
+input PersonOneOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more PersonOneSort objects to sort PersonOnes by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [PersonOneSort!]
+}
+
+"""
+Fields to sort PersonOnes by. The order in which sorts are applied is not guaranteed when specifying many fields in one PersonOneSort object.
+"""
+input PersonOneSort {
+  name: SortDirection
+}
+
+input PersonOneWhere {
+  AND: [PersonOneWhere!]
+  NOT: PersonOneWhere
+  OR: [PersonOneWhere!]
+  name: String
+  name_CONTAINS: String
+  name_ENDS_WITH: String
+  name_IN: [String]
+  name_STARTS_WITH: String
+  someExtraProp: [Int!]
+  someExtraProp_INCLUDES: Int
+}
+
+type PersonOnesConnection {
+  edges: [PersonOneEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input PersonOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more PersonSort objects to sort People by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [PersonSort]
+}
+
+"""
+Fields to sort People by. The order in which sorts are applied is not guaranteed when specifying many fields in one PersonSort object.
+"""
+input PersonSort {
+  name: SortDirection
+}
+
+type PersonTwo implements Person {
+  name: String
+}
+
+type PersonTwoEdge {
+  cursor: String!
+  node: PersonTwo!
+}
+
+input PersonTwoOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more PersonTwoSort objects to sort PersonTwos by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [PersonTwoSort!]
+}
+
+"""
+Fields to sort PersonTwos by. The order in which sorts are applied is not guaranteed when specifying many fields in one PersonTwoSort object.
+"""
+input PersonTwoSort {
+  name: SortDirection
+}
+
+input PersonTwoWhere {
+  AND: [PersonTwoWhere!]
+  NOT: PersonTwoWhere
+  OR: [PersonTwoWhere!]
+  name: String
+  name_CONTAINS: String
+  name_ENDS_WITH: String
+  name_IN: [String]
+  name_STARTS_WITH: String
+}
+
+type PersonTwosConnection {
+  edges: [PersonTwoEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input PersonWhere {
+  AND: [PersonWhere!]
+  NOT: PersonWhere
+  OR: [PersonWhere!]
+  name: String
+  name_CONTAINS: String
+  name_ENDS_WITH: String
+  name_IN: [String]
+  name_STARTS_WITH: String
+  typename_IN: [PersonImplementation!]
+}
+
+type Query {
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+  people(options: PersonOptions, where: PersonWhere): [Person!]!
+  peopleConnection(after: String, first: Int, sort: [PersonSort], where: PersonWhere): PeopleConnection!
+  personOnes(options: PersonOneOptions, where: PersonOneWhere): [PersonOne!]!
+  personOnesConnection(after: String, first: Int, sort: [PersonOneSort], where: PersonOneWhere): PersonOnesConnection!
+  personTwos(options: PersonTwoOptions, where: PersonTwoWhere): [PersonTwo!]!
+  personTwosConnection(after: String, first: Int, sort: [PersonTwoSort], where: PersonTwoWhere): PersonTwosConnection!
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
diff --git a/core/src/test/resources/tck-test-files/schema/v2/directives/relationship-properties.adoc b/core/src/test/resources/tck-test-files/schema/v2/directives/relationship-properties.adoc
index 28d27dec..6398f4a5 100644
--- a/core/src/test/resources/tck-test-files/schema/v2/directives/relationship-properties.adoc
+++ b/core/src/test/resources/tck-test-files/schema/v2/directives/relationship-properties.adoc
@@ -26,7 +26,7 @@ type ActedIn @relationshipProperties {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -257,6 +257,3 @@ input MovieWhere {
 }
 
 ----
-
-'''
-
diff --git a/core/src/test/resources/tck-test-files/schema/v2/directives/relationship-properties.js.adoc b/core/src/test/resources/tck-test-files/schema/v2/directives/relationship-properties.js.adoc
new file mode 100644
index 00000000..ddeab8fa
--- /dev/null
+++ b/core/src/test/resources/tck-test-files/schema/v2/directives/relationship-properties.js.adoc
@@ -0,0 +1,283 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= Relationship-properties
+
+== Relationship Properties
+
+.Schema
+[source,graphql,schema=true]
+----
+type Actor {
+  name: String!
+  movies: [Movie!]! @relationship(type: "ACTED_IN", direction: OUT, properties: "ActedIn")
+}
+
+type Movie {
+  title: String!
+  actors: [Actor!]! @relationship(type: "ACTED_IN", direction: IN, properties: "ActedIn")
+}
+
+type ActedIn @relationshipProperties {
+  screenTime: Int!
+  startDate: Date!
+  leadRole: Boolean!
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+"""
+The edge properties for the following fields:
+* Actor.movies
+* Movie.actors
+"""
+type ActedIn {
+  leadRole: Boolean!
+  screenTime: Int!
+  startDate: Date!
+}
+
+input ActedInSort {
+  leadRole: SortDirection
+  screenTime: SortDirection
+  startDate: SortDirection
+}
+
+input ActedInWhere {
+  AND: [ActedInWhere!]
+  NOT: ActedInWhere
+  OR: [ActedInWhere!]
+  leadRole: Boolean
+  screenTime: Int
+  screenTime_GT: Int
+  screenTime_GTE: Int
+  screenTime_IN: [Int!]
+  screenTime_LT: Int
+  screenTime_LTE: Int
+  startDate: Date
+  startDate_GT: Date
+  startDate_GTE: Date
+  startDate_IN: [Date!]
+  startDate_LT: Date
+  startDate_LTE: Date
+}
+
+type Actor {
+  movies(directed: Boolean = true, options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, directed: Boolean = true, first: Int, sort: [ActorMoviesConnectionSort!], where: ActorMoviesConnectionWhere): ActorMoviesConnection!
+  name: String!
+}
+
+type ActorEdge {
+  cursor: String!
+  node: Actor!
+}
+
+type ActorMoviesConnection {
+  edges: [ActorMoviesRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input ActorMoviesConnectionSort {
+  edge: ActedInSort
+  node: MovieSort
+}
+
+input ActorMoviesConnectionWhere {
+  AND: [ActorMoviesConnectionWhere!]
+  NOT: ActorMoviesConnectionWhere
+  OR: [ActorMoviesConnectionWhere!]
+  edge: ActedInWhere
+  node: MovieWhere
+}
+
+type ActorMoviesRelationship {
+  cursor: String!
+  node: Movie!
+  properties: ActedIn!
+}
+
+input ActorOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more ActorSort objects to sort Actors by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [ActorSort!]
+}
+
+"""
+Fields to sort Actors by. The order in which sorts are applied is not guaranteed when specifying many fields in one ActorSort object.
+"""
+input ActorSort {
+  name: SortDirection
+}
+
+input ActorWhere {
+  AND: [ActorWhere!]
+  NOT: ActorWhere
+  OR: [ActorWhere!]
+  """
+  Return Actors where all of the related ActorMoviesConnections match this filter
+  """
+  moviesConnection_ALL: ActorMoviesConnectionWhere
+  """
+  Return Actors where none of the related ActorMoviesConnections match this filter
+  """
+  moviesConnection_NONE: ActorMoviesConnectionWhere
+  """
+  Return Actors where one of the related ActorMoviesConnections match this filter
+  """
+  moviesConnection_SINGLE: ActorMoviesConnectionWhere
+  """
+  Return Actors where some of the related ActorMoviesConnections match this filter
+  """
+  moviesConnection_SOME: ActorMoviesConnectionWhere
+  """Return Actors where all of the related Movies match this filter"""
+  movies_ALL: MovieWhere
+  """Return Actors where none of the related Movies match this filter"""
+  movies_NONE: MovieWhere
+  """Return Actors where one of the related Movies match this filter"""
+  movies_SINGLE: MovieWhere
+  """Return Actors where some of the related Movies match this filter"""
+  movies_SOME: MovieWhere
+  name: String
+  name_CONTAINS: String
+  name_ENDS_WITH: String
+  name_IN: [String!]
+  name_STARTS_WITH: String
+}
+
+type ActorsConnection {
+  edges: [ActorEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""A date, represented as a 'yyyy-mm-dd' string"""
+scalar Date
+
+type Movie {
+  actors(directed: Boolean = true, options: ActorOptions, where: ActorWhere): [Actor!]!
+  actorsConnection(after: String, directed: Boolean = true, first: Int, sort: [MovieActorsConnectionSort!], where: MovieActorsConnectionWhere): MovieActorsConnection!
+  title: String!
+}
+
+type MovieActorsConnection {
+  edges: [MovieActorsRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input MovieActorsConnectionSort {
+  edge: ActedInSort
+  node: ActorSort
+}
+
+input MovieActorsConnectionWhere {
+  AND: [MovieActorsConnectionWhere!]
+  NOT: MovieActorsConnectionWhere
+  OR: [MovieActorsConnectionWhere!]
+  edge: ActedInWhere
+  node: ActorWhere
+}
+
+type MovieActorsRelationship {
+  cursor: String!
+  node: Actor!
+  properties: ActedIn!
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MovieSort!]
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
+"""
+input MovieSort {
+  title: SortDirection
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  """
+  Return Movies where all of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_ALL: MovieActorsConnectionWhere
+  """
+  Return Movies where none of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_NONE: MovieActorsConnectionWhere
+  """
+  Return Movies where one of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SINGLE: MovieActorsConnectionWhere
+  """
+  Return Movies where some of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SOME: MovieActorsConnectionWhere
+  """Return Movies where all of the related Actors match this filter"""
+  actors_ALL: ActorWhere
+  """Return Movies where none of the related Actors match this filter"""
+  actors_NONE: ActorWhere
+  """Return Movies where one of the related Actors match this filter"""
+  actors_SINGLE: ActorWhere
+  """Return Movies where some of the related Actors match this filter"""
+  actors_SOME: ActorWhere
+  title: String
+  title_CONTAINS: String
+  title_ENDS_WITH: String
+  title_IN: [String!]
+  title_STARTS_WITH: String
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+type Query {
+  actors(options: ActorOptions, where: ActorWhere): [Actor!]!
+  actorsConnection(after: String, first: Int, sort: [ActorSort], where: ActorWhere): ActorsConnection!
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
diff --git a/core/src/test/resources/tck-test-files/schema/v2/directives/relationship.adoc b/core/src/test/resources/tck-test-files/schema/v2/directives/relationship.adoc
index 69993e81..65208785 100644
--- a/core/src/test/resources/tck-test-files/schema/v2/directives/relationship.adoc
+++ b/core/src/test/resources/tck-test-files/schema/v2/directives/relationship.adoc
@@ -19,7 +19,7 @@ type Movie {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -166,8 +166,6 @@ input MovieWhere {
 
 ----
 
-'''
-
 == Multi Relationship
 
 .Schema
@@ -185,7 +183,7 @@ type Movie {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -371,6 +369,3 @@ input MovieWhere {
 }
 
 ----
-
-'''
-
diff --git a/core/src/test/resources/tck-test-files/schema/v2/directives/relationship.js.adoc b/core/src/test/resources/tck-test-files/schema/v2/directives/relationship.js.adoc
new file mode 100644
index 00000000..fe8fa7db
--- /dev/null
+++ b/core/src/test/resources/tck-test-files/schema/v2/directives/relationship.js.adoc
@@ -0,0 +1,410 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= Relationship
+
+== Single Relationship
+
+.Schema
+[source,graphql,schema=true]
+----
+type Actor {
+  name: String
+}
+
+type Movie {
+  id: ID
+  actors: [Actor!]! @relationship(type: "ACTED_IN", direction: IN)
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+type Actor {
+  name: String
+}
+
+type ActorEdge {
+  cursor: String!
+  node: Actor!
+}
+
+input ActorOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more ActorSort objects to sort Actors by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [ActorSort!]
+}
+
+"""
+Fields to sort Actors by. The order in which sorts are applied is not guaranteed when specifying many fields in one ActorSort object.
+"""
+input ActorSort {
+  name: SortDirection
+}
+
+input ActorWhere {
+  AND: [ActorWhere!]
+  NOT: ActorWhere
+  OR: [ActorWhere!]
+  name: String
+  name_CONTAINS: String
+  name_ENDS_WITH: String
+  name_IN: [String]
+  name_STARTS_WITH: String
+}
+
+type ActorsConnection {
+  edges: [ActorEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+type Movie {
+  actors(directed: Boolean = true, options: ActorOptions, where: ActorWhere): [Actor!]!
+  actorsConnection(after: String, directed: Boolean = true, first: Int, sort: [MovieActorsConnectionSort!], where: MovieActorsConnectionWhere): MovieActorsConnection!
+  id: ID
+}
+
+type MovieActorsConnection {
+  edges: [MovieActorsRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input MovieActorsConnectionSort {
+  node: ActorSort
+}
+
+input MovieActorsConnectionWhere {
+  AND: [MovieActorsConnectionWhere!]
+  NOT: MovieActorsConnectionWhere
+  OR: [MovieActorsConnectionWhere!]
+  node: ActorWhere
+}
+
+type MovieActorsRelationship {
+  cursor: String!
+  node: Actor!
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MovieSort!]
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
+"""
+input MovieSort {
+  id: SortDirection
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  """
+  Return Movies where all of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_ALL: MovieActorsConnectionWhere
+  """
+  Return Movies where none of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_NONE: MovieActorsConnectionWhere
+  """
+  Return Movies where one of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SINGLE: MovieActorsConnectionWhere
+  """
+  Return Movies where some of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SOME: MovieActorsConnectionWhere
+  """Return Movies where all of the related Actors match this filter"""
+  actors_ALL: ActorWhere
+  """Return Movies where none of the related Actors match this filter"""
+  actors_NONE: ActorWhere
+  """Return Movies where one of the related Actors match this filter"""
+  actors_SINGLE: ActorWhere
+  """Return Movies where some of the related Actors match this filter"""
+  actors_SOME: ActorWhere
+  id: ID
+  id_CONTAINS: ID
+  id_ENDS_WITH: ID
+  id_IN: [ID]
+  id_STARTS_WITH: ID
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+type Query {
+  actors(options: ActorOptions, where: ActorWhere): [Actor!]!
+  actorsConnection(after: String, first: Int, sort: [ActorSort], where: ActorWhere): ActorsConnection!
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
+
+== Multi Relationship
+
+.Schema
+[source,graphql,schema=true]
+----
+type Actor {
+  name: String
+  movies: [Movie!]! @relationship(type: "ACTED_IN", direction: OUT)
+}
+
+type Movie {
+  id: ID
+  actors: [Actor!]! @relationship(type: "ACTED_IN", direction: IN)
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+type Actor {
+  movies(directed: Boolean = true, options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, directed: Boolean = true, first: Int, sort: [ActorMoviesConnectionSort!], where: ActorMoviesConnectionWhere): ActorMoviesConnection!
+  name: String
+}
+
+type ActorEdge {
+  cursor: String!
+  node: Actor!
+}
+
+type ActorMoviesConnection {
+  edges: [ActorMoviesRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input ActorMoviesConnectionSort {
+  node: MovieSort
+}
+
+input ActorMoviesConnectionWhere {
+  AND: [ActorMoviesConnectionWhere!]
+  NOT: ActorMoviesConnectionWhere
+  OR: [ActorMoviesConnectionWhere!]
+  node: MovieWhere
+}
+
+type ActorMoviesRelationship {
+  cursor: String!
+  node: Movie!
+}
+
+input ActorOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more ActorSort objects to sort Actors by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [ActorSort!]
+}
+
+"""
+Fields to sort Actors by. The order in which sorts are applied is not guaranteed when specifying many fields in one ActorSort object.
+"""
+input ActorSort {
+  name: SortDirection
+}
+
+input ActorWhere {
+  AND: [ActorWhere!]
+  NOT: ActorWhere
+  OR: [ActorWhere!]
+  """
+  Return Actors where all of the related ActorMoviesConnections match this filter
+  """
+  moviesConnection_ALL: ActorMoviesConnectionWhere
+  """
+  Return Actors where none of the related ActorMoviesConnections match this filter
+  """
+  moviesConnection_NONE: ActorMoviesConnectionWhere
+  """
+  Return Actors where one of the related ActorMoviesConnections match this filter
+  """
+  moviesConnection_SINGLE: ActorMoviesConnectionWhere
+  """
+  Return Actors where some of the related ActorMoviesConnections match this filter
+  """
+  moviesConnection_SOME: ActorMoviesConnectionWhere
+  """Return Actors where all of the related Movies match this filter"""
+  movies_ALL: MovieWhere
+  """Return Actors where none of the related Movies match this filter"""
+  movies_NONE: MovieWhere
+  """Return Actors where one of the related Movies match this filter"""
+  movies_SINGLE: MovieWhere
+  """Return Actors where some of the related Movies match this filter"""
+  movies_SOME: MovieWhere
+  name: String
+  name_CONTAINS: String
+  name_ENDS_WITH: String
+  name_IN: [String]
+  name_STARTS_WITH: String
+}
+
+type ActorsConnection {
+  edges: [ActorEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+type Movie {
+  actors(directed: Boolean = true, options: ActorOptions, where: ActorWhere): [Actor!]!
+  actorsConnection(after: String, directed: Boolean = true, first: Int, sort: [MovieActorsConnectionSort!], where: MovieActorsConnectionWhere): MovieActorsConnection!
+  id: ID
+}
+
+type MovieActorsConnection {
+  edges: [MovieActorsRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input MovieActorsConnectionSort {
+  node: ActorSort
+}
+
+input MovieActorsConnectionWhere {
+  AND: [MovieActorsConnectionWhere!]
+  NOT: MovieActorsConnectionWhere
+  OR: [MovieActorsConnectionWhere!]
+  node: ActorWhere
+}
+
+type MovieActorsRelationship {
+  cursor: String!
+  node: Actor!
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MovieSort!]
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
+"""
+input MovieSort {
+  id: SortDirection
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  """
+  Return Movies where all of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_ALL: MovieActorsConnectionWhere
+  """
+  Return Movies where none of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_NONE: MovieActorsConnectionWhere
+  """
+  Return Movies where one of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SINGLE: MovieActorsConnectionWhere
+  """
+  Return Movies where some of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SOME: MovieActorsConnectionWhere
+  """Return Movies where all of the related Actors match this filter"""
+  actors_ALL: ActorWhere
+  """Return Movies where none of the related Actors match this filter"""
+  actors_NONE: ActorWhere
+  """Return Movies where one of the related Actors match this filter"""
+  actors_SINGLE: ActorWhere
+  """Return Movies where some of the related Actors match this filter"""
+  actors_SOME: ActorWhere
+  id: ID
+  id_CONTAINS: ID
+  id_ENDS_WITH: ID
+  id_IN: [ID]
+  id_STARTS_WITH: ID
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+type Query {
+  actors(options: ActorOptions, where: ActorWhere): [Actor!]!
+  actorsConnection(after: String, first: Int, sort: [ActorSort], where: ActorWhere): ActorsConnection!
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
diff --git a/core/src/test/resources/tck-test-files/schema/v2/enum.adoc b/core/src/test/resources/tck-test-files/schema/v2/enum.adoc
index 4ff56284..d2e2f272 100644
--- a/core/src/test/resources/tck-test-files/schema/v2/enum.adoc
+++ b/core/src/test/resources/tck-test-files/schema/v2/enum.adoc
@@ -20,7 +20,7 @@ type Movie {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -89,6 +89,3 @@ input MovieWhere {
 }
 
 ----
-
-'''
-
diff --git a/core/src/test/resources/tck-test-files/schema/v2/enum.js.adoc b/core/src/test/resources/tck-test-files/schema/v2/enum.js.adoc
new file mode 100644
index 00000000..02969a14
--- /dev/null
+++ b/core/src/test/resources/tck-test-files/schema/v2/enum.js.adoc
@@ -0,0 +1,95 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= Enum
+
+== Enums
+
+.Schema
+[source,graphql,schema=true]
+----
+enum Status {
+  ACTIVE
+  INACTIVE
+  PENDING
+}
+
+type Movie {
+  status: Status
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+type Movie {
+  status: Status
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MovieSort!]
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
+"""
+input MovieSort {
+  status: SortDirection
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  status: Status
+  status_IN: [Status]
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+type Query {
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+
+enum Status {
+  ACTIVE
+  INACTIVE
+  PENDING
+}
+----
diff --git a/core/src/test/resources/tck-test-files/schema/v2/experimental-schema/comments.adoc b/core/src/test/resources/tck-test-files/schema/v2/experimental-schema/comments.adoc
index 50ec009b..bd8001ee 100644
--- a/core/src/test/resources/tck-test-files/schema/v2/experimental-schema/comments.adoc
+++ b/core/src/test/resources/tck-test-files/schema/v2/experimental-schema/comments.adoc
@@ -27,7 +27,7 @@ type Movie {
   averageRating: Float
   """
   Is the movie active?
-  
+
   This is measured based on annual profit.
   """
   isActive: Boolean
@@ -37,7 +37,7 @@ type Movie {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -149,8 +149,6 @@ input MovieWhere {
 
 ----
 
-'''
-
 == Relationship
 
 === Simple
@@ -170,7 +168,7 @@ type Movie {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -318,8 +316,6 @@ input MovieWhere {
 
 ----
 
-'''
-
 === Interface
 
 .Schema
@@ -351,7 +347,7 @@ type Actor {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -628,8 +624,6 @@ input SeriesWhere {
 
 ----
 
-'''
-
 === Unions
 
 .Schema
@@ -649,7 +643,7 @@ type Movie {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -818,6 +812,3 @@ input SearchWhere {
 }
 
 ----
-
-'''
-
diff --git a/core/src/test/resources/tck-test-files/schema/v2/experimental-schema/comments.js.adoc b/core/src/test/resources/tck-test-files/schema/v2/experimental-schema/comments.js.adoc
new file mode 100644
index 00000000..7b088b12
--- /dev/null
+++ b/core/src/test/resources/tck-test-files/schema/v2/experimental-schema/comments.js.adoc
@@ -0,0 +1,871 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= Comments
+
+== Simple
+
+.Schema
+[source,graphql,schema=true]
+----
+"A custom scalar."
+scalar CustomScalar
+
+"An enumeration of movie genres."
+enum Genre {
+  ACTION
+  DRAMA
+  ROMANCE
+}
+
+"""A type describing a movie."""
+type Movie {
+  id: ID
+  "The number of actors who acted in the movie."
+  actorCount: Int
+  """The average rating for the movie."""
+  averageRating: Float
+  """
+  Is the movie active?
+  
+  This is measured based on annual profit.
+  """
+  isActive: Boolean
+  genre: Genre
+  customScalar: CustomScalar
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+"""A custom scalar."""
+scalar CustomScalar
+
+"""An enumeration of movie genres."""
+enum Genre {
+  ACTION
+  DRAMA
+  ROMANCE
+}
+
+"""A type describing a movie."""
+type Movie {
+  """The number of actors who acted in the movie."""
+  actorCount: Int
+  """The average rating for the movie."""
+  averageRating: Float
+  customScalar: CustomScalar
+  genre: Genre
+  id: ID
+  """
+  Is the movie active?
+  
+  This is measured based on annual profit.
+  """
+  isActive: Boolean
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MovieSort!]
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
+"""
+input MovieSort {
+  actorCount: SortDirection
+  averageRating: SortDirection
+  customScalar: SortDirection
+  genre: SortDirection
+  id: SortDirection
+  isActive: SortDirection
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  actorCount: Int
+  actorCount_GT: Int
+  actorCount_GTE: Int
+  actorCount_IN: [Int]
+  actorCount_LT: Int
+  actorCount_LTE: Int
+  averageRating: Float
+  averageRating_GT: Float
+  averageRating_GTE: Float
+  averageRating_IN: [Float]
+  averageRating_LT: Float
+  averageRating_LTE: Float
+  customScalar: CustomScalar
+  customScalar_IN: [CustomScalar]
+  genre: Genre
+  genre_IN: [Genre]
+  id: ID
+  id_CONTAINS: ID
+  id_ENDS_WITH: ID
+  id_IN: [ID]
+  id_STARTS_WITH: ID
+  isActive: Boolean
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+type Query {
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
+
+== Relationship
+
+=== Simple
+
+.Schema
+[source,graphql,schema=true]
+----
+type Actor {
+  name: String
+}
+
+type Movie {
+  id: ID
+  "Actors in Movie"
+  actors: [Actor!]! @relationship(type: "ACTED_IN", direction: IN)
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+type Actor {
+  name: String
+}
+
+type ActorEdge {
+  cursor: String!
+  node: Actor!
+}
+
+input ActorOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more ActorSort objects to sort Actors by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [ActorSort!]
+}
+
+"""
+Fields to sort Actors by. The order in which sorts are applied is not guaranteed when specifying many fields in one ActorSort object.
+"""
+input ActorSort {
+  name: SortDirection
+}
+
+input ActorWhere {
+  AND: [ActorWhere!]
+  NOT: ActorWhere
+  OR: [ActorWhere!]
+  name: String
+  name_CONTAINS: String
+  name_ENDS_WITH: String
+  name_IN: [String]
+  name_STARTS_WITH: String
+}
+
+type ActorsConnection {
+  edges: [ActorEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+type Movie {
+  """Actors in Movie"""
+  actors(directed: Boolean = true, options: ActorOptions, where: ActorWhere): [Actor!]!
+  actorsConnection(after: String, directed: Boolean = true, first: Int, sort: [MovieActorsConnectionSort!], where: MovieActorsConnectionWhere): MovieActorsConnection!
+  id: ID
+}
+
+type MovieActorsConnection {
+  edges: [MovieActorsRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input MovieActorsConnectionSort {
+  node: ActorSort
+}
+
+input MovieActorsConnectionWhere {
+  AND: [MovieActorsConnectionWhere!]
+  NOT: MovieActorsConnectionWhere
+  OR: [MovieActorsConnectionWhere!]
+  node: ActorWhere
+}
+
+type MovieActorsRelationship {
+  cursor: String!
+  node: Actor!
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MovieSort!]
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
+"""
+input MovieSort {
+  id: SortDirection
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  """
+  Return Movies where all of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_ALL: MovieActorsConnectionWhere
+  """
+  Return Movies where none of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_NONE: MovieActorsConnectionWhere
+  """
+  Return Movies where one of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SINGLE: MovieActorsConnectionWhere
+  """
+  Return Movies where some of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SOME: MovieActorsConnectionWhere
+  """Return Movies where all of the related Actors match this filter"""
+  actors_ALL: ActorWhere
+  """Return Movies where none of the related Actors match this filter"""
+  actors_NONE: ActorWhere
+  """Return Movies where one of the related Actors match this filter"""
+  actors_SINGLE: ActorWhere
+  """Return Movies where some of the related Actors match this filter"""
+  actors_SOME: ActorWhere
+  id: ID
+  id_CONTAINS: ID
+  id_ENDS_WITH: ID
+  id_IN: [ID]
+  id_STARTS_WITH: ID
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+type Query {
+  actors(options: ActorOptions, where: ActorWhere): [Actor!]!
+  actorsConnection(after: String, first: Int, sort: [ActorSort], where: ActorWhere): ActorsConnection!
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
+
+=== Interface
+
+.Schema
+[source,graphql,schema=true]
+----
+interface Production {
+  title: String!
+}
+
+type Movie implements Production {
+  title: String!
+  runtime: Int!
+}
+
+type Series implements Production {
+  title: String!
+  episodes: Int!
+}
+
+type ActedIn @relationshipProperties {
+  screenTime: Int!
+}
+
+type Actor {
+  name: String!
+  "Acted in Production"
+  actedIn: [Production!]! @relationship(type: "ACTED_IN", direction: OUT, properties: "ActedIn")
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+"""
+The edge properties for the following fields:
+* Actor.actedIn
+"""
+type ActedIn {
+  screenTime: Int!
+}
+
+input ActedInSort {
+  screenTime: SortDirection
+}
+
+input ActedInWhere {
+  AND: [ActedInWhere!]
+  NOT: ActedInWhere
+  OR: [ActedInWhere!]
+  screenTime: Int
+  screenTime_GT: Int
+  screenTime_GTE: Int
+  screenTime_IN: [Int!]
+  screenTime_LT: Int
+  screenTime_LTE: Int
+}
+
+type Actor {
+  """Acted in Production"""
+  actedIn(directed: Boolean = true, options: ProductionOptions, where: ProductionWhere): [Production!]!
+  actedInConnection(after: String, directed: Boolean = true, first: Int, sort: [ActorActedInConnectionSort!], where: ActorActedInConnectionWhere): ActorActedInConnection!
+  name: String!
+}
+
+type ActorActedInConnection {
+  edges: [ActorActedInRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input ActorActedInConnectionSort {
+  edge: ActedInSort
+  node: ProductionSort
+}
+
+input ActorActedInConnectionWhere {
+  AND: [ActorActedInConnectionWhere!]
+  NOT: ActorActedInConnectionWhere
+  OR: [ActorActedInConnectionWhere!]
+  edge: ActedInWhere
+  node: ProductionWhere
+}
+
+type ActorActedInRelationship {
+  cursor: String!
+  node: Production!
+  properties: ActedIn!
+}
+
+type ActorEdge {
+  cursor: String!
+  node: Actor!
+}
+
+input ActorOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more ActorSort objects to sort Actors by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [ActorSort!]
+}
+
+"""
+Fields to sort Actors by. The order in which sorts are applied is not guaranteed when specifying many fields in one ActorSort object.
+"""
+input ActorSort {
+  name: SortDirection
+}
+
+input ActorWhere {
+  AND: [ActorWhere!]
+  NOT: ActorWhere
+  OR: [ActorWhere!]
+  """
+  Return Actors where all of the related ActorActedInConnections match this filter
+  """
+  actedInConnection_ALL: ActorActedInConnectionWhere
+  """
+  Return Actors where none of the related ActorActedInConnections match this filter
+  """
+  actedInConnection_NONE: ActorActedInConnectionWhere
+  """
+  Return Actors where one of the related ActorActedInConnections match this filter
+  """
+  actedInConnection_SINGLE: ActorActedInConnectionWhere
+  """
+  Return Actors where some of the related ActorActedInConnections match this filter
+  """
+  actedInConnection_SOME: ActorActedInConnectionWhere
+  """Return Actors where all of the related Productions match this filter"""
+  actedIn_ALL: ProductionWhere
+  """Return Actors where none of the related Productions match this filter"""
+  actedIn_NONE: ProductionWhere
+  """Return Actors where one of the related Productions match this filter"""
+  actedIn_SINGLE: ProductionWhere
+  """Return Actors where some of the related Productions match this filter"""
+  actedIn_SOME: ProductionWhere
+  name: String
+  name_CONTAINS: String
+  name_ENDS_WITH: String
+  name_IN: [String!]
+  name_STARTS_WITH: String
+}
+
+type ActorsConnection {
+  edges: [ActorEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+type Movie implements Production {
+  runtime: Int!
+  title: String!
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MovieSort!]
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
+"""
+input MovieSort {
+  runtime: SortDirection
+  title: SortDirection
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  runtime: Int
+  runtime_GT: Int
+  runtime_GTE: Int
+  runtime_IN: [Int!]
+  runtime_LT: Int
+  runtime_LTE: Int
+  title: String
+  title_CONTAINS: String
+  title_ENDS_WITH: String
+  title_IN: [String!]
+  title_STARTS_WITH: String
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+interface Production {
+  title: String!
+}
+
+type ProductionEdge {
+  cursor: String!
+  node: Production!
+}
+
+enum ProductionImplementation {
+  Movie
+  Series
+}
+
+input ProductionOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more ProductionSort objects to sort Productions by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [ProductionSort]
+}
+
+"""
+Fields to sort Productions by. The order in which sorts are applied is not guaranteed when specifying many fields in one ProductionSort object.
+"""
+input ProductionSort {
+  title: SortDirection
+}
+
+input ProductionWhere {
+  AND: [ProductionWhere!]
+  NOT: ProductionWhere
+  OR: [ProductionWhere!]
+  title: String
+  title_CONTAINS: String
+  title_ENDS_WITH: String
+  title_IN: [String!]
+  title_STARTS_WITH: String
+  typename_IN: [ProductionImplementation!]
+}
+
+type ProductionsConnection {
+  edges: [ProductionEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+type Query {
+  actors(options: ActorOptions, where: ActorWhere): [Actor!]!
+  actorsConnection(after: String, first: Int, sort: [ActorSort], where: ActorWhere): ActorsConnection!
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+  productions(options: ProductionOptions, where: ProductionWhere): [Production!]!
+  productionsConnection(after: String, first: Int, sort: [ProductionSort], where: ProductionWhere): ProductionsConnection!
+  series(options: SeriesOptions, where: SeriesWhere): [Series!]!
+  seriesConnection(after: String, first: Int, sort: [SeriesSort], where: SeriesWhere): SeriesConnection!
+}
+
+type Series implements Production {
+  episodes: Int!
+  title: String!
+}
+
+type SeriesConnection {
+  edges: [SeriesEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+type SeriesEdge {
+  cursor: String!
+  node: Series!
+}
+
+input SeriesOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more SeriesSort objects to sort Series by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [SeriesSort!]
+}
+
+"""
+Fields to sort Series by. The order in which sorts are applied is not guaranteed when specifying many fields in one SeriesSort object.
+"""
+input SeriesSort {
+  episodes: SortDirection
+  title: SortDirection
+}
+
+input SeriesWhere {
+  AND: [SeriesWhere!]
+  NOT: SeriesWhere
+  OR: [SeriesWhere!]
+  episodes: Int
+  episodes_GT: Int
+  episodes_GTE: Int
+  episodes_IN: [Int!]
+  episodes_LT: Int
+  episodes_LTE: Int
+  title: String
+  title_CONTAINS: String
+  title_ENDS_WITH: String
+  title_IN: [String!]
+  title_STARTS_WITH: String
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
+
+=== Unions
+
+.Schema
+[source,graphql,schema=true]
+----
+union Search = Movie | Genre
+
+type Genre {
+  id: ID
+}
+
+type Movie {
+  id: ID
+  search: [Search!]! @relationship(type: "SEARCH", direction: OUT)
+  searchNoDirective: Search
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+type Genre {
+  id: ID
+}
+
+type GenreEdge {
+  cursor: String!
+  node: Genre!
+}
+
+input GenreOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more GenreSort objects to sort Genres by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [GenreSort!]
+}
+
+"""
+Fields to sort Genres by. The order in which sorts are applied is not guaranteed when specifying many fields in one GenreSort object.
+"""
+input GenreSort {
+  id: SortDirection
+}
+
+input GenreWhere {
+  AND: [GenreWhere!]
+  NOT: GenreWhere
+  OR: [GenreWhere!]
+  id: ID
+  id_CONTAINS: ID
+  id_ENDS_WITH: ID
+  id_IN: [ID]
+  id_STARTS_WITH: ID
+}
+
+type GenresConnection {
+  edges: [GenreEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+type Movie {
+  id: ID
+  search(directed: Boolean = true, options: QueryOptions, where: SearchWhere): [Search!]!
+  searchConnection(after: String, directed: Boolean = true, first: Int, where: MovieSearchConnectionWhere): MovieSearchConnection!
+  searchNoDirective: Search
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MovieSort!]
+}
+
+type MovieSearchConnection {
+  edges: [MovieSearchRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input MovieSearchConnectionWhere {
+  Genre: MovieSearchGenreConnectionWhere
+  Movie: MovieSearchMovieConnectionWhere
+}
+
+input MovieSearchGenreConnectionWhere {
+  AND: [MovieSearchGenreConnectionWhere!]
+  NOT: MovieSearchGenreConnectionWhere
+  OR: [MovieSearchGenreConnectionWhere!]
+  node: GenreWhere
+}
+
+input MovieSearchMovieConnectionWhere {
+  AND: [MovieSearchMovieConnectionWhere!]
+  NOT: MovieSearchMovieConnectionWhere
+  OR: [MovieSearchMovieConnectionWhere!]
+  node: MovieWhere
+}
+
+type MovieSearchRelationship {
+  cursor: String!
+  node: Search!
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
+"""
+input MovieSort {
+  id: SortDirection
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  id: ID
+  id_CONTAINS: ID
+  id_ENDS_WITH: ID
+  id_IN: [ID]
+  id_STARTS_WITH: ID
+  """
+  Return Movies where all of the related MovieSearchConnections match this filter
+  """
+  searchConnection_ALL: MovieSearchConnectionWhere
+  """
+  Return Movies where none of the related MovieSearchConnections match this filter
+  """
+  searchConnection_NONE: MovieSearchConnectionWhere
+  """
+  Return Movies where one of the related MovieSearchConnections match this filter
+  """
+  searchConnection_SINGLE: MovieSearchConnectionWhere
+  """
+  Return Movies where some of the related MovieSearchConnections match this filter
+  """
+  searchConnection_SOME: MovieSearchConnectionWhere
+  """Return Movies where all of the related Searches match this filter"""
+  search_ALL: SearchWhere
+  """Return Movies where none of the related Searches match this filter"""
+  search_NONE: SearchWhere
+  """Return Movies where one of the related Searches match this filter"""
+  search_SINGLE: SearchWhere
+  """Return Movies where some of the related Searches match this filter"""
+  search_SOME: SearchWhere
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+type Query {
+  genres(options: GenreOptions, where: GenreWhere): [Genre!]!
+  genresConnection(after: String, first: Int, sort: [GenreSort], where: GenreWhere): GenresConnection!
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+  searches(options: QueryOptions, where: SearchWhere): [Search!]!
+}
+
+"""Input type for options that can be specified on a query operation."""
+input QueryOptions {
+  limit: Int
+  offset: Int
+}
+
+union Search = Genre | Movie
+
+input SearchWhere {
+  Genre: GenreWhere
+  Movie: MovieWhere
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
diff --git a/core/src/test/resources/tck-test-files/schema/v2/experimental-schema/directive-preserve.adoc b/core/src/test/resources/tck-test-files/schema/v2/experimental-schema/directive-preserve.adoc
index d97261a2..15e36644 100644
--- a/core/src/test/resources/tck-test-files/schema/v2/experimental-schema/directive-preserve.adoc
+++ b/core/src/test/resources/tck-test-files/schema/v2/experimental-schema/directive-preserve.adoc
@@ -18,7 +18,7 @@ type Movie @preservedTopLevel {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -89,8 +89,6 @@ input MovieWhere {
 
 ----
 
-'''
-
 == Directives on relations preserved
 
 .Schema
@@ -110,7 +108,7 @@ type Genre {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -313,8 +311,6 @@ input MovieWhere {
 
 ----
 
-'''
-
 == Directives on implemented interface relations preserved - field not declared relationship
 
 .Schema
@@ -348,7 +344,7 @@ type Actor {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -712,8 +708,6 @@ input SeriesWhere {
 
 ----
 
-'''
-
 == Directives on base interface preserved
 
 .Schema
@@ -747,7 +741,7 @@ type Actor {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -1111,8 +1105,6 @@ input SeriesWhere {
 
 ----
 
-'''
-
 == Directives on unions preserved
 
 .Schema
@@ -1136,7 +1128,7 @@ type User {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -1384,6 +1376,3 @@ input UserWhere {
 }
 
 ----
-
-'''
-
diff --git a/core/src/test/resources/tck-test-files/schema/v2/experimental-schema/directive-preserve.js.adoc b/core/src/test/resources/tck-test-files/schema/v2/experimental-schema/directive-preserve.js.adoc
new file mode 100644
index 00000000..ac195bb3
--- /dev/null
+++ b/core/src/test/resources/tck-test-files/schema/v2/experimental-schema/directive-preserve.js.adoc
@@ -0,0 +1,1510 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= Directive-preserve
+
+== Custom directives preserved
+
+.Schema
+[source,graphql,schema=true]
+----
+directive @preservedTopLevel(string: String, int: Int, float: Float, boolean: Boolean) on OBJECT
+
+directive @preservedFieldLevel(string: String, int: Int, float: Float, boolean: Boolean) on FIELD_DEFINITION
+
+type Movie @preservedTopLevel {
+  id: ID @preservedFieldLevel(string: "str", int: 12, float: 1.2, boolean: true)
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+directive @preservedFieldLevel(boolean: Boolean, float: Float, int: Int, string: String) on FIELD_DEFINITION
+
+directive @preservedTopLevel(boolean: Boolean, float: Float, int: Int, string: String) on OBJECT
+
+type Movie @preservedTopLevel {
+  id: ID @preservedFieldLevel(string: "str", int: 12, float: 1.2, boolean: true)
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MovieSort!]
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
+"""
+input MovieSort {
+  id: SortDirection
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  id: ID
+  id_CONTAINS: ID
+  id_ENDS_WITH: ID
+  id_IN: [ID]
+  id_STARTS_WITH: ID
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+type Query {
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
+
+== Directives on relations preserved
+
+.Schema
+[source,graphql,schema=true]
+----
+type Movie {
+  title: String
+  year: Int
+  imdbRating: Float
+  genres: [Genre!]! @relationship(type: "IN_GENRE", direction: OUT) @deprecated(reason: "Do not use")
+}
+
+type Genre {
+  name: String
+  movies: [Movie!]! @relationship(type: "IN_GENRE", direction: IN)
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+type Genre {
+  movies(directed: Boolean = true, options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, directed: Boolean = true, first: Int, sort: [GenreMoviesConnectionSort!], where: GenreMoviesConnectionWhere): GenreMoviesConnection!
+  name: String
+}
+
+type GenreEdge {
+  cursor: String!
+  node: Genre!
+}
+
+type GenreMoviesConnection {
+  edges: [GenreMoviesRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input GenreMoviesConnectionSort {
+  node: MovieSort
+}
+
+input GenreMoviesConnectionWhere {
+  AND: [GenreMoviesConnectionWhere!]
+  NOT: GenreMoviesConnectionWhere
+  OR: [GenreMoviesConnectionWhere!]
+  node: MovieWhere
+}
+
+type GenreMoviesRelationship {
+  cursor: String!
+  node: Movie!
+}
+
+input GenreOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more GenreSort objects to sort Genres by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [GenreSort!]
+}
+
+"""
+Fields to sort Genres by. The order in which sorts are applied is not guaranteed when specifying many fields in one GenreSort object.
+"""
+input GenreSort {
+  name: SortDirection
+}
+
+input GenreWhere {
+  AND: [GenreWhere!]
+  NOT: GenreWhere
+  OR: [GenreWhere!]
+  """
+  Return Genres where all of the related GenreMoviesConnections match this filter
+  """
+  moviesConnection_ALL: GenreMoviesConnectionWhere
+  """
+  Return Genres where none of the related GenreMoviesConnections match this filter
+  """
+  moviesConnection_NONE: GenreMoviesConnectionWhere
+  """
+  Return Genres where one of the related GenreMoviesConnections match this filter
+  """
+  moviesConnection_SINGLE: GenreMoviesConnectionWhere
+  """
+  Return Genres where some of the related GenreMoviesConnections match this filter
+  """
+  moviesConnection_SOME: GenreMoviesConnectionWhere
+  """Return Genres where all of the related Movies match this filter"""
+  movies_ALL: MovieWhere
+  """Return Genres where none of the related Movies match this filter"""
+  movies_NONE: MovieWhere
+  """Return Genres where one of the related Movies match this filter"""
+  movies_SINGLE: MovieWhere
+  """Return Genres where some of the related Movies match this filter"""
+  movies_SOME: MovieWhere
+  name: String
+  name_CONTAINS: String
+  name_ENDS_WITH: String
+  name_IN: [String]
+  name_STARTS_WITH: String
+}
+
+type GenresConnection {
+  edges: [GenreEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+type Movie {
+  genres(directed: Boolean = true, options: GenreOptions, where: GenreWhere): [Genre!]! @deprecated(reason: "Do not use")
+  genresConnection(after: String, directed: Boolean = true, first: Int, sort: [MovieGenresConnectionSort!], where: MovieGenresConnectionWhere): MovieGenresConnection! @deprecated(reason: "Do not use")
+  imdbRating: Float
+  title: String
+  year: Int
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+type MovieGenresConnection {
+  edges: [MovieGenresRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input MovieGenresConnectionSort {
+  node: GenreSort
+}
+
+input MovieGenresConnectionWhere {
+  AND: [MovieGenresConnectionWhere!]
+  NOT: MovieGenresConnectionWhere
+  OR: [MovieGenresConnectionWhere!]
+  node: GenreWhere
+}
+
+type MovieGenresRelationship {
+  cursor: String!
+  node: Genre!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MovieSort!]
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
+"""
+input MovieSort {
+  imdbRating: SortDirection
+  title: SortDirection
+  year: SortDirection
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  """
+  Return Movies where all of the related MovieGenresConnections match this filter
+  """
+  genresConnection_ALL: MovieGenresConnectionWhere @deprecated(reason: "Do not use")
+  """
+  Return Movies where none of the related MovieGenresConnections match this filter
+  """
+  genresConnection_NONE: MovieGenresConnectionWhere @deprecated(reason: "Do not use")
+  """
+  Return Movies where one of the related MovieGenresConnections match this filter
+  """
+  genresConnection_SINGLE: MovieGenresConnectionWhere @deprecated(reason: "Do not use")
+  """
+  Return Movies where some of the related MovieGenresConnections match this filter
+  """
+  genresConnection_SOME: MovieGenresConnectionWhere @deprecated(reason: "Do not use")
+  """Return Movies where all of the related Genres match this filter"""
+  genres_ALL: GenreWhere @deprecated(reason: "Do not use")
+  """Return Movies where none of the related Genres match this filter"""
+  genres_NONE: GenreWhere @deprecated(reason: "Do not use")
+  """Return Movies where one of the related Genres match this filter"""
+  genres_SINGLE: GenreWhere @deprecated(reason: "Do not use")
+  """Return Movies where some of the related Genres match this filter"""
+  genres_SOME: GenreWhere @deprecated(reason: "Do not use")
+  imdbRating: Float
+  imdbRating_GT: Float
+  imdbRating_GTE: Float
+  imdbRating_IN: [Float]
+  imdbRating_LT: Float
+  imdbRating_LTE: Float
+  title: String
+  title_CONTAINS: String
+  title_ENDS_WITH: String
+  title_IN: [String]
+  title_STARTS_WITH: String
+  year: Int
+  year_GT: Int
+  year_GTE: Int
+  year_IN: [Int]
+  year_LT: Int
+  year_LTE: Int
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+type Query {
+  genres(options: GenreOptions, where: GenreWhere): [Genre!]!
+  genresConnection(after: String, first: Int, sort: [GenreSort], where: GenreWhere): GenresConnection!
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
+
+== Directives on implemented interface relations preserved - field not declared relationship
+
+.Schema
+[source,graphql,schema=true]
+----
+interface Production {
+  title: String!
+  actors: [Actor!]!
+}
+
+type Movie implements Production {
+  title: String!
+  actors: [Actor!]! @relationship(type: "ACTED_IN", direction: IN, properties: "ActedIn") @deprecated(reason: "Do not use")
+  runtime: Int!
+}
+
+type Series implements Production {
+  title: String!
+  actors: [Actor!]! @relationship(type: "ACTED_IN", direction: IN, properties: "ActedIn")
+  episodes: Int!
+}
+
+type ActedIn @relationshipProperties {
+  role: String!
+}
+
+type Actor {
+  name: String!
+  actedIn: [Production!]! @relationship(type: "ACTED_IN", direction: OUT, properties: "ActedIn")
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+"""
+The edge properties for the following fields:
+* Movie.actors
+* Series.actors
+* Actor.actedIn
+"""
+type ActedIn {
+  role: String!
+}
+
+input ActedInSort {
+  role: SortDirection
+}
+
+input ActedInWhere {
+  AND: [ActedInWhere!]
+  NOT: ActedInWhere
+  OR: [ActedInWhere!]
+  role: String
+  role_CONTAINS: String
+  role_ENDS_WITH: String
+  role_IN: [String!]
+  role_STARTS_WITH: String
+}
+
+type Actor {
+  actedIn(directed: Boolean = true, options: ProductionOptions, where: ProductionWhere): [Production!]!
+  actedInConnection(after: String, directed: Boolean = true, first: Int, sort: [ActorActedInConnectionSort!], where: ActorActedInConnectionWhere): ActorActedInConnection!
+  name: String!
+}
+
+type ActorActedInConnection {
+  edges: [ActorActedInRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input ActorActedInConnectionSort {
+  edge: ActedInSort
+  node: ProductionSort
+}
+
+input ActorActedInConnectionWhere {
+  AND: [ActorActedInConnectionWhere!]
+  NOT: ActorActedInConnectionWhere
+  OR: [ActorActedInConnectionWhere!]
+  edge: ActedInWhere
+  node: ProductionWhere
+}
+
+type ActorActedInRelationship {
+  cursor: String!
+  node: Production!
+  properties: ActedIn!
+}
+
+type ActorEdge {
+  cursor: String!
+  node: Actor!
+}
+
+input ActorOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more ActorSort objects to sort Actors by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [ActorSort!]
+}
+
+"""
+Fields to sort Actors by. The order in which sorts are applied is not guaranteed when specifying many fields in one ActorSort object.
+"""
+input ActorSort {
+  name: SortDirection
+}
+
+input ActorWhere {
+  AND: [ActorWhere!]
+  NOT: ActorWhere
+  OR: [ActorWhere!]
+  """
+  Return Actors where all of the related ActorActedInConnections match this filter
+  """
+  actedInConnection_ALL: ActorActedInConnectionWhere
+  """
+  Return Actors where none of the related ActorActedInConnections match this filter
+  """
+  actedInConnection_NONE: ActorActedInConnectionWhere
+  """
+  Return Actors where one of the related ActorActedInConnections match this filter
+  """
+  actedInConnection_SINGLE: ActorActedInConnectionWhere
+  """
+  Return Actors where some of the related ActorActedInConnections match this filter
+  """
+  actedInConnection_SOME: ActorActedInConnectionWhere
+  """Return Actors where all of the related Productions match this filter"""
+  actedIn_ALL: ProductionWhere
+  """Return Actors where none of the related Productions match this filter"""
+  actedIn_NONE: ProductionWhere
+  """Return Actors where one of the related Productions match this filter"""
+  actedIn_SINGLE: ProductionWhere
+  """Return Actors where some of the related Productions match this filter"""
+  actedIn_SOME: ProductionWhere
+  name: String
+  name_CONTAINS: String
+  name_ENDS_WITH: String
+  name_IN: [String!]
+  name_STARTS_WITH: String
+}
+
+type ActorsConnection {
+  edges: [ActorEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+type Movie implements Production {
+  actors(directed: Boolean = true, options: ActorOptions, where: ActorWhere): [Actor!]! @deprecated(reason: "Do not use")
+  actorsConnection(after: String, directed: Boolean = true, first: Int, sort: [MovieActorsConnectionSort!], where: MovieActorsConnectionWhere): MovieActorsConnection! @deprecated(reason: "Do not use")
+  runtime: Int!
+  title: String!
+}
+
+type MovieActorsConnection {
+  edges: [MovieActorsRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input MovieActorsConnectionSort {
+  edge: ActedInSort
+  node: ActorSort
+}
+
+input MovieActorsConnectionWhere {
+  AND: [MovieActorsConnectionWhere!]
+  NOT: MovieActorsConnectionWhere
+  OR: [MovieActorsConnectionWhere!]
+  edge: ActedInWhere
+  node: ActorWhere
+}
+
+type MovieActorsRelationship {
+  cursor: String!
+  node: Actor!
+  properties: ActedIn!
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MovieSort!]
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
+"""
+input MovieSort {
+  runtime: SortDirection
+  title: SortDirection
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  """
+  Return Movies where all of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_ALL: MovieActorsConnectionWhere @deprecated(reason: "Do not use")
+  """
+  Return Movies where none of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_NONE: MovieActorsConnectionWhere @deprecated(reason: "Do not use")
+  """
+  Return Movies where one of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SINGLE: MovieActorsConnectionWhere @deprecated(reason: "Do not use")
+  """
+  Return Movies where some of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SOME: MovieActorsConnectionWhere @deprecated(reason: "Do not use")
+  """Return Movies where all of the related Actors match this filter"""
+  actors_ALL: ActorWhere @deprecated(reason: "Do not use")
+  """Return Movies where none of the related Actors match this filter"""
+  actors_NONE: ActorWhere @deprecated(reason: "Do not use")
+  """Return Movies where one of the related Actors match this filter"""
+  actors_SINGLE: ActorWhere @deprecated(reason: "Do not use")
+  """Return Movies where some of the related Actors match this filter"""
+  actors_SOME: ActorWhere @deprecated(reason: "Do not use")
+  runtime: Int
+  runtime_GT: Int
+  runtime_GTE: Int
+  runtime_IN: [Int!]
+  runtime_LT: Int
+  runtime_LTE: Int
+  title: String
+  title_CONTAINS: String
+  title_ENDS_WITH: String
+  title_IN: [String!]
+  title_STARTS_WITH: String
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+interface Production {
+  actors: [Actor!]!
+  title: String!
+}
+
+type ProductionEdge {
+  cursor: String!
+  node: Production!
+}
+
+enum ProductionImplementation {
+  Movie
+  Series
+}
+
+input ProductionOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more ProductionSort objects to sort Productions by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [ProductionSort]
+}
+
+"""
+Fields to sort Productions by. The order in which sorts are applied is not guaranteed when specifying many fields in one ProductionSort object.
+"""
+input ProductionSort {
+  title: SortDirection
+}
+
+input ProductionWhere {
+  AND: [ProductionWhere!]
+  NOT: ProductionWhere
+  OR: [ProductionWhere!]
+  title: String
+  title_CONTAINS: String
+  title_ENDS_WITH: String
+  title_IN: [String!]
+  title_STARTS_WITH: String
+  typename_IN: [ProductionImplementation!]
+}
+
+type ProductionsConnection {
+  edges: [ProductionEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+type Query {
+  actors(options: ActorOptions, where: ActorWhere): [Actor!]!
+  actorsConnection(after: String, first: Int, sort: [ActorSort], where: ActorWhere): ActorsConnection!
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+  productions(options: ProductionOptions, where: ProductionWhere): [Production!]!
+  productionsConnection(after: String, first: Int, sort: [ProductionSort], where: ProductionWhere): ProductionsConnection!
+  series(options: SeriesOptions, where: SeriesWhere): [Series!]!
+  seriesConnection(after: String, first: Int, sort: [SeriesSort], where: SeriesWhere): SeriesConnection!
+}
+
+type Series implements Production {
+  actors(directed: Boolean = true, options: ActorOptions, where: ActorWhere): [Actor!]!
+  actorsConnection(after: String, directed: Boolean = true, first: Int, sort: [SeriesActorsConnectionSort!], where: SeriesActorsConnectionWhere): SeriesActorsConnection!
+  episodes: Int!
+  title: String!
+}
+
+type SeriesActorsConnection {
+  edges: [SeriesActorsRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input SeriesActorsConnectionSort {
+  edge: ActedInSort
+  node: ActorSort
+}
+
+input SeriesActorsConnectionWhere {
+  AND: [SeriesActorsConnectionWhere!]
+  NOT: SeriesActorsConnectionWhere
+  OR: [SeriesActorsConnectionWhere!]
+  edge: ActedInWhere
+  node: ActorWhere
+}
+
+type SeriesActorsRelationship {
+  cursor: String!
+  node: Actor!
+  properties: ActedIn!
+}
+
+type SeriesConnection {
+  edges: [SeriesEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+type SeriesEdge {
+  cursor: String!
+  node: Series!
+}
+
+input SeriesOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more SeriesSort objects to sort Series by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [SeriesSort!]
+}
+
+"""
+Fields to sort Series by. The order in which sorts are applied is not guaranteed when specifying many fields in one SeriesSort object.
+"""
+input SeriesSort {
+  episodes: SortDirection
+  title: SortDirection
+}
+
+input SeriesWhere {
+  AND: [SeriesWhere!]
+  NOT: SeriesWhere
+  OR: [SeriesWhere!]
+  """
+  Return Series where all of the related SeriesActorsConnections match this filter
+  """
+  actorsConnection_ALL: SeriesActorsConnectionWhere
+  """
+  Return Series where none of the related SeriesActorsConnections match this filter
+  """
+  actorsConnection_NONE: SeriesActorsConnectionWhere
+  """
+  Return Series where one of the related SeriesActorsConnections match this filter
+  """
+  actorsConnection_SINGLE: SeriesActorsConnectionWhere
+  """
+  Return Series where some of the related SeriesActorsConnections match this filter
+  """
+  actorsConnection_SOME: SeriesActorsConnectionWhere
+  """Return Series where all of the related Actors match this filter"""
+  actors_ALL: ActorWhere
+  """Return Series where none of the related Actors match this filter"""
+  actors_NONE: ActorWhere
+  """Return Series where one of the related Actors match this filter"""
+  actors_SINGLE: ActorWhere
+  """Return Series where some of the related Actors match this filter"""
+  actors_SOME: ActorWhere
+  episodes: Int
+  episodes_GT: Int
+  episodes_GTE: Int
+  episodes_IN: [Int!]
+  episodes_LT: Int
+  episodes_LTE: Int
+  title: String
+  title_CONTAINS: String
+  title_ENDS_WITH: String
+  title_IN: [String!]
+  title_STARTS_WITH: String
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
+
+== Directives on base interface preserved
+
+.Schema
+[source,graphql,schema=true]
+----
+interface Production {
+  title: String!
+  actors: [Actor!]! @deprecated(reason: "Do not use")
+}
+
+type Movie implements Production {
+  title: String!
+  actors: [Actor!]! @relationship(type: "ACTED_IN", direction: IN, properties: "ActedIn")
+  runtime: Int!
+}
+
+type Series implements Production {
+  title: String!
+  actors: [Actor!]! @relationship(type: "ACTED_IN", direction: IN, properties: "ActedIn")
+  episodes: Int!
+}
+
+type ActedIn @relationshipProperties {
+  role: String!
+}
+
+type Actor {
+  name: String!
+  actedIn: [Production!]! @relationship(type: "ACTED_IN", direction: OUT, properties: "ActedIn")
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+"""
+The edge properties for the following fields:
+* Movie.actors
+* Series.actors
+* Actor.actedIn
+"""
+type ActedIn {
+  role: String!
+}
+
+input ActedInSort {
+  role: SortDirection
+}
+
+input ActedInWhere {
+  AND: [ActedInWhere!]
+  NOT: ActedInWhere
+  OR: [ActedInWhere!]
+  role: String
+  role_CONTAINS: String
+  role_ENDS_WITH: String
+  role_IN: [String!]
+  role_STARTS_WITH: String
+}
+
+type Actor {
+  actedIn(directed: Boolean = true, options: ProductionOptions, where: ProductionWhere): [Production!]!
+  actedInConnection(after: String, directed: Boolean = true, first: Int, sort: [ActorActedInConnectionSort!], where: ActorActedInConnectionWhere): ActorActedInConnection!
+  name: String!
+}
+
+type ActorActedInConnection {
+  edges: [ActorActedInRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input ActorActedInConnectionSort {
+  edge: ActedInSort
+  node: ProductionSort
+}
+
+input ActorActedInConnectionWhere {
+  AND: [ActorActedInConnectionWhere!]
+  NOT: ActorActedInConnectionWhere
+  OR: [ActorActedInConnectionWhere!]
+  edge: ActedInWhere
+  node: ProductionWhere
+}
+
+type ActorActedInRelationship {
+  cursor: String!
+  node: Production!
+  properties: ActedIn!
+}
+
+type ActorEdge {
+  cursor: String!
+  node: Actor!
+}
+
+input ActorOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more ActorSort objects to sort Actors by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [ActorSort!]
+}
+
+"""
+Fields to sort Actors by. The order in which sorts are applied is not guaranteed when specifying many fields in one ActorSort object.
+"""
+input ActorSort {
+  name: SortDirection
+}
+
+input ActorWhere {
+  AND: [ActorWhere!]
+  NOT: ActorWhere
+  OR: [ActorWhere!]
+  """
+  Return Actors where all of the related ActorActedInConnections match this filter
+  """
+  actedInConnection_ALL: ActorActedInConnectionWhere
+  """
+  Return Actors where none of the related ActorActedInConnections match this filter
+  """
+  actedInConnection_NONE: ActorActedInConnectionWhere
+  """
+  Return Actors where one of the related ActorActedInConnections match this filter
+  """
+  actedInConnection_SINGLE: ActorActedInConnectionWhere
+  """
+  Return Actors where some of the related ActorActedInConnections match this filter
+  """
+  actedInConnection_SOME: ActorActedInConnectionWhere
+  """Return Actors where all of the related Productions match this filter"""
+  actedIn_ALL: ProductionWhere
+  """Return Actors where none of the related Productions match this filter"""
+  actedIn_NONE: ProductionWhere
+  """Return Actors where one of the related Productions match this filter"""
+  actedIn_SINGLE: ProductionWhere
+  """Return Actors where some of the related Productions match this filter"""
+  actedIn_SOME: ProductionWhere
+  name: String
+  name_CONTAINS: String
+  name_ENDS_WITH: String
+  name_IN: [String!]
+  name_STARTS_WITH: String
+}
+
+type ActorsConnection {
+  edges: [ActorEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+type Movie implements Production {
+  actors(directed: Boolean = true, options: ActorOptions, where: ActorWhere): [Actor!]!
+  actorsConnection(after: String, directed: Boolean = true, first: Int, sort: [MovieActorsConnectionSort!], where: MovieActorsConnectionWhere): MovieActorsConnection!
+  runtime: Int!
+  title: String!
+}
+
+type MovieActorsConnection {
+  edges: [MovieActorsRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input MovieActorsConnectionSort {
+  edge: ActedInSort
+  node: ActorSort
+}
+
+input MovieActorsConnectionWhere {
+  AND: [MovieActorsConnectionWhere!]
+  NOT: MovieActorsConnectionWhere
+  OR: [MovieActorsConnectionWhere!]
+  edge: ActedInWhere
+  node: ActorWhere
+}
+
+type MovieActorsRelationship {
+  cursor: String!
+  node: Actor!
+  properties: ActedIn!
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MovieSort!]
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
+"""
+input MovieSort {
+  runtime: SortDirection
+  title: SortDirection
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  """
+  Return Movies where all of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_ALL: MovieActorsConnectionWhere
+  """
+  Return Movies where none of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_NONE: MovieActorsConnectionWhere
+  """
+  Return Movies where one of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SINGLE: MovieActorsConnectionWhere
+  """
+  Return Movies where some of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SOME: MovieActorsConnectionWhere
+  """Return Movies where all of the related Actors match this filter"""
+  actors_ALL: ActorWhere
+  """Return Movies where none of the related Actors match this filter"""
+  actors_NONE: ActorWhere
+  """Return Movies where one of the related Actors match this filter"""
+  actors_SINGLE: ActorWhere
+  """Return Movies where some of the related Actors match this filter"""
+  actors_SOME: ActorWhere
+  runtime: Int
+  runtime_GT: Int
+  runtime_GTE: Int
+  runtime_IN: [Int!]
+  runtime_LT: Int
+  runtime_LTE: Int
+  title: String
+  title_CONTAINS: String
+  title_ENDS_WITH: String
+  title_IN: [String!]
+  title_STARTS_WITH: String
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+interface Production {
+  actors: [Actor!]! @deprecated(reason: "Do not use")
+  title: String!
+}
+
+type ProductionEdge {
+  cursor: String!
+  node: Production!
+}
+
+enum ProductionImplementation {
+  Movie
+  Series
+}
+
+input ProductionOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more ProductionSort objects to sort Productions by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [ProductionSort]
+}
+
+"""
+Fields to sort Productions by. The order in which sorts are applied is not guaranteed when specifying many fields in one ProductionSort object.
+"""
+input ProductionSort {
+  title: SortDirection
+}
+
+input ProductionWhere {
+  AND: [ProductionWhere!]
+  NOT: ProductionWhere
+  OR: [ProductionWhere!]
+  title: String
+  title_CONTAINS: String
+  title_ENDS_WITH: String
+  title_IN: [String!]
+  title_STARTS_WITH: String
+  typename_IN: [ProductionImplementation!]
+}
+
+type ProductionsConnection {
+  edges: [ProductionEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+type Query {
+  actors(options: ActorOptions, where: ActorWhere): [Actor!]!
+  actorsConnection(after: String, first: Int, sort: [ActorSort], where: ActorWhere): ActorsConnection!
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+  productions(options: ProductionOptions, where: ProductionWhere): [Production!]!
+  productionsConnection(after: String, first: Int, sort: [ProductionSort], where: ProductionWhere): ProductionsConnection!
+  series(options: SeriesOptions, where: SeriesWhere): [Series!]!
+  seriesConnection(after: String, first: Int, sort: [SeriesSort], where: SeriesWhere): SeriesConnection!
+}
+
+type Series implements Production {
+  actors(directed: Boolean = true, options: ActorOptions, where: ActorWhere): [Actor!]!
+  actorsConnection(after: String, directed: Boolean = true, first: Int, sort: [SeriesActorsConnectionSort!], where: SeriesActorsConnectionWhere): SeriesActorsConnection!
+  episodes: Int!
+  title: String!
+}
+
+type SeriesActorsConnection {
+  edges: [SeriesActorsRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input SeriesActorsConnectionSort {
+  edge: ActedInSort
+  node: ActorSort
+}
+
+input SeriesActorsConnectionWhere {
+  AND: [SeriesActorsConnectionWhere!]
+  NOT: SeriesActorsConnectionWhere
+  OR: [SeriesActorsConnectionWhere!]
+  edge: ActedInWhere
+  node: ActorWhere
+}
+
+type SeriesActorsRelationship {
+  cursor: String!
+  node: Actor!
+  properties: ActedIn!
+}
+
+type SeriesConnection {
+  edges: [SeriesEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+type SeriesEdge {
+  cursor: String!
+  node: Series!
+}
+
+input SeriesOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more SeriesSort objects to sort Series by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [SeriesSort!]
+}
+
+"""
+Fields to sort Series by. The order in which sorts are applied is not guaranteed when specifying many fields in one SeriesSort object.
+"""
+input SeriesSort {
+  episodes: SortDirection
+  title: SortDirection
+}
+
+input SeriesWhere {
+  AND: [SeriesWhere!]
+  NOT: SeriesWhere
+  OR: [SeriesWhere!]
+  """
+  Return Series where all of the related SeriesActorsConnections match this filter
+  """
+  actorsConnection_ALL: SeriesActorsConnectionWhere
+  """
+  Return Series where none of the related SeriesActorsConnections match this filter
+  """
+  actorsConnection_NONE: SeriesActorsConnectionWhere
+  """
+  Return Series where one of the related SeriesActorsConnections match this filter
+  """
+  actorsConnection_SINGLE: SeriesActorsConnectionWhere
+  """
+  Return Series where some of the related SeriesActorsConnections match this filter
+  """
+  actorsConnection_SOME: SeriesActorsConnectionWhere
+  """Return Series where all of the related Actors match this filter"""
+  actors_ALL: ActorWhere
+  """Return Series where none of the related Actors match this filter"""
+  actors_NONE: ActorWhere
+  """Return Series where one of the related Actors match this filter"""
+  actors_SINGLE: ActorWhere
+  """Return Series where some of the related Actors match this filter"""
+  actors_SOME: ActorWhere
+  episodes: Int
+  episodes_GT: Int
+  episodes_GTE: Int
+  episodes_IN: [Int!]
+  episodes_LT: Int
+  episodes_LTE: Int
+  title: String
+  title_CONTAINS: String
+  title_ENDS_WITH: String
+  title_IN: [String!]
+  title_STARTS_WITH: String
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
+
+== Directives on unions preserved
+
+.Schema
+[source,graphql,schema=true]
+----
+union Content = Blog | Post
+
+type Blog {
+  title: String
+  posts: [Post!]! @relationship(type: "HAS_POST", direction: OUT)
+}
+
+type Post {
+  content: String @deprecated(reason: "Do not use post.content")
+}
+
+type User {
+  name: String
+  content: [Content!]! @relationship(type: "HAS_CONTENT", direction: OUT) @deprecated(reason: "Do not use user.content")
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+type Blog {
+  posts(directed: Boolean = true, options: PostOptions, where: PostWhere): [Post!]!
+  postsConnection(after: String, directed: Boolean = true, first: Int, sort: [BlogPostsConnectionSort!], where: BlogPostsConnectionWhere): BlogPostsConnection!
+  title: String
+}
+
+type BlogEdge {
+  cursor: String!
+  node: Blog!
+}
+
+input BlogOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more BlogSort objects to sort Blogs by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [BlogSort!]
+}
+
+type BlogPostsConnection {
+  edges: [BlogPostsRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input BlogPostsConnectionSort {
+  node: PostSort
+}
+
+input BlogPostsConnectionWhere {
+  AND: [BlogPostsConnectionWhere!]
+  NOT: BlogPostsConnectionWhere
+  OR: [BlogPostsConnectionWhere!]
+  node: PostWhere
+}
+
+type BlogPostsRelationship {
+  cursor: String!
+  node: Post!
+}
+
+"""
+Fields to sort Blogs by. The order in which sorts are applied is not guaranteed when specifying many fields in one BlogSort object.
+"""
+input BlogSort {
+  title: SortDirection
+}
+
+input BlogWhere {
+  AND: [BlogWhere!]
+  NOT: BlogWhere
+  OR: [BlogWhere!]
+  """
+  Return Blogs where all of the related BlogPostsConnections match this filter
+  """
+  postsConnection_ALL: BlogPostsConnectionWhere
+  """
+  Return Blogs where none of the related BlogPostsConnections match this filter
+  """
+  postsConnection_NONE: BlogPostsConnectionWhere
+  """
+  Return Blogs where one of the related BlogPostsConnections match this filter
+  """
+  postsConnection_SINGLE: BlogPostsConnectionWhere
+  """
+  Return Blogs where some of the related BlogPostsConnections match this filter
+  """
+  postsConnection_SOME: BlogPostsConnectionWhere
+  """Return Blogs where all of the related Posts match this filter"""
+  posts_ALL: PostWhere
+  """Return Blogs where none of the related Posts match this filter"""
+  posts_NONE: PostWhere
+  """Return Blogs where one of the related Posts match this filter"""
+  posts_SINGLE: PostWhere
+  """Return Blogs where some of the related Posts match this filter"""
+  posts_SOME: PostWhere
+  title: String
+  title_CONTAINS: String
+  title_ENDS_WITH: String
+  title_IN: [String]
+  title_STARTS_WITH: String
+}
+
+type BlogsConnection {
+  edges: [BlogEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+union Content = Blog | Post
+
+input ContentWhere {
+  Blog: BlogWhere
+  Post: PostWhere
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+type Post {
+  content: String @deprecated(reason: "Do not use post.content")
+}
+
+type PostEdge {
+  cursor: String!
+  node: Post!
+}
+
+input PostOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more PostSort objects to sort Posts by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [PostSort!]
+}
+
+"""
+Fields to sort Posts by. The order in which sorts are applied is not guaranteed when specifying many fields in one PostSort object.
+"""
+input PostSort {
+  content: SortDirection @deprecated(reason: "Do not use post.content")
+}
+
+input PostWhere {
+  AND: [PostWhere!]
+  NOT: PostWhere
+  OR: [PostWhere!]
+  content: String @deprecated(reason: "Do not use post.content")
+  content_CONTAINS: String @deprecated(reason: "Do not use post.content")
+  content_ENDS_WITH: String @deprecated(reason: "Do not use post.content")
+  content_IN: [String] @deprecated(reason: "Do not use post.content")
+  content_STARTS_WITH: String @deprecated(reason: "Do not use post.content")
+}
+
+type PostsConnection {
+  edges: [PostEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+type Query {
+  blogs(options: BlogOptions, where: BlogWhere): [Blog!]!
+  blogsConnection(after: String, first: Int, sort: [BlogSort], where: BlogWhere): BlogsConnection!
+  contents(options: QueryOptions, where: ContentWhere): [Content!]!
+  posts(options: PostOptions, where: PostWhere): [Post!]!
+  postsConnection(after: String, first: Int, sort: [PostSort], where: PostWhere): PostsConnection!
+  users(options: UserOptions, where: UserWhere): [User!]!
+  usersConnection(after: String, first: Int, sort: [UserSort], where: UserWhere): UsersConnection!
+}
+
+"""Input type for options that can be specified on a query operation."""
+input QueryOptions {
+  limit: Int
+  offset: Int
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+
+type User {
+  content(directed: Boolean = true, options: QueryOptions, where: ContentWhere): [Content!]! @deprecated(reason: "Do not use user.content")
+  contentConnection(after: String, directed: Boolean = true, first: Int, where: UserContentConnectionWhere): UserContentConnection! @deprecated(reason: "Do not use user.content")
+  name: String
+}
+
+input UserContentBlogConnectionWhere {
+  AND: [UserContentBlogConnectionWhere!]
+  NOT: UserContentBlogConnectionWhere
+  OR: [UserContentBlogConnectionWhere!]
+  node: BlogWhere
+}
+
+type UserContentConnection {
+  edges: [UserContentRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input UserContentConnectionWhere {
+  Blog: UserContentBlogConnectionWhere
+  Post: UserContentPostConnectionWhere
+}
+
+input UserContentPostConnectionWhere {
+  AND: [UserContentPostConnectionWhere!]
+  NOT: UserContentPostConnectionWhere
+  OR: [UserContentPostConnectionWhere!]
+  node: PostWhere
+}
+
+type UserContentRelationship {
+  cursor: String!
+  node: Content!
+}
+
+type UserEdge {
+  cursor: String!
+  node: User!
+}
+
+input UserOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more UserSort objects to sort Users by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [UserSort!]
+}
+
+"""
+Fields to sort Users by. The order in which sorts are applied is not guaranteed when specifying many fields in one UserSort object.
+"""
+input UserSort {
+  name: SortDirection
+}
+
+input UserWhere {
+  AND: [UserWhere!]
+  NOT: UserWhere
+  OR: [UserWhere!]
+  """
+  Return Users where all of the related UserContentConnections match this filter
+  """
+  contentConnection_ALL: UserContentConnectionWhere @deprecated(reason: "Do not use user.content")
+  """
+  Return Users where none of the related UserContentConnections match this filter
+  """
+  contentConnection_NONE: UserContentConnectionWhere @deprecated(reason: "Do not use user.content")
+  """
+  Return Users where one of the related UserContentConnections match this filter
+  """
+  contentConnection_SINGLE: UserContentConnectionWhere @deprecated(reason: "Do not use user.content")
+  """
+  Return Users where some of the related UserContentConnections match this filter
+  """
+  contentConnection_SOME: UserContentConnectionWhere @deprecated(reason: "Do not use user.content")
+  """Return Users where all of the related Contents match this filter"""
+  content_ALL: ContentWhere @deprecated(reason: "Do not use user.content")
+  """Return Users where none of the related Contents match this filter"""
+  content_NONE: ContentWhere @deprecated(reason: "Do not use user.content")
+  """Return Users where one of the related Contents match this filter"""
+  content_SINGLE: ContentWhere @deprecated(reason: "Do not use user.content")
+  """Return Users where some of the related Contents match this filter"""
+  content_SOME: ContentWhere @deprecated(reason: "Do not use user.content")
+  name: String
+  name_CONTAINS: String
+  name_ENDS_WITH: String
+  name_IN: [String]
+  name_STARTS_WITH: String
+}
+
+type UsersConnection {
+  edges: [UserEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+----
diff --git a/core/src/test/resources/tck-test-files/schema/v2/experimental-schema/directives/customResolver.adoc b/core/src/test/resources/tck-test-files/schema/v2/experimental-schema/directives/customResolver.adoc
index 0a01c85d..21dcbd55 100644
--- a/core/src/test/resources/tck-test-files/schema/v2/experimental-schema/directives/customResolver.adoc
+++ b/core/src/test/resources/tck-test-files/schema/v2/experimental-schema/directives/customResolver.adoc
@@ -22,7 +22,7 @@ type User implements UserInterface {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -149,6 +149,3 @@ input UserWhere {
 }
 
 ----
-
-'''
-
diff --git a/core/src/test/resources/tck-test-files/schema/v2/experimental-schema/directives/customResolver.js.adoc b/core/src/test/resources/tck-test-files/schema/v2/experimental-schema/directives/customResolver.js.adoc
new file mode 100644
index 00000000..c409a002
--- /dev/null
+++ b/core/src/test/resources/tck-test-files/schema/v2/experimental-schema/directives/customResolver.js.adoc
@@ -0,0 +1,159 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= @customResolver directive
+
+== passes fields directly through with no generation
+
+.Schema
+[source,graphql,schema=true]
+----
+interface UserInterface {
+  customResolver: String
+}
+
+type User implements UserInterface {
+  id: ID!
+  username: String!
+  password: String!
+  nickname: String! @customResolver
+  customResolver: String @customResolver
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+type Query {
+  userInterfaces(options: UserInterfaceOptions, where: UserInterfaceWhere): [UserInterface!]!
+  userInterfacesConnection(after: String, first: Int, sort: [UserInterfaceSort], where: UserInterfaceWhere): UserInterfacesConnection!
+  users(options: UserOptions, where: UserWhere): [User!]!
+  usersConnection(after: String, first: Int, sort: [UserSort], where: UserWhere): UsersConnection!
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+
+type User implements UserInterface {
+  customResolver: String
+  id: ID!
+  nickname: String!
+  password: String!
+  username: String!
+}
+
+type UserEdge {
+  cursor: String!
+  node: User!
+}
+
+interface UserInterface {
+  customResolver: String
+}
+
+type UserInterfaceEdge {
+  cursor: String!
+  node: UserInterface!
+}
+
+enum UserInterfaceImplementation {
+  User
+}
+
+input UserInterfaceOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more UserInterfaceSort objects to sort UserInterfaces by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [UserInterfaceSort]
+}
+
+"""
+Fields to sort UserInterfaces by. The order in which sorts are applied is not guaranteed when specifying many fields in one UserInterfaceSort object.
+"""
+input UserInterfaceSort {
+  customResolver: SortDirection
+}
+
+input UserInterfaceWhere {
+  AND: [UserInterfaceWhere!]
+  NOT: UserInterfaceWhere
+  OR: [UserInterfaceWhere!]
+  customResolver: String
+  customResolver_CONTAINS: String
+  customResolver_ENDS_WITH: String
+  customResolver_IN: [String]
+  customResolver_STARTS_WITH: String
+  typename_IN: [UserInterfaceImplementation!]
+}
+
+type UserInterfacesConnection {
+  edges: [UserInterfaceEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input UserOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more UserSort objects to sort Users by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [UserSort!]
+}
+
+"""
+Fields to sort Users by. The order in which sorts are applied is not guaranteed when specifying many fields in one UserSort object.
+"""
+input UserSort {
+  id: SortDirection
+  password: SortDirection
+  username: SortDirection
+}
+
+input UserWhere {
+  AND: [UserWhere!]
+  NOT: UserWhere
+  OR: [UserWhere!]
+  id: ID
+  id_CONTAINS: ID
+  id_ENDS_WITH: ID
+  id_IN: [ID!]
+  id_STARTS_WITH: ID
+  password: String
+  password_CONTAINS: String
+  password_ENDS_WITH: String
+  password_IN: [String!]
+  password_STARTS_WITH: String
+  username: String
+  username_CONTAINS: String
+  username_ENDS_WITH: String
+  username_IN: [String!]
+  username_STARTS_WITH: String
+}
+
+type UsersConnection {
+  edges: [UserEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+----
diff --git a/core/src/test/resources/tck-test-files/schema/v2/experimental-schema/directives/default.adoc b/core/src/test/resources/tck-test-files/schema/v2/experimental-schema/directives/default.adoc
index 1b58d09d..c7ea58d1 100644
--- a/core/src/test/resources/tck-test-files/schema/v2/experimental-schema/directives/default.adoc
+++ b/core/src/test/resources/tck-test-files/schema/v2/experimental-schema/directives/default.adoc
@@ -33,7 +33,7 @@ enum Location {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -212,6 +212,3 @@ input UserWhere {
 }
 
 ----
-
-'''
-
diff --git a/core/src/test/resources/tck-test-files/schema/v2/experimental-schema/directives/default.js.adoc b/core/src/test/resources/tck-test-files/schema/v2/experimental-schema/directives/default.js.adoc
new file mode 100644
index 00000000..2df2b059
--- /dev/null
+++ b/core/src/test/resources/tck-test-files/schema/v2/experimental-schema/directives/default.js.adoc
@@ -0,0 +1,222 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= @default directive
+
+== sets default values in schema
+
+.Schema
+[source,graphql,schema=true]
+----
+interface UserInterface {
+  fromInterface: String!
+  toBeOverridden: String!
+}
+
+type User implements UserInterface {
+  id: ID! @default(value: "00000000-00000000-00000000-00000000")
+  name: String! @default(value: "Jane Smith")
+  verified: Boolean! @default(value: false)
+  numberOfFriends: Int! @default(value: 0)
+  rating: Float! @default(value: 0.0)
+  verifiedDate: DateTime! @default(value: "1970-01-01T00:00:00.000Z")
+  fromInterface: String! @default(value: "Interface default value")
+  toBeOverridden: String! @default(value: "Overridden value")
+  location: Location! @default(value: HERE)
+}
+
+enum Location {
+  HERE
+  THERE
+  EVERYWHERE
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+"""A date and time, represented as an ISO-8601 string"""
+scalar DateTime
+
+enum Location {
+  EVERYWHERE
+  HERE
+  THERE
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+type Query {
+  userInterfaces(options: UserInterfaceOptions, where: UserInterfaceWhere): [UserInterface!]!
+  userInterfacesConnection(after: String, first: Int, sort: [UserInterfaceSort], where: UserInterfaceWhere): UserInterfacesConnection!
+  users(options: UserOptions, where: UserWhere): [User!]!
+  usersConnection(after: String, first: Int, sort: [UserSort], where: UserWhere): UsersConnection!
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+
+type User implements UserInterface {
+  fromInterface: String!
+  id: ID!
+  location: Location!
+  name: String!
+  numberOfFriends: Int!
+  rating: Float!
+  toBeOverridden: String!
+  verified: Boolean!
+  verifiedDate: DateTime!
+}
+
+type UserEdge {
+  cursor: String!
+  node: User!
+}
+
+interface UserInterface {
+  fromInterface: String!
+  toBeOverridden: String!
+}
+
+type UserInterfaceEdge {
+  cursor: String!
+  node: UserInterface!
+}
+
+enum UserInterfaceImplementation {
+  User
+}
+
+input UserInterfaceOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more UserInterfaceSort objects to sort UserInterfaces by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [UserInterfaceSort]
+}
+
+"""
+Fields to sort UserInterfaces by. The order in which sorts are applied is not guaranteed when specifying many fields in one UserInterfaceSort object.
+"""
+input UserInterfaceSort {
+  fromInterface: SortDirection
+  toBeOverridden: SortDirection
+}
+
+input UserInterfaceWhere {
+  AND: [UserInterfaceWhere!]
+  NOT: UserInterfaceWhere
+  OR: [UserInterfaceWhere!]
+  fromInterface: String
+  fromInterface_CONTAINS: String
+  fromInterface_ENDS_WITH: String
+  fromInterface_IN: [String!]
+  fromInterface_STARTS_WITH: String
+  toBeOverridden: String
+  toBeOverridden_CONTAINS: String
+  toBeOverridden_ENDS_WITH: String
+  toBeOverridden_IN: [String!]
+  toBeOverridden_STARTS_WITH: String
+  typename_IN: [UserInterfaceImplementation!]
+}
+
+type UserInterfacesConnection {
+  edges: [UserInterfaceEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input UserOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more UserSort objects to sort Users by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [UserSort!]
+}
+
+"""
+Fields to sort Users by. The order in which sorts are applied is not guaranteed when specifying many fields in one UserSort object.
+"""
+input UserSort {
+  fromInterface: SortDirection
+  id: SortDirection
+  location: SortDirection
+  name: SortDirection
+  numberOfFriends: SortDirection
+  rating: SortDirection
+  toBeOverridden: SortDirection
+  verified: SortDirection
+  verifiedDate: SortDirection
+}
+
+input UserWhere {
+  AND: [UserWhere!]
+  NOT: UserWhere
+  OR: [UserWhere!]
+  fromInterface: String
+  fromInterface_CONTAINS: String
+  fromInterface_ENDS_WITH: String
+  fromInterface_IN: [String!]
+  fromInterface_STARTS_WITH: String
+  id: ID
+  id_CONTAINS: ID
+  id_ENDS_WITH: ID
+  id_IN: [ID!]
+  id_STARTS_WITH: ID
+  location: Location
+  location_IN: [Location!]
+  name: String
+  name_CONTAINS: String
+  name_ENDS_WITH: String
+  name_IN: [String!]
+  name_STARTS_WITH: String
+  numberOfFriends: Int
+  numberOfFriends_GT: Int
+  numberOfFriends_GTE: Int
+  numberOfFriends_IN: [Int!]
+  numberOfFriends_LT: Int
+  numberOfFriends_LTE: Int
+  rating: Float
+  rating_GT: Float
+  rating_GTE: Float
+  rating_IN: [Float!]
+  rating_LT: Float
+  rating_LTE: Float
+  toBeOverridden: String
+  toBeOverridden_CONTAINS: String
+  toBeOverridden_ENDS_WITH: String
+  toBeOverridden_IN: [String!]
+  toBeOverridden_STARTS_WITH: String
+  verified: Boolean
+  verifiedDate: DateTime
+  verifiedDate_GT: DateTime
+  verifiedDate_GTE: DateTime
+  verifiedDate_IN: [DateTime!]
+  verifiedDate_LT: DateTime
+  verifiedDate_LTE: DateTime
+}
+
+type UsersConnection {
+  edges: [UserEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+----
diff --git a/core/src/test/resources/tck-test-files/schema/v2/experimental-schema/directives/filterable.adoc b/core/src/test/resources/tck-test-files/schema/v2/experimental-schema/directives/filterable.adoc
index 7349858d..0c061f0b 100644
--- a/core/src/test/resources/tck-test-files/schema/v2/experimental-schema/directives/filterable.adoc
+++ b/core/src/test/resources/tck-test-files/schema/v2/experimental-schema/directives/filterable.adoc
@@ -27,7 +27,7 @@ type Movie {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -250,8 +250,6 @@ input PersonWhere {
 
 ----
 
-'''
-
 == snapshot tests
 
 === on SCALAR
@@ -274,7 +272,7 @@ type Movie {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -468,8 +466,6 @@ input MovieWhere {
 
 ----
 
-'''
-
 === on RELATIONSHIP FIELD
 
 ==== default arguments should disable aggregation
@@ -490,7 +486,7 @@ type Movie {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -684,8 +680,6 @@ input MovieWhere {
 
 ----
 
-'''
-
 ==== enable only value filters
 
 .Schema
@@ -704,7 +698,7 @@ type Movie {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -898,8 +892,6 @@ input MovieWhere {
 
 ----
 
-'''
-
 === on INTERFACE RELATIONSHIP FIELD, (aggregation does not exists on abstract types)
 
 ==== default arguments should disable aggregation
@@ -924,7 +916,7 @@ type Movie {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -1163,8 +1155,6 @@ input PersonWhere {
 
 ----
 
-'''
-
 ==== enable only value filters
 
 .Schema
@@ -1187,7 +1177,7 @@ type Movie {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -1426,8 +1416,6 @@ input PersonWhere {
 
 ----
 
-'''
-
 === on UNION RELATIONSHIP FIELD, (aggregation does not exists on abstract types)
 
 ==== default arguments should disable aggregation
@@ -1456,7 +1444,7 @@ type Movie {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -1759,8 +1747,6 @@ input QueryOptions {
 
 ----
 
-'''
-
 ==== enable only value filters
 
 .Schema
@@ -1787,7 +1773,7 @@ type Movie {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -2089,6 +2075,3 @@ input QueryOptions {
 }
 
 ----
-
-'''
-
diff --git a/core/src/test/resources/tck-test-files/schema/v2/experimental-schema/directives/filterable.js.adoc b/core/src/test/resources/tck-test-files/schema/v2/experimental-schema/directives/filterable.js.adoc
new file mode 100644
index 00000000..d19062ef
--- /dev/null
+++ b/core/src/test/resources/tck-test-files/schema/v2/experimental-schema/directives/filterable.js.adoc
@@ -0,0 +1,2290 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= @filterable directive
+
+== on INTERFACE RELATIONSHIP FIELD, (aggregation are not generated for abstract types)
+
+=== disable value filters
+
+.Schema
+[source,graphql,schema=true]
+----
+type Actor implements Person {
+  username: String!
+  password: String!
+  movies: [Movie!]! @relationship(type: "ACTED_IN", direction: OUT)
+}
+
+interface Person {
+  username: String!
+}
+
+type Movie {
+  title: String
+  actors: [Person!]! @relationship(type: "ACTED_IN", direction: IN) @filterable(byValue: false)
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+type Actor implements Person {
+  movies(directed: Boolean = true, options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, directed: Boolean = true, first: Int, sort: [ActorMoviesConnectionSort!], where: ActorMoviesConnectionWhere): ActorMoviesConnection!
+  password: String!
+  username: String!
+}
+
+type ActorEdge {
+  cursor: String!
+  node: Actor!
+}
+
+type ActorMoviesConnection {
+  edges: [ActorMoviesRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input ActorMoviesConnectionSort {
+  node: MovieSort
+}
+
+input ActorMoviesConnectionWhere {
+  AND: [ActorMoviesConnectionWhere!]
+  NOT: ActorMoviesConnectionWhere
+  OR: [ActorMoviesConnectionWhere!]
+  node: MovieWhere
+}
+
+type ActorMoviesRelationship {
+  cursor: String!
+  node: Movie!
+}
+
+input ActorOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more ActorSort objects to sort Actors by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [ActorSort!]
+}
+
+"""
+Fields to sort Actors by. The order in which sorts are applied is not guaranteed when specifying many fields in one ActorSort object.
+"""
+input ActorSort {
+  password: SortDirection
+  username: SortDirection
+}
+
+input ActorWhere {
+  AND: [ActorWhere!]
+  NOT: ActorWhere
+  OR: [ActorWhere!]
+  """
+  Return Actors where all of the related ActorMoviesConnections match this filter
+  """
+  moviesConnection_ALL: ActorMoviesConnectionWhere
+  """
+  Return Actors where none of the related ActorMoviesConnections match this filter
+  """
+  moviesConnection_NONE: ActorMoviesConnectionWhere
+  """
+  Return Actors where one of the related ActorMoviesConnections match this filter
+  """
+  moviesConnection_SINGLE: ActorMoviesConnectionWhere
+  """
+  Return Actors where some of the related ActorMoviesConnections match this filter
+  """
+  moviesConnection_SOME: ActorMoviesConnectionWhere
+  """Return Actors where all of the related Movies match this filter"""
+  movies_ALL: MovieWhere
+  """Return Actors where none of the related Movies match this filter"""
+  movies_NONE: MovieWhere
+  """Return Actors where one of the related Movies match this filter"""
+  movies_SINGLE: MovieWhere
+  """Return Actors where some of the related Movies match this filter"""
+  movies_SOME: MovieWhere
+  password: String
+  password_CONTAINS: String
+  password_ENDS_WITH: String
+  password_IN: [String!]
+  password_STARTS_WITH: String
+  username: String
+  username_CONTAINS: String
+  username_ENDS_WITH: String
+  username_IN: [String!]
+  username_STARTS_WITH: String
+}
+
+type ActorsConnection {
+  edges: [ActorEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+type Movie {
+  actors(directed: Boolean = true, options: PersonOptions, where: PersonWhere): [Person!]!
+  actorsConnection(after: String, directed: Boolean = true, first: Int, sort: [MovieActorsConnectionSort!], where: MovieActorsConnectionWhere): MovieActorsConnection!
+  title: String
+}
+
+type MovieActorsConnection {
+  edges: [MovieActorsRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input MovieActorsConnectionSort {
+  node: PersonSort
+}
+
+input MovieActorsConnectionWhere {
+  AND: [MovieActorsConnectionWhere!]
+  NOT: MovieActorsConnectionWhere
+  OR: [MovieActorsConnectionWhere!]
+  node: PersonWhere
+}
+
+type MovieActorsRelationship {
+  cursor: String!
+  node: Person!
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MovieSort!]
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
+"""
+input MovieSort {
+  title: SortDirection
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  title: String
+  title_CONTAINS: String
+  title_ENDS_WITH: String
+  title_IN: [String]
+  title_STARTS_WITH: String
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+type PeopleConnection {
+  edges: [PersonEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+interface Person {
+  username: String!
+}
+
+type PersonEdge {
+  cursor: String!
+  node: Person!
+}
+
+enum PersonImplementation {
+  Actor
+}
+
+input PersonOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more PersonSort objects to sort People by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [PersonSort]
+}
+
+"""
+Fields to sort People by. The order in which sorts are applied is not guaranteed when specifying many fields in one PersonSort object.
+"""
+input PersonSort {
+  username: SortDirection
+}
+
+input PersonWhere {
+  AND: [PersonWhere!]
+  NOT: PersonWhere
+  OR: [PersonWhere!]
+  typename_IN: [PersonImplementation!]
+  username: String
+  username_CONTAINS: String
+  username_ENDS_WITH: String
+  username_IN: [String!]
+  username_STARTS_WITH: String
+}
+
+type Query {
+  actors(options: ActorOptions, where: ActorWhere): [Actor!]!
+  actorsConnection(after: String, first: Int, sort: [ActorSort], where: ActorWhere): ActorsConnection!
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+  people(options: PersonOptions, where: PersonWhere): [Person!]!
+  peopleConnection(after: String, first: Int, sort: [PersonSort], where: PersonWhere): PeopleConnection!
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
+
+== snapshot tests
+
+=== on SCALAR
+
+==== default arguments should disable aggregation
+
+.Schema
+[source,graphql,schema=true]
+----
+type Actor {
+  username: String!
+  password: String!
+  movies: [Movie!]! @relationship(type: "ACTED_IN", direction: OUT)
+}
+
+type Movie {
+  title: String @filterable
+  actors: [Actor!]! @relationship(type: "ACTED_IN", direction: IN)
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+type Actor {
+  movies(directed: Boolean = true, options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, directed: Boolean = true, first: Int, sort: [ActorMoviesConnectionSort!], where: ActorMoviesConnectionWhere): ActorMoviesConnection!
+  password: String!
+  username: String!
+}
+
+type ActorEdge {
+  cursor: String!
+  node: Actor!
+}
+
+type ActorMoviesConnection {
+  edges: [ActorMoviesRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input ActorMoviesConnectionSort {
+  node: MovieSort
+}
+
+input ActorMoviesConnectionWhere {
+  AND: [ActorMoviesConnectionWhere!]
+  NOT: ActorMoviesConnectionWhere
+  OR: [ActorMoviesConnectionWhere!]
+  node: MovieWhere
+}
+
+type ActorMoviesRelationship {
+  cursor: String!
+  node: Movie!
+}
+
+input ActorOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more ActorSort objects to sort Actors by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [ActorSort!]
+}
+
+"""
+Fields to sort Actors by. The order in which sorts are applied is not guaranteed when specifying many fields in one ActorSort object.
+"""
+input ActorSort {
+  password: SortDirection
+  username: SortDirection
+}
+
+input ActorWhere {
+  AND: [ActorWhere!]
+  NOT: ActorWhere
+  OR: [ActorWhere!]
+  """
+  Return Actors where all of the related ActorMoviesConnections match this filter
+  """
+  moviesConnection_ALL: ActorMoviesConnectionWhere
+  """
+  Return Actors where none of the related ActorMoviesConnections match this filter
+  """
+  moviesConnection_NONE: ActorMoviesConnectionWhere
+  """
+  Return Actors where one of the related ActorMoviesConnections match this filter
+  """
+  moviesConnection_SINGLE: ActorMoviesConnectionWhere
+  """
+  Return Actors where some of the related ActorMoviesConnections match this filter
+  """
+  moviesConnection_SOME: ActorMoviesConnectionWhere
+  """Return Actors where all of the related Movies match this filter"""
+  movies_ALL: MovieWhere
+  """Return Actors where none of the related Movies match this filter"""
+  movies_NONE: MovieWhere
+  """Return Actors where one of the related Movies match this filter"""
+  movies_SINGLE: MovieWhere
+  """Return Actors where some of the related Movies match this filter"""
+  movies_SOME: MovieWhere
+  password: String
+  password_CONTAINS: String
+  password_ENDS_WITH: String
+  password_IN: [String!]
+  password_STARTS_WITH: String
+  username: String
+  username_CONTAINS: String
+  username_ENDS_WITH: String
+  username_IN: [String!]
+  username_STARTS_WITH: String
+}
+
+type ActorsConnection {
+  edges: [ActorEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+type Movie {
+  actors(directed: Boolean = true, options: ActorOptions, where: ActorWhere): [Actor!]!
+  actorsConnection(after: String, directed: Boolean = true, first: Int, sort: [MovieActorsConnectionSort!], where: MovieActorsConnectionWhere): MovieActorsConnection!
+  title: String
+}
+
+type MovieActorsConnection {
+  edges: [MovieActorsRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input MovieActorsConnectionSort {
+  node: ActorSort
+}
+
+input MovieActorsConnectionWhere {
+  AND: [MovieActorsConnectionWhere!]
+  NOT: MovieActorsConnectionWhere
+  OR: [MovieActorsConnectionWhere!]
+  node: ActorWhere
+}
+
+type MovieActorsRelationship {
+  cursor: String!
+  node: Actor!
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MovieSort!]
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
+"""
+input MovieSort {
+  title: SortDirection
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  """
+  Return Movies where all of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_ALL: MovieActorsConnectionWhere
+  """
+  Return Movies where none of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_NONE: MovieActorsConnectionWhere
+  """
+  Return Movies where one of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SINGLE: MovieActorsConnectionWhere
+  """
+  Return Movies where some of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SOME: MovieActorsConnectionWhere
+  """Return Movies where all of the related Actors match this filter"""
+  actors_ALL: ActorWhere
+  """Return Movies where none of the related Actors match this filter"""
+  actors_NONE: ActorWhere
+  """Return Movies where one of the related Actors match this filter"""
+  actors_SINGLE: ActorWhere
+  """Return Movies where some of the related Actors match this filter"""
+  actors_SOME: ActorWhere
+  title: String
+  title_CONTAINS: String
+  title_ENDS_WITH: String
+  title_IN: [String]
+  title_STARTS_WITH: String
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+type Query {
+  actors(options: ActorOptions, where: ActorWhere): [Actor!]!
+  actorsConnection(after: String, first: Int, sort: [ActorSort], where: ActorWhere): ActorsConnection!
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
+
+=== on RELATIONSHIP FIELD
+
+==== default arguments should disable aggregation
+
+.Schema
+[source,graphql,schema=true]
+----
+type Actor {
+  username: String!
+  password: String!
+  movies: [Movie!]! @relationship(type: "ACTED_IN", direction: OUT)
+}
+
+type Movie {
+  title: String
+  actors: [Actor!]! @relationship(type: "ACTED_IN", direction: IN) @filterable
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+type Actor {
+  movies(directed: Boolean = true, options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, directed: Boolean = true, first: Int, sort: [ActorMoviesConnectionSort!], where: ActorMoviesConnectionWhere): ActorMoviesConnection!
+  password: String!
+  username: String!
+}
+
+type ActorEdge {
+  cursor: String!
+  node: Actor!
+}
+
+type ActorMoviesConnection {
+  edges: [ActorMoviesRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input ActorMoviesConnectionSort {
+  node: MovieSort
+}
+
+input ActorMoviesConnectionWhere {
+  AND: [ActorMoviesConnectionWhere!]
+  NOT: ActorMoviesConnectionWhere
+  OR: [ActorMoviesConnectionWhere!]
+  node: MovieWhere
+}
+
+type ActorMoviesRelationship {
+  cursor: String!
+  node: Movie!
+}
+
+input ActorOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more ActorSort objects to sort Actors by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [ActorSort!]
+}
+
+"""
+Fields to sort Actors by. The order in which sorts are applied is not guaranteed when specifying many fields in one ActorSort object.
+"""
+input ActorSort {
+  password: SortDirection
+  username: SortDirection
+}
+
+input ActorWhere {
+  AND: [ActorWhere!]
+  NOT: ActorWhere
+  OR: [ActorWhere!]
+  """
+  Return Actors where all of the related ActorMoviesConnections match this filter
+  """
+  moviesConnection_ALL: ActorMoviesConnectionWhere
+  """
+  Return Actors where none of the related ActorMoviesConnections match this filter
+  """
+  moviesConnection_NONE: ActorMoviesConnectionWhere
+  """
+  Return Actors where one of the related ActorMoviesConnections match this filter
+  """
+  moviesConnection_SINGLE: ActorMoviesConnectionWhere
+  """
+  Return Actors where some of the related ActorMoviesConnections match this filter
+  """
+  moviesConnection_SOME: ActorMoviesConnectionWhere
+  """Return Actors where all of the related Movies match this filter"""
+  movies_ALL: MovieWhere
+  """Return Actors where none of the related Movies match this filter"""
+  movies_NONE: MovieWhere
+  """Return Actors where one of the related Movies match this filter"""
+  movies_SINGLE: MovieWhere
+  """Return Actors where some of the related Movies match this filter"""
+  movies_SOME: MovieWhere
+  password: String
+  password_CONTAINS: String
+  password_ENDS_WITH: String
+  password_IN: [String!]
+  password_STARTS_WITH: String
+  username: String
+  username_CONTAINS: String
+  username_ENDS_WITH: String
+  username_IN: [String!]
+  username_STARTS_WITH: String
+}
+
+type ActorsConnection {
+  edges: [ActorEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+type Movie {
+  actors(directed: Boolean = true, options: ActorOptions, where: ActorWhere): [Actor!]!
+  actorsConnection(after: String, directed: Boolean = true, first: Int, sort: [MovieActorsConnectionSort!], where: MovieActorsConnectionWhere): MovieActorsConnection!
+  title: String
+}
+
+type MovieActorsConnection {
+  edges: [MovieActorsRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input MovieActorsConnectionSort {
+  node: ActorSort
+}
+
+input MovieActorsConnectionWhere {
+  AND: [MovieActorsConnectionWhere!]
+  NOT: MovieActorsConnectionWhere
+  OR: [MovieActorsConnectionWhere!]
+  node: ActorWhere
+}
+
+type MovieActorsRelationship {
+  cursor: String!
+  node: Actor!
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MovieSort!]
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
+"""
+input MovieSort {
+  title: SortDirection
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  """
+  Return Movies where all of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_ALL: MovieActorsConnectionWhere
+  """
+  Return Movies where none of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_NONE: MovieActorsConnectionWhere
+  """
+  Return Movies where one of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SINGLE: MovieActorsConnectionWhere
+  """
+  Return Movies where some of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SOME: MovieActorsConnectionWhere
+  """Return Movies where all of the related Actors match this filter"""
+  actors_ALL: ActorWhere
+  """Return Movies where none of the related Actors match this filter"""
+  actors_NONE: ActorWhere
+  """Return Movies where one of the related Actors match this filter"""
+  actors_SINGLE: ActorWhere
+  """Return Movies where some of the related Actors match this filter"""
+  actors_SOME: ActorWhere
+  title: String
+  title_CONTAINS: String
+  title_ENDS_WITH: String
+  title_IN: [String]
+  title_STARTS_WITH: String
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+type Query {
+  actors(options: ActorOptions, where: ActorWhere): [Actor!]!
+  actorsConnection(after: String, first: Int, sort: [ActorSort], where: ActorWhere): ActorsConnection!
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
+
+==== enable only value filters
+
+.Schema
+[source,graphql,schema=true]
+----
+type Actor {
+  username: String!
+  password: String!
+  movies: [Movie!]! @relationship(type: "ACTED_IN", direction: OUT)
+}
+
+type Movie {
+  title: String
+  actors: [Actor!]! @relationship(type: "ACTED_IN", direction: IN) @filterable(byValue: true)
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+type Actor {
+  movies(directed: Boolean = true, options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, directed: Boolean = true, first: Int, sort: [ActorMoviesConnectionSort!], where: ActorMoviesConnectionWhere): ActorMoviesConnection!
+  password: String!
+  username: String!
+}
+
+type ActorEdge {
+  cursor: String!
+  node: Actor!
+}
+
+type ActorMoviesConnection {
+  edges: [ActorMoviesRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input ActorMoviesConnectionSort {
+  node: MovieSort
+}
+
+input ActorMoviesConnectionWhere {
+  AND: [ActorMoviesConnectionWhere!]
+  NOT: ActorMoviesConnectionWhere
+  OR: [ActorMoviesConnectionWhere!]
+  node: MovieWhere
+}
+
+type ActorMoviesRelationship {
+  cursor: String!
+  node: Movie!
+}
+
+input ActorOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more ActorSort objects to sort Actors by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [ActorSort!]
+}
+
+"""
+Fields to sort Actors by. The order in which sorts are applied is not guaranteed when specifying many fields in one ActorSort object.
+"""
+input ActorSort {
+  password: SortDirection
+  username: SortDirection
+}
+
+input ActorWhere {
+  AND: [ActorWhere!]
+  NOT: ActorWhere
+  OR: [ActorWhere!]
+  """
+  Return Actors where all of the related ActorMoviesConnections match this filter
+  """
+  moviesConnection_ALL: ActorMoviesConnectionWhere
+  """
+  Return Actors where none of the related ActorMoviesConnections match this filter
+  """
+  moviesConnection_NONE: ActorMoviesConnectionWhere
+  """
+  Return Actors where one of the related ActorMoviesConnections match this filter
+  """
+  moviesConnection_SINGLE: ActorMoviesConnectionWhere
+  """
+  Return Actors where some of the related ActorMoviesConnections match this filter
+  """
+  moviesConnection_SOME: ActorMoviesConnectionWhere
+  """Return Actors where all of the related Movies match this filter"""
+  movies_ALL: MovieWhere
+  """Return Actors where none of the related Movies match this filter"""
+  movies_NONE: MovieWhere
+  """Return Actors where one of the related Movies match this filter"""
+  movies_SINGLE: MovieWhere
+  """Return Actors where some of the related Movies match this filter"""
+  movies_SOME: MovieWhere
+  password: String
+  password_CONTAINS: String
+  password_ENDS_WITH: String
+  password_IN: [String!]
+  password_STARTS_WITH: String
+  username: String
+  username_CONTAINS: String
+  username_ENDS_WITH: String
+  username_IN: [String!]
+  username_STARTS_WITH: String
+}
+
+type ActorsConnection {
+  edges: [ActorEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+type Movie {
+  actors(directed: Boolean = true, options: ActorOptions, where: ActorWhere): [Actor!]!
+  actorsConnection(after: String, directed: Boolean = true, first: Int, sort: [MovieActorsConnectionSort!], where: MovieActorsConnectionWhere): MovieActorsConnection!
+  title: String
+}
+
+type MovieActorsConnection {
+  edges: [MovieActorsRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input MovieActorsConnectionSort {
+  node: ActorSort
+}
+
+input MovieActorsConnectionWhere {
+  AND: [MovieActorsConnectionWhere!]
+  NOT: MovieActorsConnectionWhere
+  OR: [MovieActorsConnectionWhere!]
+  node: ActorWhere
+}
+
+type MovieActorsRelationship {
+  cursor: String!
+  node: Actor!
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MovieSort!]
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
+"""
+input MovieSort {
+  title: SortDirection
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  """
+  Return Movies where all of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_ALL: MovieActorsConnectionWhere
+  """
+  Return Movies where none of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_NONE: MovieActorsConnectionWhere
+  """
+  Return Movies where one of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SINGLE: MovieActorsConnectionWhere
+  """
+  Return Movies where some of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SOME: MovieActorsConnectionWhere
+  """Return Movies where all of the related Actors match this filter"""
+  actors_ALL: ActorWhere
+  """Return Movies where none of the related Actors match this filter"""
+  actors_NONE: ActorWhere
+  """Return Movies where one of the related Actors match this filter"""
+  actors_SINGLE: ActorWhere
+  """Return Movies where some of the related Actors match this filter"""
+  actors_SOME: ActorWhere
+  title: String
+  title_CONTAINS: String
+  title_ENDS_WITH: String
+  title_IN: [String]
+  title_STARTS_WITH: String
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+type Query {
+  actors(options: ActorOptions, where: ActorWhere): [Actor!]!
+  actorsConnection(after: String, first: Int, sort: [ActorSort], where: ActorWhere): ActorsConnection!
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
+
+=== on INTERFACE RELATIONSHIP FIELD, (aggregation does not exists on abstract types)
+
+==== default arguments should disable aggregation
+
+.Schema
+[source,graphql,schema=true]
+----
+type Actor implements Person {
+  username: String!
+  password: String!
+  movies: [Movie!]! @relationship(type: "ACTED_IN", direction: OUT)
+}
+
+interface Person {
+  username: String!
+}
+
+type Movie {
+  title: String
+  actors: [Person!]! @relationship(type: "ACTED_IN", direction: IN) @filterable
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+type Actor implements Person {
+  movies(directed: Boolean = true, options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, directed: Boolean = true, first: Int, sort: [ActorMoviesConnectionSort!], where: ActorMoviesConnectionWhere): ActorMoviesConnection!
+  password: String!
+  username: String!
+}
+
+type ActorEdge {
+  cursor: String!
+  node: Actor!
+}
+
+type ActorMoviesConnection {
+  edges: [ActorMoviesRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input ActorMoviesConnectionSort {
+  node: MovieSort
+}
+
+input ActorMoviesConnectionWhere {
+  AND: [ActorMoviesConnectionWhere!]
+  NOT: ActorMoviesConnectionWhere
+  OR: [ActorMoviesConnectionWhere!]
+  node: MovieWhere
+}
+
+type ActorMoviesRelationship {
+  cursor: String!
+  node: Movie!
+}
+
+input ActorOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more ActorSort objects to sort Actors by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [ActorSort!]
+}
+
+"""
+Fields to sort Actors by. The order in which sorts are applied is not guaranteed when specifying many fields in one ActorSort object.
+"""
+input ActorSort {
+  password: SortDirection
+  username: SortDirection
+}
+
+input ActorWhere {
+  AND: [ActorWhere!]
+  NOT: ActorWhere
+  OR: [ActorWhere!]
+  """
+  Return Actors where all of the related ActorMoviesConnections match this filter
+  """
+  moviesConnection_ALL: ActorMoviesConnectionWhere
+  """
+  Return Actors where none of the related ActorMoviesConnections match this filter
+  """
+  moviesConnection_NONE: ActorMoviesConnectionWhere
+  """
+  Return Actors where one of the related ActorMoviesConnections match this filter
+  """
+  moviesConnection_SINGLE: ActorMoviesConnectionWhere
+  """
+  Return Actors where some of the related ActorMoviesConnections match this filter
+  """
+  moviesConnection_SOME: ActorMoviesConnectionWhere
+  """Return Actors where all of the related Movies match this filter"""
+  movies_ALL: MovieWhere
+  """Return Actors where none of the related Movies match this filter"""
+  movies_NONE: MovieWhere
+  """Return Actors where one of the related Movies match this filter"""
+  movies_SINGLE: MovieWhere
+  """Return Actors where some of the related Movies match this filter"""
+  movies_SOME: MovieWhere
+  password: String
+  password_CONTAINS: String
+  password_ENDS_WITH: String
+  password_IN: [String!]
+  password_STARTS_WITH: String
+  username: String
+  username_CONTAINS: String
+  username_ENDS_WITH: String
+  username_IN: [String!]
+  username_STARTS_WITH: String
+}
+
+type ActorsConnection {
+  edges: [ActorEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+type Movie {
+  actors(directed: Boolean = true, options: PersonOptions, where: PersonWhere): [Person!]!
+  actorsConnection(after: String, directed: Boolean = true, first: Int, sort: [MovieActorsConnectionSort!], where: MovieActorsConnectionWhere): MovieActorsConnection!
+  title: String
+}
+
+type MovieActorsConnection {
+  edges: [MovieActorsRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input MovieActorsConnectionSort {
+  node: PersonSort
+}
+
+input MovieActorsConnectionWhere {
+  AND: [MovieActorsConnectionWhere!]
+  NOT: MovieActorsConnectionWhere
+  OR: [MovieActorsConnectionWhere!]
+  node: PersonWhere
+}
+
+type MovieActorsRelationship {
+  cursor: String!
+  node: Person!
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MovieSort!]
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
+"""
+input MovieSort {
+  title: SortDirection
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  """
+  Return Movies where all of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_ALL: MovieActorsConnectionWhere
+  """
+  Return Movies where none of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_NONE: MovieActorsConnectionWhere
+  """
+  Return Movies where one of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SINGLE: MovieActorsConnectionWhere
+  """
+  Return Movies where some of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SOME: MovieActorsConnectionWhere
+  """Return Movies where all of the related People match this filter"""
+  actors_ALL: PersonWhere
+  """Return Movies where none of the related People match this filter"""
+  actors_NONE: PersonWhere
+  """Return Movies where one of the related People match this filter"""
+  actors_SINGLE: PersonWhere
+  """Return Movies where some of the related People match this filter"""
+  actors_SOME: PersonWhere
+  title: String
+  title_CONTAINS: String
+  title_ENDS_WITH: String
+  title_IN: [String]
+  title_STARTS_WITH: String
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+type PeopleConnection {
+  edges: [PersonEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+interface Person {
+  username: String!
+}
+
+type PersonEdge {
+  cursor: String!
+  node: Person!
+}
+
+enum PersonImplementation {
+  Actor
+}
+
+input PersonOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more PersonSort objects to sort People by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [PersonSort]
+}
+
+"""
+Fields to sort People by. The order in which sorts are applied is not guaranteed when specifying many fields in one PersonSort object.
+"""
+input PersonSort {
+  username: SortDirection
+}
+
+input PersonWhere {
+  AND: [PersonWhere!]
+  NOT: PersonWhere
+  OR: [PersonWhere!]
+  typename_IN: [PersonImplementation!]
+  username: String
+  username_CONTAINS: String
+  username_ENDS_WITH: String
+  username_IN: [String!]
+  username_STARTS_WITH: String
+}
+
+type Query {
+  actors(options: ActorOptions, where: ActorWhere): [Actor!]!
+  actorsConnection(after: String, first: Int, sort: [ActorSort], where: ActorWhere): ActorsConnection!
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+  people(options: PersonOptions, where: PersonWhere): [Person!]!
+  peopleConnection(after: String, first: Int, sort: [PersonSort], where: PersonWhere): PeopleConnection!
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
+
+==== enable only value filters
+
+.Schema
+[source,graphql,schema=true]
+----
+type Actor implements Person {
+  username: String!
+  password: String!
+  movies: [Movie!]! @relationship(type: "ACTED_IN", direction: OUT)
+}
+
+interface Person {
+  username: String!
+}
+
+type Movie {
+  title: String
+  actors: [Person!]! @relationship(type: "ACTED_IN", direction: IN) @filterable(byValue: true)
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+type Actor implements Person {
+  movies(directed: Boolean = true, options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, directed: Boolean = true, first: Int, sort: [ActorMoviesConnectionSort!], where: ActorMoviesConnectionWhere): ActorMoviesConnection!
+  password: String!
+  username: String!
+}
+
+type ActorEdge {
+  cursor: String!
+  node: Actor!
+}
+
+type ActorMoviesConnection {
+  edges: [ActorMoviesRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input ActorMoviesConnectionSort {
+  node: MovieSort
+}
+
+input ActorMoviesConnectionWhere {
+  AND: [ActorMoviesConnectionWhere!]
+  NOT: ActorMoviesConnectionWhere
+  OR: [ActorMoviesConnectionWhere!]
+  node: MovieWhere
+}
+
+type ActorMoviesRelationship {
+  cursor: String!
+  node: Movie!
+}
+
+input ActorOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more ActorSort objects to sort Actors by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [ActorSort!]
+}
+
+"""
+Fields to sort Actors by. The order in which sorts are applied is not guaranteed when specifying many fields in one ActorSort object.
+"""
+input ActorSort {
+  password: SortDirection
+  username: SortDirection
+}
+
+input ActorWhere {
+  AND: [ActorWhere!]
+  NOT: ActorWhere
+  OR: [ActorWhere!]
+  """
+  Return Actors where all of the related ActorMoviesConnections match this filter
+  """
+  moviesConnection_ALL: ActorMoviesConnectionWhere
+  """
+  Return Actors where none of the related ActorMoviesConnections match this filter
+  """
+  moviesConnection_NONE: ActorMoviesConnectionWhere
+  """
+  Return Actors where one of the related ActorMoviesConnections match this filter
+  """
+  moviesConnection_SINGLE: ActorMoviesConnectionWhere
+  """
+  Return Actors where some of the related ActorMoviesConnections match this filter
+  """
+  moviesConnection_SOME: ActorMoviesConnectionWhere
+  """Return Actors where all of the related Movies match this filter"""
+  movies_ALL: MovieWhere
+  """Return Actors where none of the related Movies match this filter"""
+  movies_NONE: MovieWhere
+  """Return Actors where one of the related Movies match this filter"""
+  movies_SINGLE: MovieWhere
+  """Return Actors where some of the related Movies match this filter"""
+  movies_SOME: MovieWhere
+  password: String
+  password_CONTAINS: String
+  password_ENDS_WITH: String
+  password_IN: [String!]
+  password_STARTS_WITH: String
+  username: String
+  username_CONTAINS: String
+  username_ENDS_WITH: String
+  username_IN: [String!]
+  username_STARTS_WITH: String
+}
+
+type ActorsConnection {
+  edges: [ActorEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+type Movie {
+  actors(directed: Boolean = true, options: PersonOptions, where: PersonWhere): [Person!]!
+  actorsConnection(after: String, directed: Boolean = true, first: Int, sort: [MovieActorsConnectionSort!], where: MovieActorsConnectionWhere): MovieActorsConnection!
+  title: String
+}
+
+type MovieActorsConnection {
+  edges: [MovieActorsRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input MovieActorsConnectionSort {
+  node: PersonSort
+}
+
+input MovieActorsConnectionWhere {
+  AND: [MovieActorsConnectionWhere!]
+  NOT: MovieActorsConnectionWhere
+  OR: [MovieActorsConnectionWhere!]
+  node: PersonWhere
+}
+
+type MovieActorsRelationship {
+  cursor: String!
+  node: Person!
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MovieSort!]
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
+"""
+input MovieSort {
+  title: SortDirection
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  """
+  Return Movies where all of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_ALL: MovieActorsConnectionWhere
+  """
+  Return Movies where none of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_NONE: MovieActorsConnectionWhere
+  """
+  Return Movies where one of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SINGLE: MovieActorsConnectionWhere
+  """
+  Return Movies where some of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SOME: MovieActorsConnectionWhere
+  """Return Movies where all of the related People match this filter"""
+  actors_ALL: PersonWhere
+  """Return Movies where none of the related People match this filter"""
+  actors_NONE: PersonWhere
+  """Return Movies where one of the related People match this filter"""
+  actors_SINGLE: PersonWhere
+  """Return Movies where some of the related People match this filter"""
+  actors_SOME: PersonWhere
+  title: String
+  title_CONTAINS: String
+  title_ENDS_WITH: String
+  title_IN: [String]
+  title_STARTS_WITH: String
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+type PeopleConnection {
+  edges: [PersonEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+interface Person {
+  username: String!
+}
+
+type PersonEdge {
+  cursor: String!
+  node: Person!
+}
+
+enum PersonImplementation {
+  Actor
+}
+
+input PersonOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more PersonSort objects to sort People by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [PersonSort]
+}
+
+"""
+Fields to sort People by. The order in which sorts are applied is not guaranteed when specifying many fields in one PersonSort object.
+"""
+input PersonSort {
+  username: SortDirection
+}
+
+input PersonWhere {
+  AND: [PersonWhere!]
+  NOT: PersonWhere
+  OR: [PersonWhere!]
+  typename_IN: [PersonImplementation!]
+  username: String
+  username_CONTAINS: String
+  username_ENDS_WITH: String
+  username_IN: [String!]
+  username_STARTS_WITH: String
+}
+
+type Query {
+  actors(options: ActorOptions, where: ActorWhere): [Actor!]!
+  actorsConnection(after: String, first: Int, sort: [ActorSort], where: ActorWhere): ActorsConnection!
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+  people(options: PersonOptions, where: PersonWhere): [Person!]!
+  peopleConnection(after: String, first: Int, sort: [PersonSort], where: PersonWhere): PeopleConnection!
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
+
+=== on UNION RELATIONSHIP FIELD, (aggregation does not exists on abstract types)
+
+==== default arguments should disable aggregation
+
+.Schema
+[source,graphql,schema=true]
+----
+type Actor {
+  username: String!
+  password: String!
+  movies: [Movie!]! @relationship(type: "ACTED_IN", direction: OUT)
+}
+
+type Appearance {
+  username: String!
+  password: String!
+  movies: [Movie!]! @relationship(type: "ACTED_IN", direction: OUT)
+}
+
+union Person = Actor | Appearance
+
+type Movie {
+  title: String
+  actors: [Person!]! @relationship(type: "ACTED_IN", direction: IN) @filterable
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+type Actor {
+  movies(directed: Boolean = true, options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, directed: Boolean = true, first: Int, sort: [ActorMoviesConnectionSort!], where: ActorMoviesConnectionWhere): ActorMoviesConnection!
+  password: String!
+  username: String!
+}
+
+type ActorEdge {
+  cursor: String!
+  node: Actor!
+}
+
+type ActorMoviesConnection {
+  edges: [ActorMoviesRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input ActorMoviesConnectionSort {
+  node: MovieSort
+}
+
+input ActorMoviesConnectionWhere {
+  AND: [ActorMoviesConnectionWhere!]
+  NOT: ActorMoviesConnectionWhere
+  OR: [ActorMoviesConnectionWhere!]
+  node: MovieWhere
+}
+
+type ActorMoviesRelationship {
+  cursor: String!
+  node: Movie!
+}
+
+input ActorOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more ActorSort objects to sort Actors by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [ActorSort!]
+}
+
+"""
+Fields to sort Actors by. The order in which sorts are applied is not guaranteed when specifying many fields in one ActorSort object.
+"""
+input ActorSort {
+  password: SortDirection
+  username: SortDirection
+}
+
+input ActorWhere {
+  AND: [ActorWhere!]
+  NOT: ActorWhere
+  OR: [ActorWhere!]
+  """
+  Return Actors where all of the related ActorMoviesConnections match this filter
+  """
+  moviesConnection_ALL: ActorMoviesConnectionWhere
+  """
+  Return Actors where none of the related ActorMoviesConnections match this filter
+  """
+  moviesConnection_NONE: ActorMoviesConnectionWhere
+  """
+  Return Actors where one of the related ActorMoviesConnections match this filter
+  """
+  moviesConnection_SINGLE: ActorMoviesConnectionWhere
+  """
+  Return Actors where some of the related ActorMoviesConnections match this filter
+  """
+  moviesConnection_SOME: ActorMoviesConnectionWhere
+  """Return Actors where all of the related Movies match this filter"""
+  movies_ALL: MovieWhere
+  """Return Actors where none of the related Movies match this filter"""
+  movies_NONE: MovieWhere
+  """Return Actors where one of the related Movies match this filter"""
+  movies_SINGLE: MovieWhere
+  """Return Actors where some of the related Movies match this filter"""
+  movies_SOME: MovieWhere
+  password: String
+  password_CONTAINS: String
+  password_ENDS_WITH: String
+  password_IN: [String!]
+  password_STARTS_WITH: String
+  username: String
+  username_CONTAINS: String
+  username_ENDS_WITH: String
+  username_IN: [String!]
+  username_STARTS_WITH: String
+}
+
+type ActorsConnection {
+  edges: [ActorEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+type Appearance {
+  movies(directed: Boolean = true, options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, directed: Boolean = true, first: Int, sort: [AppearanceMoviesConnectionSort!], where: AppearanceMoviesConnectionWhere): AppearanceMoviesConnection!
+  password: String!
+  username: String!
+}
+
+type AppearanceEdge {
+  cursor: String!
+  node: Appearance!
+}
+
+type AppearanceMoviesConnection {
+  edges: [AppearanceMoviesRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input AppearanceMoviesConnectionSort {
+  node: MovieSort
+}
+
+input AppearanceMoviesConnectionWhere {
+  AND: [AppearanceMoviesConnectionWhere!]
+  NOT: AppearanceMoviesConnectionWhere
+  OR: [AppearanceMoviesConnectionWhere!]
+  node: MovieWhere
+}
+
+type AppearanceMoviesRelationship {
+  cursor: String!
+  node: Movie!
+}
+
+input AppearanceOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more AppearanceSort objects to sort Appearances by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [AppearanceSort!]
+}
+
+"""
+Fields to sort Appearances by. The order in which sorts are applied is not guaranteed when specifying many fields in one AppearanceSort object.
+"""
+input AppearanceSort {
+  password: SortDirection
+  username: SortDirection
+}
+
+input AppearanceWhere {
+  AND: [AppearanceWhere!]
+  NOT: AppearanceWhere
+  OR: [AppearanceWhere!]
+  """
+  Return Appearances where all of the related AppearanceMoviesConnections match this filter
+  """
+  moviesConnection_ALL: AppearanceMoviesConnectionWhere
+  """
+  Return Appearances where none of the related AppearanceMoviesConnections match this filter
+  """
+  moviesConnection_NONE: AppearanceMoviesConnectionWhere
+  """
+  Return Appearances where one of the related AppearanceMoviesConnections match this filter
+  """
+  moviesConnection_SINGLE: AppearanceMoviesConnectionWhere
+  """
+  Return Appearances where some of the related AppearanceMoviesConnections match this filter
+  """
+  moviesConnection_SOME: AppearanceMoviesConnectionWhere
+  """Return Appearances where all of the related Movies match this filter"""
+  movies_ALL: MovieWhere
+  """Return Appearances where none of the related Movies match this filter"""
+  movies_NONE: MovieWhere
+  """Return Appearances where one of the related Movies match this filter"""
+  movies_SINGLE: MovieWhere
+  """Return Appearances where some of the related Movies match this filter"""
+  movies_SOME: MovieWhere
+  password: String
+  password_CONTAINS: String
+  password_ENDS_WITH: String
+  password_IN: [String!]
+  password_STARTS_WITH: String
+  username: String
+  username_CONTAINS: String
+  username_ENDS_WITH: String
+  username_IN: [String!]
+  username_STARTS_WITH: String
+}
+
+type AppearancesConnection {
+  edges: [AppearanceEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+type Movie {
+  actors(directed: Boolean = true, options: QueryOptions, where: PersonWhere): [Person!]!
+  actorsConnection(after: String, directed: Boolean = true, first: Int, where: MovieActorsConnectionWhere): MovieActorsConnection!
+  title: String
+}
+
+input MovieActorsActorConnectionWhere {
+  AND: [MovieActorsActorConnectionWhere!]
+  NOT: MovieActorsActorConnectionWhere
+  OR: [MovieActorsActorConnectionWhere!]
+  node: ActorWhere
+}
+
+input MovieActorsAppearanceConnectionWhere {
+  AND: [MovieActorsAppearanceConnectionWhere!]
+  NOT: MovieActorsAppearanceConnectionWhere
+  OR: [MovieActorsAppearanceConnectionWhere!]
+  node: AppearanceWhere
+}
+
+type MovieActorsConnection {
+  edges: [MovieActorsRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input MovieActorsConnectionWhere {
+  Actor: MovieActorsActorConnectionWhere
+  Appearance: MovieActorsAppearanceConnectionWhere
+}
+
+type MovieActorsRelationship {
+  cursor: String!
+  node: Person!
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MovieSort!]
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
+"""
+input MovieSort {
+  title: SortDirection
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  """
+  Return Movies where all of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_ALL: MovieActorsConnectionWhere
+  """
+  Return Movies where none of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_NONE: MovieActorsConnectionWhere
+  """
+  Return Movies where one of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SINGLE: MovieActorsConnectionWhere
+  """
+  Return Movies where some of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SOME: MovieActorsConnectionWhere
+  """Return Movies where all of the related People match this filter"""
+  actors_ALL: PersonWhere
+  """Return Movies where none of the related People match this filter"""
+  actors_NONE: PersonWhere
+  """Return Movies where one of the related People match this filter"""
+  actors_SINGLE: PersonWhere
+  """Return Movies where some of the related People match this filter"""
+  actors_SOME: PersonWhere
+  title: String
+  title_CONTAINS: String
+  title_ENDS_WITH: String
+  title_IN: [String]
+  title_STARTS_WITH: String
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+union Person = Actor | Appearance
+
+input PersonWhere {
+  Actor: ActorWhere
+  Appearance: AppearanceWhere
+}
+
+type Query {
+  actors(options: ActorOptions, where: ActorWhere): [Actor!]!
+  actorsConnection(after: String, first: Int, sort: [ActorSort], where: ActorWhere): ActorsConnection!
+  appearances(options: AppearanceOptions, where: AppearanceWhere): [Appearance!]!
+  appearancesConnection(after: String, first: Int, sort: [AppearanceSort], where: AppearanceWhere): AppearancesConnection!
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+  people(options: QueryOptions, where: PersonWhere): [Person!]!
+}
+
+"""Input type for options that can be specified on a query operation."""
+input QueryOptions {
+  limit: Int
+  offset: Int
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
+
+==== enable only value filters
+
+.Schema
+[source,graphql,schema=true]
+----
+type Actor {
+  username: String!
+  password: String!
+  movies: [Movie!]! @relationship(type: "ACTED_IN", direction: OUT)
+}
+
+type Appearance {
+  username: String!
+  password: String!
+  movies: [Movie!]! @relationship(type: "ACTED_IN", direction: OUT)
+}
+
+union Person = Actor | Appearance
+
+type Movie {
+  title: String
+  actors: [Person!]! @relationship(type: "ACTED_IN", direction: IN) @filterable(byValue: true)
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+type Actor {
+  movies(directed: Boolean = true, options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, directed: Boolean = true, first: Int, sort: [ActorMoviesConnectionSort!], where: ActorMoviesConnectionWhere): ActorMoviesConnection!
+  password: String!
+  username: String!
+}
+
+type ActorEdge {
+  cursor: String!
+  node: Actor!
+}
+
+type ActorMoviesConnection {
+  edges: [ActorMoviesRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input ActorMoviesConnectionSort {
+  node: MovieSort
+}
+
+input ActorMoviesConnectionWhere {
+  AND: [ActorMoviesConnectionWhere!]
+  NOT: ActorMoviesConnectionWhere
+  OR: [ActorMoviesConnectionWhere!]
+  node: MovieWhere
+}
+
+type ActorMoviesRelationship {
+  cursor: String!
+  node: Movie!
+}
+
+input ActorOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more ActorSort objects to sort Actors by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [ActorSort!]
+}
+
+"""
+Fields to sort Actors by. The order in which sorts are applied is not guaranteed when specifying many fields in one ActorSort object.
+"""
+input ActorSort {
+  password: SortDirection
+  username: SortDirection
+}
+
+input ActorWhere {
+  AND: [ActorWhere!]
+  NOT: ActorWhere
+  OR: [ActorWhere!]
+  """
+  Return Actors where all of the related ActorMoviesConnections match this filter
+  """
+  moviesConnection_ALL: ActorMoviesConnectionWhere
+  """
+  Return Actors where none of the related ActorMoviesConnections match this filter
+  """
+  moviesConnection_NONE: ActorMoviesConnectionWhere
+  """
+  Return Actors where one of the related ActorMoviesConnections match this filter
+  """
+  moviesConnection_SINGLE: ActorMoviesConnectionWhere
+  """
+  Return Actors where some of the related ActorMoviesConnections match this filter
+  """
+  moviesConnection_SOME: ActorMoviesConnectionWhere
+  """Return Actors where all of the related Movies match this filter"""
+  movies_ALL: MovieWhere
+  """Return Actors where none of the related Movies match this filter"""
+  movies_NONE: MovieWhere
+  """Return Actors where one of the related Movies match this filter"""
+  movies_SINGLE: MovieWhere
+  """Return Actors where some of the related Movies match this filter"""
+  movies_SOME: MovieWhere
+  password: String
+  password_CONTAINS: String
+  password_ENDS_WITH: String
+  password_IN: [String!]
+  password_STARTS_WITH: String
+  username: String
+  username_CONTAINS: String
+  username_ENDS_WITH: String
+  username_IN: [String!]
+  username_STARTS_WITH: String
+}
+
+type ActorsConnection {
+  edges: [ActorEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+type Appearance {
+  movies(directed: Boolean = true, options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, directed: Boolean = true, first: Int, sort: [AppearanceMoviesConnectionSort!], where: AppearanceMoviesConnectionWhere): AppearanceMoviesConnection!
+  password: String!
+  username: String!
+}
+
+type AppearanceEdge {
+  cursor: String!
+  node: Appearance!
+}
+
+type AppearanceMoviesConnection {
+  edges: [AppearanceMoviesRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input AppearanceMoviesConnectionSort {
+  node: MovieSort
+}
+
+input AppearanceMoviesConnectionWhere {
+  AND: [AppearanceMoviesConnectionWhere!]
+  NOT: AppearanceMoviesConnectionWhere
+  OR: [AppearanceMoviesConnectionWhere!]
+  node: MovieWhere
+}
+
+type AppearanceMoviesRelationship {
+  cursor: String!
+  node: Movie!
+}
+
+input AppearanceOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more AppearanceSort objects to sort Appearances by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [AppearanceSort!]
+}
+
+"""
+Fields to sort Appearances by. The order in which sorts are applied is not guaranteed when specifying many fields in one AppearanceSort object.
+"""
+input AppearanceSort {
+  password: SortDirection
+  username: SortDirection
+}
+
+input AppearanceWhere {
+  AND: [AppearanceWhere!]
+  NOT: AppearanceWhere
+  OR: [AppearanceWhere!]
+  """
+  Return Appearances where all of the related AppearanceMoviesConnections match this filter
+  """
+  moviesConnection_ALL: AppearanceMoviesConnectionWhere
+  """
+  Return Appearances where none of the related AppearanceMoviesConnections match this filter
+  """
+  moviesConnection_NONE: AppearanceMoviesConnectionWhere
+  """
+  Return Appearances where one of the related AppearanceMoviesConnections match this filter
+  """
+  moviesConnection_SINGLE: AppearanceMoviesConnectionWhere
+  """
+  Return Appearances where some of the related AppearanceMoviesConnections match this filter
+  """
+  moviesConnection_SOME: AppearanceMoviesConnectionWhere
+  """Return Appearances where all of the related Movies match this filter"""
+  movies_ALL: MovieWhere
+  """Return Appearances where none of the related Movies match this filter"""
+  movies_NONE: MovieWhere
+  """Return Appearances where one of the related Movies match this filter"""
+  movies_SINGLE: MovieWhere
+  """Return Appearances where some of the related Movies match this filter"""
+  movies_SOME: MovieWhere
+  password: String
+  password_CONTAINS: String
+  password_ENDS_WITH: String
+  password_IN: [String!]
+  password_STARTS_WITH: String
+  username: String
+  username_CONTAINS: String
+  username_ENDS_WITH: String
+  username_IN: [String!]
+  username_STARTS_WITH: String
+}
+
+type AppearancesConnection {
+  edges: [AppearanceEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+type Movie {
+  actors(directed: Boolean = true, options: QueryOptions, where: PersonWhere): [Person!]!
+  actorsConnection(after: String, directed: Boolean = true, first: Int, where: MovieActorsConnectionWhere): MovieActorsConnection!
+  title: String
+}
+
+input MovieActorsActorConnectionWhere {
+  AND: [MovieActorsActorConnectionWhere!]
+  NOT: MovieActorsActorConnectionWhere
+  OR: [MovieActorsActorConnectionWhere!]
+  node: ActorWhere
+}
+
+input MovieActorsAppearanceConnectionWhere {
+  AND: [MovieActorsAppearanceConnectionWhere!]
+  NOT: MovieActorsAppearanceConnectionWhere
+  OR: [MovieActorsAppearanceConnectionWhere!]
+  node: AppearanceWhere
+}
+
+type MovieActorsConnection {
+  edges: [MovieActorsRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input MovieActorsConnectionWhere {
+  Actor: MovieActorsActorConnectionWhere
+  Appearance: MovieActorsAppearanceConnectionWhere
+}
+
+type MovieActorsRelationship {
+  cursor: String!
+  node: Person!
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MovieSort!]
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
+"""
+input MovieSort {
+  title: SortDirection
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  """
+  Return Movies where all of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_ALL: MovieActorsConnectionWhere
+  """
+  Return Movies where none of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_NONE: MovieActorsConnectionWhere
+  """
+  Return Movies where one of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SINGLE: MovieActorsConnectionWhere
+  """
+  Return Movies where some of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SOME: MovieActorsConnectionWhere
+  """Return Movies where all of the related People match this filter"""
+  actors_ALL: PersonWhere
+  """Return Movies where none of the related People match this filter"""
+  actors_NONE: PersonWhere
+  """Return Movies where one of the related People match this filter"""
+  actors_SINGLE: PersonWhere
+  """Return Movies where some of the related People match this filter"""
+  actors_SOME: PersonWhere
+  title: String
+  title_CONTAINS: String
+  title_ENDS_WITH: String
+  title_IN: [String]
+  title_STARTS_WITH: String
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+union Person = Actor | Appearance
+
+input PersonWhere {
+  Actor: ActorWhere
+  Appearance: AppearanceWhere
+}
+
+type Query {
+  actors(options: ActorOptions, where: ActorWhere): [Actor!]!
+  actorsConnection(after: String, first: Int, sort: [ActorSort], where: ActorWhere): ActorsConnection!
+  appearances(options: AppearanceOptions, where: AppearanceWhere): [Appearance!]!
+  appearancesConnection(after: String, first: Int, sort: [AppearanceSort], where: AppearanceWhere): AppearancesConnection!
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+  people(options: QueryOptions, where: PersonWhere): [Person!]!
+}
+
+"""Input type for options that can be specified on a query operation."""
+input QueryOptions {
+  limit: Int
+  offset: Int
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
diff --git a/core/src/test/resources/tck-test-files/schema/v2/experimental-schema/directives/private.adoc b/core/src/test/resources/tck-test-files/schema/v2/experimental-schema/directives/private.adoc
index 2e8d0541..d942b7eb 100644
--- a/core/src/test/resources/tck-test-files/schema/v2/experimental-schema/directives/private.adoc
+++ b/core/src/test/resources/tck-test-files/schema/v2/experimental-schema/directives/private.adoc
@@ -21,7 +21,7 @@ type User implements UserInterface {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -140,8 +140,6 @@ input UserWhere {
 
 ----
 
-'''
-
 == does not add fields to schema
 
 .Schema
@@ -160,7 +158,7 @@ type User implements UserInterface {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -271,6 +269,3 @@ input UserWhere {
 }
 
 ----
-
-'''
-
diff --git a/core/src/test/resources/tck-test-files/schema/v2/experimental-schema/directives/private.js.adoc b/core/src/test/resources/tck-test-files/schema/v2/experimental-schema/directives/private.js.adoc
new file mode 100644
index 00000000..4d04632f
--- /dev/null
+++ b/core/src/test/resources/tck-test-files/schema/v2/experimental-schema/directives/private.js.adoc
@@ -0,0 +1,286 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= @private directive
+
+== private is not inherited
+
+.Schema
+[source,graphql,schema=true]
+----
+interface UserInterface {
+  id: ID
+  private: String @private
+}
+
+type User implements UserInterface {
+  id: ID
+  password: String @private
+  private: String
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+type Query {
+  userInterfaces(options: UserInterfaceOptions, where: UserInterfaceWhere): [UserInterface!]!
+  userInterfacesConnection(after: String, first: Int, sort: [UserInterfaceSort], where: UserInterfaceWhere): UserInterfacesConnection!
+  users(options: UserOptions, where: UserWhere): [User!]!
+  usersConnection(after: String, first: Int, sort: [UserSort], where: UserWhere): UsersConnection!
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+
+type User implements UserInterface {
+  id: ID
+  private: String
+}
+
+type UserEdge {
+  cursor: String!
+  node: User!
+}
+
+interface UserInterface {
+  id: ID
+}
+
+type UserInterfaceEdge {
+  cursor: String!
+  node: UserInterface!
+}
+
+enum UserInterfaceImplementation {
+  User
+}
+
+input UserInterfaceOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more UserInterfaceSort objects to sort UserInterfaces by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [UserInterfaceSort]
+}
+
+"""
+Fields to sort UserInterfaces by. The order in which sorts are applied is not guaranteed when specifying many fields in one UserInterfaceSort object.
+"""
+input UserInterfaceSort {
+  id: SortDirection
+}
+
+input UserInterfaceWhere {
+  AND: [UserInterfaceWhere!]
+  NOT: UserInterfaceWhere
+  OR: [UserInterfaceWhere!]
+  id: ID
+  id_CONTAINS: ID
+  id_ENDS_WITH: ID
+  id_IN: [ID]
+  id_STARTS_WITH: ID
+  typename_IN: [UserInterfaceImplementation!]
+}
+
+type UserInterfacesConnection {
+  edges: [UserInterfaceEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input UserOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more UserSort objects to sort Users by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [UserSort!]
+}
+
+"""
+Fields to sort Users by. The order in which sorts are applied is not guaranteed when specifying many fields in one UserSort object.
+"""
+input UserSort {
+  id: SortDirection
+  private: SortDirection
+}
+
+input UserWhere {
+  AND: [UserWhere!]
+  NOT: UserWhere
+  OR: [UserWhere!]
+  id: ID
+  id_CONTAINS: ID
+  id_ENDS_WITH: ID
+  id_IN: [ID]
+  id_STARTS_WITH: ID
+  private: String
+  private_CONTAINS: String
+  private_ENDS_WITH: String
+  private_IN: [String]
+  private_STARTS_WITH: String
+}
+
+type UsersConnection {
+  edges: [UserEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+----
+
+== does not add fields to schema
+
+.Schema
+[source,graphql,schema=true]
+----
+interface UserInterface {
+  id: ID
+  private: String @private
+}
+
+type User implements UserInterface {
+  id: ID
+  password: String @private
+  private: String @private
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+type Query {
+  userInterfaces(options: UserInterfaceOptions, where: UserInterfaceWhere): [UserInterface!]!
+  userInterfacesConnection(after: String, first: Int, sort: [UserInterfaceSort], where: UserInterfaceWhere): UserInterfacesConnection!
+  users(options: UserOptions, where: UserWhere): [User!]!
+  usersConnection(after: String, first: Int, sort: [UserSort], where: UserWhere): UsersConnection!
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+
+type User implements UserInterface {
+  id: ID
+}
+
+type UserEdge {
+  cursor: String!
+  node: User!
+}
+
+interface UserInterface {
+  id: ID
+}
+
+type UserInterfaceEdge {
+  cursor: String!
+  node: UserInterface!
+}
+
+enum UserInterfaceImplementation {
+  User
+}
+
+input UserInterfaceOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more UserInterfaceSort objects to sort UserInterfaces by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [UserInterfaceSort]
+}
+
+"""
+Fields to sort UserInterfaces by. The order in which sorts are applied is not guaranteed when specifying many fields in one UserInterfaceSort object.
+"""
+input UserInterfaceSort {
+  id: SortDirection
+}
+
+input UserInterfaceWhere {
+  AND: [UserInterfaceWhere!]
+  NOT: UserInterfaceWhere
+  OR: [UserInterfaceWhere!]
+  id: ID
+  id_CONTAINS: ID
+  id_ENDS_WITH: ID
+  id_IN: [ID]
+  id_STARTS_WITH: ID
+  typename_IN: [UserInterfaceImplementation!]
+}
+
+type UserInterfacesConnection {
+  edges: [UserInterfaceEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input UserOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more UserSort objects to sort Users by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [UserSort!]
+}
+
+"""
+Fields to sort Users by. The order in which sorts are applied is not guaranteed when specifying many fields in one UserSort object.
+"""
+input UserSort {
+  id: SortDirection
+}
+
+input UserWhere {
+  AND: [UserWhere!]
+  NOT: UserWhere
+  OR: [UserWhere!]
+  id: ID
+  id_CONTAINS: ID
+  id_ENDS_WITH: ID
+  id_IN: [ID]
+  id_STARTS_WITH: ID
+}
+
+type UsersConnection {
+  edges: [UserEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+----
diff --git a/core/src/test/resources/tck-test-files/schema/v2/experimental-schema/directives/relationship-aggregate.adoc b/core/src/test/resources/tck-test-files/schema/v2/experimental-schema/directives/relationship-aggregate.adoc
index 69443bd0..f4448ffa 100644
--- a/core/src/test/resources/tck-test-files/schema/v2/experimental-schema/directives/relationship-aggregate.adoc
+++ b/core/src/test/resources/tck-test-files/schema/v2/experimental-schema/directives/relationship-aggregate.adoc
@@ -20,7 +20,7 @@ type Movie {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -174,8 +174,6 @@ input MovieWhere {
 
 ----
 
-'''
-
 == snapshot tests
 
 === aggregate argument set as false
@@ -195,7 +193,7 @@ type Movie {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -349,8 +347,6 @@ input MovieWhere {
 
 ----
 
-'''
-
 === on INTERFACE
 
 ==== aggregate argument set as false, (no-op as abstract does not support aggregation)
@@ -375,7 +371,7 @@ type Movie {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -581,8 +577,6 @@ input PersonWhere {
 
 ----
 
-'''
-
 === on UNION
 
 ==== aggregate argument set as false, (no-op as abstract does not support aggregation)
@@ -608,7 +602,7 @@ type Movie {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -823,6 +817,3 @@ input QueryOptions {
 }
 
 ----
-
-'''
-
diff --git a/core/src/test/resources/tck-test-files/schema/v2/experimental-schema/directives/relationship-aggregate.js.adoc b/core/src/test/resources/tck-test-files/schema/v2/experimental-schema/directives/relationship-aggregate.js.adoc
new file mode 100644
index 00000000..b5c6940a
--- /dev/null
+++ b/core/src/test/resources/tck-test-files/schema/v2/experimental-schema/directives/relationship-aggregate.js.adoc
@@ -0,0 +1,888 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= @relationship directive, aggregate argument
+
+== should disable nested aggregation
+
+.Schema
+[source,graphql,schema=true]
+----
+type Actor {
+  username: String!
+  password: String!
+}
+
+type Movie {
+  title: String
+  actors: [Actor!]! @relationship(type: "ACTED_IN", direction: IN)
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+type Actor {
+  password: String!
+  username: String!
+}
+
+type ActorEdge {
+  cursor: String!
+  node: Actor!
+}
+
+input ActorOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more ActorSort objects to sort Actors by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [ActorSort!]
+}
+
+"""
+Fields to sort Actors by. The order in which sorts are applied is not guaranteed when specifying many fields in one ActorSort object.
+"""
+input ActorSort {
+  password: SortDirection
+  username: SortDirection
+}
+
+input ActorWhere {
+  AND: [ActorWhere!]
+  NOT: ActorWhere
+  OR: [ActorWhere!]
+  password: String
+  password_CONTAINS: String
+  password_ENDS_WITH: String
+  password_IN: [String!]
+  password_STARTS_WITH: String
+  username: String
+  username_CONTAINS: String
+  username_ENDS_WITH: String
+  username_IN: [String!]
+  username_STARTS_WITH: String
+}
+
+type ActorsConnection {
+  edges: [ActorEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+type Movie {
+  actors(directed: Boolean = true, options: ActorOptions, where: ActorWhere): [Actor!]!
+  actorsConnection(after: String, directed: Boolean = true, first: Int, sort: [MovieActorsConnectionSort!], where: MovieActorsConnectionWhere): MovieActorsConnection!
+  title: String
+}
+
+type MovieActorsConnection {
+  edges: [MovieActorsRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input MovieActorsConnectionSort {
+  node: ActorSort
+}
+
+input MovieActorsConnectionWhere {
+  AND: [MovieActorsConnectionWhere!]
+  NOT: MovieActorsConnectionWhere
+  OR: [MovieActorsConnectionWhere!]
+  node: ActorWhere
+}
+
+type MovieActorsRelationship {
+  cursor: String!
+  node: Actor!
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MovieSort!]
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
+"""
+input MovieSort {
+  title: SortDirection
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  """
+  Return Movies where all of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_ALL: MovieActorsConnectionWhere
+  """
+  Return Movies where none of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_NONE: MovieActorsConnectionWhere
+  """
+  Return Movies where one of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SINGLE: MovieActorsConnectionWhere
+  """
+  Return Movies where some of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SOME: MovieActorsConnectionWhere
+  """Return Movies where all of the related Actors match this filter"""
+  actors_ALL: ActorWhere
+  """Return Movies where none of the related Actors match this filter"""
+  actors_NONE: ActorWhere
+  """Return Movies where one of the related Actors match this filter"""
+  actors_SINGLE: ActorWhere
+  """Return Movies where some of the related Actors match this filter"""
+  actors_SOME: ActorWhere
+  title: String
+  title_CONTAINS: String
+  title_ENDS_WITH: String
+  title_IN: [String]
+  title_STARTS_WITH: String
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+type Query {
+  actors(options: ActorOptions, where: ActorWhere): [Actor!]!
+  actorsConnection(after: String, first: Int, sort: [ActorSort], where: ActorWhere): ActorsConnection!
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
+
+== snapshot tests
+
+=== aggregate argument set as false
+
+.Schema
+[source,graphql,schema=true]
+----
+type Actor {
+  username: String!
+  password: String!
+}
+
+type Movie {
+  title: String
+  actors: [Actor!]! @relationship(type: "ACTED_IN", direction: IN)
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+type Actor {
+  password: String!
+  username: String!
+}
+
+type ActorEdge {
+  cursor: String!
+  node: Actor!
+}
+
+input ActorOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more ActorSort objects to sort Actors by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [ActorSort!]
+}
+
+"""
+Fields to sort Actors by. The order in which sorts are applied is not guaranteed when specifying many fields in one ActorSort object.
+"""
+input ActorSort {
+  password: SortDirection
+  username: SortDirection
+}
+
+input ActorWhere {
+  AND: [ActorWhere!]
+  NOT: ActorWhere
+  OR: [ActorWhere!]
+  password: String
+  password_CONTAINS: String
+  password_ENDS_WITH: String
+  password_IN: [String!]
+  password_STARTS_WITH: String
+  username: String
+  username_CONTAINS: String
+  username_ENDS_WITH: String
+  username_IN: [String!]
+  username_STARTS_WITH: String
+}
+
+type ActorsConnection {
+  edges: [ActorEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+type Movie {
+  actors(directed: Boolean = true, options: ActorOptions, where: ActorWhere): [Actor!]!
+  actorsConnection(after: String, directed: Boolean = true, first: Int, sort: [MovieActorsConnectionSort!], where: MovieActorsConnectionWhere): MovieActorsConnection!
+  title: String
+}
+
+type MovieActorsConnection {
+  edges: [MovieActorsRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input MovieActorsConnectionSort {
+  node: ActorSort
+}
+
+input MovieActorsConnectionWhere {
+  AND: [MovieActorsConnectionWhere!]
+  NOT: MovieActorsConnectionWhere
+  OR: [MovieActorsConnectionWhere!]
+  node: ActorWhere
+}
+
+type MovieActorsRelationship {
+  cursor: String!
+  node: Actor!
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MovieSort!]
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
+"""
+input MovieSort {
+  title: SortDirection
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  """
+  Return Movies where all of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_ALL: MovieActorsConnectionWhere
+  """
+  Return Movies where none of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_NONE: MovieActorsConnectionWhere
+  """
+  Return Movies where one of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SINGLE: MovieActorsConnectionWhere
+  """
+  Return Movies where some of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SOME: MovieActorsConnectionWhere
+  """Return Movies where all of the related Actors match this filter"""
+  actors_ALL: ActorWhere
+  """Return Movies where none of the related Actors match this filter"""
+  actors_NONE: ActorWhere
+  """Return Movies where one of the related Actors match this filter"""
+  actors_SINGLE: ActorWhere
+  """Return Movies where some of the related Actors match this filter"""
+  actors_SOME: ActorWhere
+  title: String
+  title_CONTAINS: String
+  title_ENDS_WITH: String
+  title_IN: [String]
+  title_STARTS_WITH: String
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+type Query {
+  actors(options: ActorOptions, where: ActorWhere): [Actor!]!
+  actorsConnection(after: String, first: Int, sort: [ActorSort], where: ActorWhere): ActorsConnection!
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
+
+=== on INTERFACE
+
+==== aggregate argument set as false, (no-op as abstract does not support aggregation)
+
+.Schema
+[source,graphql,schema=true]
+----
+type Actor implements Person {
+  username: String!
+  password: String!
+}
+
+interface Person {
+  username: String!
+  password: String!
+}
+
+type Movie {
+  title: String
+  actors: [Person!]! @relationship(type: "ACTED_IN", direction: IN)
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+type Actor implements Person {
+  password: String!
+  username: String!
+}
+
+type ActorEdge {
+  cursor: String!
+  node: Actor!
+}
+
+input ActorOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more ActorSort objects to sort Actors by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [ActorSort!]
+}
+
+"""
+Fields to sort Actors by. The order in which sorts are applied is not guaranteed when specifying many fields in one ActorSort object.
+"""
+input ActorSort {
+  password: SortDirection
+  username: SortDirection
+}
+
+input ActorWhere {
+  AND: [ActorWhere!]
+  NOT: ActorWhere
+  OR: [ActorWhere!]
+  password: String
+  password_CONTAINS: String
+  password_ENDS_WITH: String
+  password_IN: [String!]
+  password_STARTS_WITH: String
+  username: String
+  username_CONTAINS: String
+  username_ENDS_WITH: String
+  username_IN: [String!]
+  username_STARTS_WITH: String
+}
+
+type ActorsConnection {
+  edges: [ActorEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+type Movie {
+  actors(directed: Boolean = true, options: PersonOptions, where: PersonWhere): [Person!]!
+  actorsConnection(after: String, directed: Boolean = true, first: Int, sort: [MovieActorsConnectionSort!], where: MovieActorsConnectionWhere): MovieActorsConnection!
+  title: String
+}
+
+type MovieActorsConnection {
+  edges: [MovieActorsRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input MovieActorsConnectionSort {
+  node: PersonSort
+}
+
+input MovieActorsConnectionWhere {
+  AND: [MovieActorsConnectionWhere!]
+  NOT: MovieActorsConnectionWhere
+  OR: [MovieActorsConnectionWhere!]
+  node: PersonWhere
+}
+
+type MovieActorsRelationship {
+  cursor: String!
+  node: Person!
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MovieSort!]
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
+"""
+input MovieSort {
+  title: SortDirection
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  """
+  Return Movies where all of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_ALL: MovieActorsConnectionWhere
+  """
+  Return Movies where none of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_NONE: MovieActorsConnectionWhere
+  """
+  Return Movies where one of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SINGLE: MovieActorsConnectionWhere
+  """
+  Return Movies where some of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SOME: MovieActorsConnectionWhere
+  """Return Movies where all of the related People match this filter"""
+  actors_ALL: PersonWhere
+  """Return Movies where none of the related People match this filter"""
+  actors_NONE: PersonWhere
+  """Return Movies where one of the related People match this filter"""
+  actors_SINGLE: PersonWhere
+  """Return Movies where some of the related People match this filter"""
+  actors_SOME: PersonWhere
+  title: String
+  title_CONTAINS: String
+  title_ENDS_WITH: String
+  title_IN: [String]
+  title_STARTS_WITH: String
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+type PeopleConnection {
+  edges: [PersonEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+interface Person {
+  password: String!
+  username: String!
+}
+
+type PersonEdge {
+  cursor: String!
+  node: Person!
+}
+
+enum PersonImplementation {
+  Actor
+}
+
+input PersonOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more PersonSort objects to sort People by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [PersonSort]
+}
+
+"""
+Fields to sort People by. The order in which sorts are applied is not guaranteed when specifying many fields in one PersonSort object.
+"""
+input PersonSort {
+  password: SortDirection
+  username: SortDirection
+}
+
+input PersonWhere {
+  AND: [PersonWhere!]
+  NOT: PersonWhere
+  OR: [PersonWhere!]
+  password: String
+  password_CONTAINS: String
+  password_ENDS_WITH: String
+  password_IN: [String!]
+  password_STARTS_WITH: String
+  typename_IN: [PersonImplementation!]
+  username: String
+  username_CONTAINS: String
+  username_ENDS_WITH: String
+  username_IN: [String!]
+  username_STARTS_WITH: String
+}
+
+type Query {
+  actors(options: ActorOptions, where: ActorWhere): [Actor!]!
+  actorsConnection(after: String, first: Int, sort: [ActorSort], where: ActorWhere): ActorsConnection!
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+  people(options: PersonOptions, where: PersonWhere): [Person!]!
+  peopleConnection(after: String, first: Int, sort: [PersonSort], where: PersonWhere): PeopleConnection!
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
+
+=== on UNION
+
+==== aggregate argument set as false, (no-op as abstract does not support aggregation)
+
+.Schema
+[source,graphql,schema=true]
+----
+type Actor {
+  username: String!
+  password: String!
+}
+
+type Person {
+  name: String!
+}
+
+union CastMember = Actor | Person
+
+type Movie {
+  title: String
+  actors: [CastMember!]! @relationship(type: "ACTED_IN", direction: IN)
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+type Actor {
+  password: String!
+  username: String!
+}
+
+type ActorEdge {
+  cursor: String!
+  node: Actor!
+}
+
+input ActorOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more ActorSort objects to sort Actors by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [ActorSort!]
+}
+
+"""
+Fields to sort Actors by. The order in which sorts are applied is not guaranteed when specifying many fields in one ActorSort object.
+"""
+input ActorSort {
+  password: SortDirection
+  username: SortDirection
+}
+
+input ActorWhere {
+  AND: [ActorWhere!]
+  NOT: ActorWhere
+  OR: [ActorWhere!]
+  password: String
+  password_CONTAINS: String
+  password_ENDS_WITH: String
+  password_IN: [String!]
+  password_STARTS_WITH: String
+  username: String
+  username_CONTAINS: String
+  username_ENDS_WITH: String
+  username_IN: [String!]
+  username_STARTS_WITH: String
+}
+
+type ActorsConnection {
+  edges: [ActorEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+union CastMember = Actor | Person
+
+input CastMemberWhere {
+  Actor: ActorWhere
+  Person: PersonWhere
+}
+
+type Movie {
+  actors(directed: Boolean = true, options: QueryOptions, where: CastMemberWhere): [CastMember!]!
+  actorsConnection(after: String, directed: Boolean = true, first: Int, where: MovieActorsConnectionWhere): MovieActorsConnection!
+  title: String
+}
+
+input MovieActorsActorConnectionWhere {
+  AND: [MovieActorsActorConnectionWhere!]
+  NOT: MovieActorsActorConnectionWhere
+  OR: [MovieActorsActorConnectionWhere!]
+  node: ActorWhere
+}
+
+type MovieActorsConnection {
+  edges: [MovieActorsRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input MovieActorsConnectionWhere {
+  Actor: MovieActorsActorConnectionWhere
+  Person: MovieActorsPersonConnectionWhere
+}
+
+input MovieActorsPersonConnectionWhere {
+  AND: [MovieActorsPersonConnectionWhere!]
+  NOT: MovieActorsPersonConnectionWhere
+  OR: [MovieActorsPersonConnectionWhere!]
+  node: PersonWhere
+}
+
+type MovieActorsRelationship {
+  cursor: String!
+  node: CastMember!
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MovieSort!]
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
+"""
+input MovieSort {
+  title: SortDirection
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  """
+  Return Movies where all of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_ALL: MovieActorsConnectionWhere
+  """
+  Return Movies where none of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_NONE: MovieActorsConnectionWhere
+  """
+  Return Movies where one of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SINGLE: MovieActorsConnectionWhere
+  """
+  Return Movies where some of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SOME: MovieActorsConnectionWhere
+  """Return Movies where all of the related CastMembers match this filter"""
+  actors_ALL: CastMemberWhere
+  """Return Movies where none of the related CastMembers match this filter"""
+  actors_NONE: CastMemberWhere
+  """Return Movies where one of the related CastMembers match this filter"""
+  actors_SINGLE: CastMemberWhere
+  """Return Movies where some of the related CastMembers match this filter"""
+  actors_SOME: CastMemberWhere
+  title: String
+  title_CONTAINS: String
+  title_ENDS_WITH: String
+  title_IN: [String]
+  title_STARTS_WITH: String
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+type PeopleConnection {
+  edges: [PersonEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+type Person {
+  name: String!
+}
+
+type PersonEdge {
+  cursor: String!
+  node: Person!
+}
+
+input PersonOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more PersonSort objects to sort People by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [PersonSort!]
+}
+
+"""
+Fields to sort People by. The order in which sorts are applied is not guaranteed when specifying many fields in one PersonSort object.
+"""
+input PersonSort {
+  name: SortDirection
+}
+
+input PersonWhere {
+  AND: [PersonWhere!]
+  NOT: PersonWhere
+  OR: [PersonWhere!]
+  name: String
+  name_CONTAINS: String
+  name_ENDS_WITH: String
+  name_IN: [String!]
+  name_STARTS_WITH: String
+}
+
+type Query {
+  actors(options: ActorOptions, where: ActorWhere): [Actor!]!
+  actorsConnection(after: String, first: Int, sort: [ActorSort], where: ActorWhere): ActorsConnection!
+  castMembers(options: QueryOptions, where: CastMemberWhere): [CastMember!]!
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+  people(options: PersonOptions, where: PersonWhere): [Person!]!
+  peopleConnection(after: String, first: Int, sort: [PersonSort], where: PersonWhere): PeopleConnection!
+}
+
+"""Input type for options that can be specified on a query operation."""
+input QueryOptions {
+  limit: Int
+  offset: Int
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
diff --git a/core/src/test/resources/tck-test-files/schema/v2/experimental-schema/directives/relationship-nested-operations.adoc b/core/src/test/resources/tck-test-files/schema/v2/experimental-schema/directives/relationship-nested-operations.adoc
index 5cdc0577..a5cb6654 100644
--- a/core/src/test/resources/tck-test-files/schema/v2/experimental-schema/directives/relationship-nested-operations.adoc
+++ b/core/src/test/resources/tck-test-files/schema/v2/experimental-schema/directives/relationship-nested-operations.adoc
@@ -21,7 +21,7 @@ type Movie {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -168,8 +168,6 @@ input PersonWhere {
 
 ----
 
-'''
-
 === Single relationship with nested operation CREATE specified
 
 .Schema
@@ -186,7 +184,7 @@ type Movie {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -333,8 +331,6 @@ input PersonWhere {
 
 ----
 
-'''
-
 === Single relationship with nested operation CONNECT specified
 
 .Schema
@@ -351,7 +347,7 @@ type Movie {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -498,8 +494,6 @@ input PersonWhere {
 
 ----
 
-'''
-
 === Single relationship with nested operation UPDATE specified
 
 .Schema
@@ -516,7 +510,7 @@ type Movie {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -663,8 +657,6 @@ input PersonWhere {
 
 ----
 
-'''
-
 === Single relationship with nested operation DELETE specified
 
 .Schema
@@ -681,7 +673,7 @@ type Movie {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -828,8 +820,6 @@ input PersonWhere {
 
 ----
 
-'''
-
 === Single relationship with nested operation DISCONNECT specified
 
 .Schema
@@ -846,7 +836,7 @@ type Movie {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -993,8 +983,6 @@ input PersonWhere {
 
 ----
 
-'''
-
 === Should not generate any nested operations if only CONNECT_OR_CREATE is specified and the related type does not have a unique field
 
 .Schema
@@ -1011,7 +999,7 @@ type Movie {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -1158,8 +1146,6 @@ input PersonWhere {
 
 ----
 
-'''
-
 === Two relationships with nested operations specified on one
 
 .Schema
@@ -1177,7 +1163,7 @@ type Movie {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -1364,8 +1350,6 @@ input PersonWhere {
 
 ----
 
-'''
-
 === Two relationships with nested operations specified on both
 
 .Schema
@@ -1383,7 +1367,7 @@ type Movie {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -1570,8 +1554,6 @@ input PersonWhere {
 
 ----
 
-'''
-
 == Related to a union type
 
 === Should not generate UpdateFieldInput input with no nested operations
@@ -1596,7 +1578,7 @@ type Movie {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -1805,8 +1787,6 @@ input QueryOptions {
 
 ----
 
-'''
-
 === Single relationship with nested operation CREATE specified
 
 .Schema
@@ -1829,7 +1809,7 @@ type Movie {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -2038,8 +2018,6 @@ input QueryOptions {
 
 ----
 
-'''
-
 === Single relationship with nested operation CONNECT specified
 
 .Schema
@@ -2062,7 +2040,7 @@ type Movie {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -2271,8 +2249,6 @@ input QueryOptions {
 
 ----
 
-'''
-
 === Single relationship with nested operation UPDATE specified
 
 .Schema
@@ -2295,7 +2271,7 @@ type Movie {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -2504,8 +2480,6 @@ input QueryOptions {
 
 ----
 
-'''
-
 === Single relationship with nested operation DELETE specified
 
 .Schema
@@ -2528,7 +2502,7 @@ type Movie {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -2737,8 +2711,6 @@ input QueryOptions {
 
 ----
 
-'''
-
 === Single relationship with nested operation DISCONNECT specified
 
 .Schema
@@ -2761,7 +2733,7 @@ type Movie {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -2970,8 +2942,6 @@ input QueryOptions {
 
 ----
 
-'''
-
 === Should not generate any nested operations if only CONNECT_OR_CREATE is specified and the related type does not have a unique field
 
 .Schema
@@ -2994,7 +2964,7 @@ type Movie {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -3203,8 +3173,6 @@ input QueryOptions {
 
 ----
 
-'''
-
 === Two relationships with nested operations specified on one
 
 .Schema
@@ -3228,7 +3196,7 @@ type Movie {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -3485,8 +3453,6 @@ input QueryOptions {
 
 ----
 
-'''
-
 === Two relationships with nested operations specified on both
 
 .Schema
@@ -3510,7 +3476,7 @@ type Movie {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -3767,8 +3733,6 @@ input QueryOptions {
 
 ----
 
-'''
-
 == Related to an interface type
 
 === Should not generate UpdateFieldInput input with no nested operations
@@ -3796,7 +3760,7 @@ type Movie {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -4032,8 +3996,6 @@ input PersonWhere {
 
 ----
 
-'''
-
 === Single relationship with nested operation CREATE specified
 
 .Schema
@@ -4059,7 +4021,7 @@ type Movie {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -4295,8 +4257,6 @@ input PersonWhere {
 
 ----
 
-'''
-
 === Single relationship with nested operation CONNECT specified
 
 .Schema
@@ -4322,7 +4282,7 @@ type Movie {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -4558,8 +4518,6 @@ input PersonWhere {
 
 ----
 
-'''
-
 === Single relationship with nested operation UPDATE specified
 
 .Schema
@@ -4585,7 +4543,7 @@ type Movie {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -4821,8 +4779,6 @@ input PersonWhere {
 
 ----
 
-'''
-
 === Single relationship with nested operation DELETE specified
 
 .Schema
@@ -4848,7 +4804,7 @@ type Movie {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -5084,8 +5040,6 @@ input PersonWhere {
 
 ----
 
-'''
-
 === Single relationship with nested operation DISCONNECT specified
 
 .Schema
@@ -5111,7 +5065,7 @@ type Movie {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -5347,8 +5301,6 @@ input PersonWhere {
 
 ----
 
-'''
-
 === Two relationships with nested operations specified on one
 
 .Schema
@@ -5375,7 +5327,7 @@ type Movie {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -5651,8 +5603,6 @@ input PersonWhere {
 
 ----
 
-'''
-
 === Two relationships with nested operations specified on both
 
 .Schema
@@ -5679,7 +5629,7 @@ type Movie {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -5954,6 +5904,3 @@ input PersonWhere {
 }
 
 ----
-
-'''
-
diff --git a/core/src/test/resources/tck-test-files/schema/v2/experimental-schema/directives/relationship-nested-operations.js.adoc b/core/src/test/resources/tck-test-files/schema/v2/experimental-schema/directives/relationship-nested-operations.js.adoc
new file mode 100644
index 00000000..0589c83f
--- /dev/null
+++ b/core/src/test/resources/tck-test-files/schema/v2/experimental-schema/directives/relationship-nested-operations.js.adoc
@@ -0,0 +1,6445 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= Relationship nested operations
+
+== Related to a concrete type
+
+=== Should not generate UpdateFieldInput input with no nested operations
+
+.Schema
+[source,graphql,schema=true]
+----
+type Person {
+  name: String
+}
+
+type Movie {
+  id: ID
+  actors: [Person!]! @relationship(type: "ACTED_IN", direction: IN, nestedOperations: [])
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+type Movie {
+  actors(directed: Boolean = true, options: PersonOptions, where: PersonWhere): [Person!]!
+  actorsConnection(after: String, directed: Boolean = true, first: Int, sort: [MovieActorsConnectionSort!], where: MovieActorsConnectionWhere): MovieActorsConnection!
+  id: ID
+}
+
+type MovieActorsConnection {
+  edges: [MovieActorsRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input MovieActorsConnectionSort {
+  node: PersonSort
+}
+
+input MovieActorsConnectionWhere {
+  AND: [MovieActorsConnectionWhere!]
+  NOT: MovieActorsConnectionWhere
+  OR: [MovieActorsConnectionWhere!]
+  node: PersonWhere
+}
+
+type MovieActorsRelationship {
+  cursor: String!
+  node: Person!
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MovieSort!]
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
+"""
+input MovieSort {
+  id: SortDirection
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  """
+  Return Movies where all of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_ALL: MovieActorsConnectionWhere
+  """
+  Return Movies where none of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_NONE: MovieActorsConnectionWhere
+  """
+  Return Movies where one of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SINGLE: MovieActorsConnectionWhere
+  """
+  Return Movies where some of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SOME: MovieActorsConnectionWhere
+  """Return Movies where all of the related People match this filter"""
+  actors_ALL: PersonWhere
+  """Return Movies where none of the related People match this filter"""
+  actors_NONE: PersonWhere
+  """Return Movies where one of the related People match this filter"""
+  actors_SINGLE: PersonWhere
+  """Return Movies where some of the related People match this filter"""
+  actors_SOME: PersonWhere
+  id: ID
+  id_CONTAINS: ID
+  id_ENDS_WITH: ID
+  id_IN: [ID]
+  id_STARTS_WITH: ID
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+type PeopleConnection {
+  edges: [PersonEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+type Person {
+  name: String
+}
+
+type PersonEdge {
+  cursor: String!
+  node: Person!
+}
+
+input PersonOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more PersonSort objects to sort People by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [PersonSort!]
+}
+
+"""
+Fields to sort People by. The order in which sorts are applied is not guaranteed when specifying many fields in one PersonSort object.
+"""
+input PersonSort {
+  name: SortDirection
+}
+
+input PersonWhere {
+  AND: [PersonWhere!]
+  NOT: PersonWhere
+  OR: [PersonWhere!]
+  name: String
+  name_CONTAINS: String
+  name_ENDS_WITH: String
+  name_IN: [String]
+  name_STARTS_WITH: String
+}
+
+type Query {
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+  people(options: PersonOptions, where: PersonWhere): [Person!]!
+  peopleConnection(after: String, first: Int, sort: [PersonSort], where: PersonWhere): PeopleConnection!
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
+
+=== Single relationship with nested operation CREATE specified
+
+.Schema
+[source,graphql,schema=true]
+----
+type Person {
+  name: String
+}
+
+type Movie {
+  id: ID
+  actors: [Person!]! @relationship(type: "ACTED_IN", direction: IN, nestedOperations: [CREATE])
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+type Movie {
+  actors(directed: Boolean = true, options: PersonOptions, where: PersonWhere): [Person!]!
+  actorsConnection(after: String, directed: Boolean = true, first: Int, sort: [MovieActorsConnectionSort!], where: MovieActorsConnectionWhere): MovieActorsConnection!
+  id: ID
+}
+
+type MovieActorsConnection {
+  edges: [MovieActorsRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input MovieActorsConnectionSort {
+  node: PersonSort
+}
+
+input MovieActorsConnectionWhere {
+  AND: [MovieActorsConnectionWhere!]
+  NOT: MovieActorsConnectionWhere
+  OR: [MovieActorsConnectionWhere!]
+  node: PersonWhere
+}
+
+type MovieActorsRelationship {
+  cursor: String!
+  node: Person!
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MovieSort!]
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
+"""
+input MovieSort {
+  id: SortDirection
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  """
+  Return Movies where all of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_ALL: MovieActorsConnectionWhere
+  """
+  Return Movies where none of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_NONE: MovieActorsConnectionWhere
+  """
+  Return Movies where one of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SINGLE: MovieActorsConnectionWhere
+  """
+  Return Movies where some of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SOME: MovieActorsConnectionWhere
+  """Return Movies where all of the related People match this filter"""
+  actors_ALL: PersonWhere
+  """Return Movies where none of the related People match this filter"""
+  actors_NONE: PersonWhere
+  """Return Movies where one of the related People match this filter"""
+  actors_SINGLE: PersonWhere
+  """Return Movies where some of the related People match this filter"""
+  actors_SOME: PersonWhere
+  id: ID
+  id_CONTAINS: ID
+  id_ENDS_WITH: ID
+  id_IN: [ID]
+  id_STARTS_WITH: ID
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+type PeopleConnection {
+  edges: [PersonEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+type Person {
+  name: String
+}
+
+type PersonEdge {
+  cursor: String!
+  node: Person!
+}
+
+input PersonOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more PersonSort objects to sort People by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [PersonSort!]
+}
+
+"""
+Fields to sort People by. The order in which sorts are applied is not guaranteed when specifying many fields in one PersonSort object.
+"""
+input PersonSort {
+  name: SortDirection
+}
+
+input PersonWhere {
+  AND: [PersonWhere!]
+  NOT: PersonWhere
+  OR: [PersonWhere!]
+  name: String
+  name_CONTAINS: String
+  name_ENDS_WITH: String
+  name_IN: [String]
+  name_STARTS_WITH: String
+}
+
+type Query {
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+  people(options: PersonOptions, where: PersonWhere): [Person!]!
+  peopleConnection(after: String, first: Int, sort: [PersonSort], where: PersonWhere): PeopleConnection!
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
+
+=== Single relationship with nested operation CONNECT specified
+
+.Schema
+[source,graphql,schema=true]
+----
+type Person {
+  name: String
+}
+
+type Movie {
+  id: ID
+  actors: [Person!]! @relationship(type: "ACTED_IN", direction: IN, nestedOperations: [CONNECT])
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+type Movie {
+  actors(directed: Boolean = true, options: PersonOptions, where: PersonWhere): [Person!]!
+  actorsConnection(after: String, directed: Boolean = true, first: Int, sort: [MovieActorsConnectionSort!], where: MovieActorsConnectionWhere): MovieActorsConnection!
+  id: ID
+}
+
+type MovieActorsConnection {
+  edges: [MovieActorsRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input MovieActorsConnectionSort {
+  node: PersonSort
+}
+
+input MovieActorsConnectionWhere {
+  AND: [MovieActorsConnectionWhere!]
+  NOT: MovieActorsConnectionWhere
+  OR: [MovieActorsConnectionWhere!]
+  node: PersonWhere
+}
+
+type MovieActorsRelationship {
+  cursor: String!
+  node: Person!
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MovieSort!]
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
+"""
+input MovieSort {
+  id: SortDirection
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  """
+  Return Movies where all of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_ALL: MovieActorsConnectionWhere
+  """
+  Return Movies where none of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_NONE: MovieActorsConnectionWhere
+  """
+  Return Movies where one of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SINGLE: MovieActorsConnectionWhere
+  """
+  Return Movies where some of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SOME: MovieActorsConnectionWhere
+  """Return Movies where all of the related People match this filter"""
+  actors_ALL: PersonWhere
+  """Return Movies where none of the related People match this filter"""
+  actors_NONE: PersonWhere
+  """Return Movies where one of the related People match this filter"""
+  actors_SINGLE: PersonWhere
+  """Return Movies where some of the related People match this filter"""
+  actors_SOME: PersonWhere
+  id: ID
+  id_CONTAINS: ID
+  id_ENDS_WITH: ID
+  id_IN: [ID]
+  id_STARTS_WITH: ID
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+type PeopleConnection {
+  edges: [PersonEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+type Person {
+  name: String
+}
+
+type PersonEdge {
+  cursor: String!
+  node: Person!
+}
+
+input PersonOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more PersonSort objects to sort People by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [PersonSort!]
+}
+
+"""
+Fields to sort People by. The order in which sorts are applied is not guaranteed when specifying many fields in one PersonSort object.
+"""
+input PersonSort {
+  name: SortDirection
+}
+
+input PersonWhere {
+  AND: [PersonWhere!]
+  NOT: PersonWhere
+  OR: [PersonWhere!]
+  name: String
+  name_CONTAINS: String
+  name_ENDS_WITH: String
+  name_IN: [String]
+  name_STARTS_WITH: String
+}
+
+type Query {
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+  people(options: PersonOptions, where: PersonWhere): [Person!]!
+  peopleConnection(after: String, first: Int, sort: [PersonSort], where: PersonWhere): PeopleConnection!
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
+
+=== Single relationship with nested operation UPDATE specified
+
+.Schema
+[source,graphql,schema=true]
+----
+type Person {
+  name: String
+}
+
+type Movie {
+  id: ID
+  actors: [Person!]! @relationship(type: "ACTED_IN", direction: IN, nestedOperations: [UPDATE])
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+type Movie {
+  actors(directed: Boolean = true, options: PersonOptions, where: PersonWhere): [Person!]!
+  actorsConnection(after: String, directed: Boolean = true, first: Int, sort: [MovieActorsConnectionSort!], where: MovieActorsConnectionWhere): MovieActorsConnection!
+  id: ID
+}
+
+type MovieActorsConnection {
+  edges: [MovieActorsRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input MovieActorsConnectionSort {
+  node: PersonSort
+}
+
+input MovieActorsConnectionWhere {
+  AND: [MovieActorsConnectionWhere!]
+  NOT: MovieActorsConnectionWhere
+  OR: [MovieActorsConnectionWhere!]
+  node: PersonWhere
+}
+
+type MovieActorsRelationship {
+  cursor: String!
+  node: Person!
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MovieSort!]
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
+"""
+input MovieSort {
+  id: SortDirection
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  """
+  Return Movies where all of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_ALL: MovieActorsConnectionWhere
+  """
+  Return Movies where none of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_NONE: MovieActorsConnectionWhere
+  """
+  Return Movies where one of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SINGLE: MovieActorsConnectionWhere
+  """
+  Return Movies where some of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SOME: MovieActorsConnectionWhere
+  """Return Movies where all of the related People match this filter"""
+  actors_ALL: PersonWhere
+  """Return Movies where none of the related People match this filter"""
+  actors_NONE: PersonWhere
+  """Return Movies where one of the related People match this filter"""
+  actors_SINGLE: PersonWhere
+  """Return Movies where some of the related People match this filter"""
+  actors_SOME: PersonWhere
+  id: ID
+  id_CONTAINS: ID
+  id_ENDS_WITH: ID
+  id_IN: [ID]
+  id_STARTS_WITH: ID
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+type PeopleConnection {
+  edges: [PersonEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+type Person {
+  name: String
+}
+
+type PersonEdge {
+  cursor: String!
+  node: Person!
+}
+
+input PersonOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more PersonSort objects to sort People by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [PersonSort!]
+}
+
+"""
+Fields to sort People by. The order in which sorts are applied is not guaranteed when specifying many fields in one PersonSort object.
+"""
+input PersonSort {
+  name: SortDirection
+}
+
+input PersonWhere {
+  AND: [PersonWhere!]
+  NOT: PersonWhere
+  OR: [PersonWhere!]
+  name: String
+  name_CONTAINS: String
+  name_ENDS_WITH: String
+  name_IN: [String]
+  name_STARTS_WITH: String
+}
+
+type Query {
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+  people(options: PersonOptions, where: PersonWhere): [Person!]!
+  peopleConnection(after: String, first: Int, sort: [PersonSort], where: PersonWhere): PeopleConnection!
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
+
+=== Single relationship with nested operation DELETE specified
+
+.Schema
+[source,graphql,schema=true]
+----
+type Person {
+  name: String
+}
+
+type Movie {
+  id: ID
+  actors: [Person!]! @relationship(type: "ACTED_IN", direction: IN, nestedOperations: [DELETE])
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+type Movie {
+  actors(directed: Boolean = true, options: PersonOptions, where: PersonWhere): [Person!]!
+  actorsConnection(after: String, directed: Boolean = true, first: Int, sort: [MovieActorsConnectionSort!], where: MovieActorsConnectionWhere): MovieActorsConnection!
+  id: ID
+}
+
+type MovieActorsConnection {
+  edges: [MovieActorsRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input MovieActorsConnectionSort {
+  node: PersonSort
+}
+
+input MovieActorsConnectionWhere {
+  AND: [MovieActorsConnectionWhere!]
+  NOT: MovieActorsConnectionWhere
+  OR: [MovieActorsConnectionWhere!]
+  node: PersonWhere
+}
+
+type MovieActorsRelationship {
+  cursor: String!
+  node: Person!
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MovieSort!]
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
+"""
+input MovieSort {
+  id: SortDirection
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  """
+  Return Movies where all of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_ALL: MovieActorsConnectionWhere
+  """
+  Return Movies where none of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_NONE: MovieActorsConnectionWhere
+  """
+  Return Movies where one of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SINGLE: MovieActorsConnectionWhere
+  """
+  Return Movies where some of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SOME: MovieActorsConnectionWhere
+  """Return Movies where all of the related People match this filter"""
+  actors_ALL: PersonWhere
+  """Return Movies where none of the related People match this filter"""
+  actors_NONE: PersonWhere
+  """Return Movies where one of the related People match this filter"""
+  actors_SINGLE: PersonWhere
+  """Return Movies where some of the related People match this filter"""
+  actors_SOME: PersonWhere
+  id: ID
+  id_CONTAINS: ID
+  id_ENDS_WITH: ID
+  id_IN: [ID]
+  id_STARTS_WITH: ID
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+type PeopleConnection {
+  edges: [PersonEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+type Person {
+  name: String
+}
+
+type PersonEdge {
+  cursor: String!
+  node: Person!
+}
+
+input PersonOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more PersonSort objects to sort People by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [PersonSort!]
+}
+
+"""
+Fields to sort People by. The order in which sorts are applied is not guaranteed when specifying many fields in one PersonSort object.
+"""
+input PersonSort {
+  name: SortDirection
+}
+
+input PersonWhere {
+  AND: [PersonWhere!]
+  NOT: PersonWhere
+  OR: [PersonWhere!]
+  name: String
+  name_CONTAINS: String
+  name_ENDS_WITH: String
+  name_IN: [String]
+  name_STARTS_WITH: String
+}
+
+type Query {
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+  people(options: PersonOptions, where: PersonWhere): [Person!]!
+  peopleConnection(after: String, first: Int, sort: [PersonSort], where: PersonWhere): PeopleConnection!
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
+
+=== Single relationship with nested operation DISCONNECT specified
+
+.Schema
+[source,graphql,schema=true]
+----
+type Person {
+  name: String
+}
+
+type Movie {
+  id: ID
+  actors: [Person!]! @relationship(type: "ACTED_IN", direction: IN, nestedOperations: [DISCONNECT])
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+type Movie {
+  actors(directed: Boolean = true, options: PersonOptions, where: PersonWhere): [Person!]!
+  actorsConnection(after: String, directed: Boolean = true, first: Int, sort: [MovieActorsConnectionSort!], where: MovieActorsConnectionWhere): MovieActorsConnection!
+  id: ID
+}
+
+type MovieActorsConnection {
+  edges: [MovieActorsRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input MovieActorsConnectionSort {
+  node: PersonSort
+}
+
+input MovieActorsConnectionWhere {
+  AND: [MovieActorsConnectionWhere!]
+  NOT: MovieActorsConnectionWhere
+  OR: [MovieActorsConnectionWhere!]
+  node: PersonWhere
+}
+
+type MovieActorsRelationship {
+  cursor: String!
+  node: Person!
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MovieSort!]
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
+"""
+input MovieSort {
+  id: SortDirection
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  """
+  Return Movies where all of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_ALL: MovieActorsConnectionWhere
+  """
+  Return Movies where none of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_NONE: MovieActorsConnectionWhere
+  """
+  Return Movies where one of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SINGLE: MovieActorsConnectionWhere
+  """
+  Return Movies where some of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SOME: MovieActorsConnectionWhere
+  """Return Movies where all of the related People match this filter"""
+  actors_ALL: PersonWhere
+  """Return Movies where none of the related People match this filter"""
+  actors_NONE: PersonWhere
+  """Return Movies where one of the related People match this filter"""
+  actors_SINGLE: PersonWhere
+  """Return Movies where some of the related People match this filter"""
+  actors_SOME: PersonWhere
+  id: ID
+  id_CONTAINS: ID
+  id_ENDS_WITH: ID
+  id_IN: [ID]
+  id_STARTS_WITH: ID
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+type PeopleConnection {
+  edges: [PersonEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+type Person {
+  name: String
+}
+
+type PersonEdge {
+  cursor: String!
+  node: Person!
+}
+
+input PersonOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more PersonSort objects to sort People by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [PersonSort!]
+}
+
+"""
+Fields to sort People by. The order in which sorts are applied is not guaranteed when specifying many fields in one PersonSort object.
+"""
+input PersonSort {
+  name: SortDirection
+}
+
+input PersonWhere {
+  AND: [PersonWhere!]
+  NOT: PersonWhere
+  OR: [PersonWhere!]
+  name: String
+  name_CONTAINS: String
+  name_ENDS_WITH: String
+  name_IN: [String]
+  name_STARTS_WITH: String
+}
+
+type Query {
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+  people(options: PersonOptions, where: PersonWhere): [Person!]!
+  peopleConnection(after: String, first: Int, sort: [PersonSort], where: PersonWhere): PeopleConnection!
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
+
+=== Should not generate any nested operations if only CONNECT_OR_CREATE is specified and the related type does not have a unique field
+
+.Schema
+[source,graphql,schema=true]
+----
+type Person {
+  name: String
+}
+
+type Movie {
+  id: ID
+  actors: [Person!]! @relationship(type: "ACTED_IN", direction: IN, nestedOperations: [CONNECT_OR_CREATE])
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+type Movie {
+  actors(directed: Boolean = true, options: PersonOptions, where: PersonWhere): [Person!]!
+  actorsConnection(after: String, directed: Boolean = true, first: Int, sort: [MovieActorsConnectionSort!], where: MovieActorsConnectionWhere): MovieActorsConnection!
+  id: ID
+}
+
+type MovieActorsConnection {
+  edges: [MovieActorsRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input MovieActorsConnectionSort {
+  node: PersonSort
+}
+
+input MovieActorsConnectionWhere {
+  AND: [MovieActorsConnectionWhere!]
+  NOT: MovieActorsConnectionWhere
+  OR: [MovieActorsConnectionWhere!]
+  node: PersonWhere
+}
+
+type MovieActorsRelationship {
+  cursor: String!
+  node: Person!
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MovieSort!]
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
+"""
+input MovieSort {
+  id: SortDirection
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  """
+  Return Movies where all of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_ALL: MovieActorsConnectionWhere
+  """
+  Return Movies where none of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_NONE: MovieActorsConnectionWhere
+  """
+  Return Movies where one of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SINGLE: MovieActorsConnectionWhere
+  """
+  Return Movies where some of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SOME: MovieActorsConnectionWhere
+  """Return Movies where all of the related People match this filter"""
+  actors_ALL: PersonWhere
+  """Return Movies where none of the related People match this filter"""
+  actors_NONE: PersonWhere
+  """Return Movies where one of the related People match this filter"""
+  actors_SINGLE: PersonWhere
+  """Return Movies where some of the related People match this filter"""
+  actors_SOME: PersonWhere
+  id: ID
+  id_CONTAINS: ID
+  id_ENDS_WITH: ID
+  id_IN: [ID]
+  id_STARTS_WITH: ID
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+type PeopleConnection {
+  edges: [PersonEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+type Person {
+  name: String
+}
+
+type PersonEdge {
+  cursor: String!
+  node: Person!
+}
+
+input PersonOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more PersonSort objects to sort People by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [PersonSort!]
+}
+
+"""
+Fields to sort People by. The order in which sorts are applied is not guaranteed when specifying many fields in one PersonSort object.
+"""
+input PersonSort {
+  name: SortDirection
+}
+
+input PersonWhere {
+  AND: [PersonWhere!]
+  NOT: PersonWhere
+  OR: [PersonWhere!]
+  name: String
+  name_CONTAINS: String
+  name_ENDS_WITH: String
+  name_IN: [String]
+  name_STARTS_WITH: String
+}
+
+type Query {
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+  people(options: PersonOptions, where: PersonWhere): [Person!]!
+  peopleConnection(after: String, first: Int, sort: [PersonSort], where: PersonWhere): PeopleConnection!
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
+
+=== Two relationships with nested operations specified on one
+
+.Schema
+[source,graphql,schema=true]
+----
+type Person {
+  name: String
+}
+
+type Movie {
+  id: ID
+  actors: [Person!]! @relationship(type: "ACTED_IN", direction: IN)
+  producers: [Person!]! @relationship(type: "PRODUCED", direction: IN, nestedOperations: [DISCONNECT])
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+type Movie {
+  actors(directed: Boolean = true, options: PersonOptions, where: PersonWhere): [Person!]!
+  actorsConnection(after: String, directed: Boolean = true, first: Int, sort: [MovieActorsConnectionSort!], where: MovieActorsConnectionWhere): MovieActorsConnection!
+  id: ID
+  producers(directed: Boolean = true, options: PersonOptions, where: PersonWhere): [Person!]!
+  producersConnection(after: String, directed: Boolean = true, first: Int, sort: [MovieProducersConnectionSort!], where: MovieProducersConnectionWhere): MovieProducersConnection!
+}
+
+type MovieActorsConnection {
+  edges: [MovieActorsRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input MovieActorsConnectionSort {
+  node: PersonSort
+}
+
+input MovieActorsConnectionWhere {
+  AND: [MovieActorsConnectionWhere!]
+  NOT: MovieActorsConnectionWhere
+  OR: [MovieActorsConnectionWhere!]
+  node: PersonWhere
+}
+
+type MovieActorsRelationship {
+  cursor: String!
+  node: Person!
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MovieSort!]
+}
+
+type MovieProducersConnection {
+  edges: [MovieProducersRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input MovieProducersConnectionSort {
+  node: PersonSort
+}
+
+input MovieProducersConnectionWhere {
+  AND: [MovieProducersConnectionWhere!]
+  NOT: MovieProducersConnectionWhere
+  OR: [MovieProducersConnectionWhere!]
+  node: PersonWhere
+}
+
+type MovieProducersRelationship {
+  cursor: String!
+  node: Person!
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
+"""
+input MovieSort {
+  id: SortDirection
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  """
+  Return Movies where all of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_ALL: MovieActorsConnectionWhere
+  """
+  Return Movies where none of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_NONE: MovieActorsConnectionWhere
+  """
+  Return Movies where one of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SINGLE: MovieActorsConnectionWhere
+  """
+  Return Movies where some of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SOME: MovieActorsConnectionWhere
+  """Return Movies where all of the related People match this filter"""
+  actors_ALL: PersonWhere
+  """Return Movies where none of the related People match this filter"""
+  actors_NONE: PersonWhere
+  """Return Movies where one of the related People match this filter"""
+  actors_SINGLE: PersonWhere
+  """Return Movies where some of the related People match this filter"""
+  actors_SOME: PersonWhere
+  id: ID
+  id_CONTAINS: ID
+  id_ENDS_WITH: ID
+  id_IN: [ID]
+  id_STARTS_WITH: ID
+  """
+  Return Movies where all of the related MovieProducersConnections match this filter
+  """
+  producersConnection_ALL: MovieProducersConnectionWhere
+  """
+  Return Movies where none of the related MovieProducersConnections match this filter
+  """
+  producersConnection_NONE: MovieProducersConnectionWhere
+  """
+  Return Movies where one of the related MovieProducersConnections match this filter
+  """
+  producersConnection_SINGLE: MovieProducersConnectionWhere
+  """
+  Return Movies where some of the related MovieProducersConnections match this filter
+  """
+  producersConnection_SOME: MovieProducersConnectionWhere
+  """Return Movies where all of the related People match this filter"""
+  producers_ALL: PersonWhere
+  """Return Movies where none of the related People match this filter"""
+  producers_NONE: PersonWhere
+  """Return Movies where one of the related People match this filter"""
+  producers_SINGLE: PersonWhere
+  """Return Movies where some of the related People match this filter"""
+  producers_SOME: PersonWhere
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+type PeopleConnection {
+  edges: [PersonEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+type Person {
+  name: String
+}
+
+type PersonEdge {
+  cursor: String!
+  node: Person!
+}
+
+input PersonOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more PersonSort objects to sort People by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [PersonSort!]
+}
+
+"""
+Fields to sort People by. The order in which sorts are applied is not guaranteed when specifying many fields in one PersonSort object.
+"""
+input PersonSort {
+  name: SortDirection
+}
+
+input PersonWhere {
+  AND: [PersonWhere!]
+  NOT: PersonWhere
+  OR: [PersonWhere!]
+  name: String
+  name_CONTAINS: String
+  name_ENDS_WITH: String
+  name_IN: [String]
+  name_STARTS_WITH: String
+}
+
+type Query {
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+  people(options: PersonOptions, where: PersonWhere): [Person!]!
+  peopleConnection(after: String, first: Int, sort: [PersonSort], where: PersonWhere): PeopleConnection!
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
+
+=== Two relationships with nested operations specified on both
+
+.Schema
+[source,graphql,schema=true]
+----
+type Person {
+  name: String
+}
+
+type Movie {
+  id: ID
+  actors: [Person!]! @relationship(type: "ACTED_IN", direction: IN, nestedOperations: [CREATE])
+  producers: [Person!]! @relationship(type: "PRODUCED", direction: IN, nestedOperations: [DISCONNECT])
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+type Movie {
+  actors(directed: Boolean = true, options: PersonOptions, where: PersonWhere): [Person!]!
+  actorsConnection(after: String, directed: Boolean = true, first: Int, sort: [MovieActorsConnectionSort!], where: MovieActorsConnectionWhere): MovieActorsConnection!
+  id: ID
+  producers(directed: Boolean = true, options: PersonOptions, where: PersonWhere): [Person!]!
+  producersConnection(after: String, directed: Boolean = true, first: Int, sort: [MovieProducersConnectionSort!], where: MovieProducersConnectionWhere): MovieProducersConnection!
+}
+
+type MovieActorsConnection {
+  edges: [MovieActorsRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input MovieActorsConnectionSort {
+  node: PersonSort
+}
+
+input MovieActorsConnectionWhere {
+  AND: [MovieActorsConnectionWhere!]
+  NOT: MovieActorsConnectionWhere
+  OR: [MovieActorsConnectionWhere!]
+  node: PersonWhere
+}
+
+type MovieActorsRelationship {
+  cursor: String!
+  node: Person!
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MovieSort!]
+}
+
+type MovieProducersConnection {
+  edges: [MovieProducersRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input MovieProducersConnectionSort {
+  node: PersonSort
+}
+
+input MovieProducersConnectionWhere {
+  AND: [MovieProducersConnectionWhere!]
+  NOT: MovieProducersConnectionWhere
+  OR: [MovieProducersConnectionWhere!]
+  node: PersonWhere
+}
+
+type MovieProducersRelationship {
+  cursor: String!
+  node: Person!
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
+"""
+input MovieSort {
+  id: SortDirection
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  """
+  Return Movies where all of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_ALL: MovieActorsConnectionWhere
+  """
+  Return Movies where none of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_NONE: MovieActorsConnectionWhere
+  """
+  Return Movies where one of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SINGLE: MovieActorsConnectionWhere
+  """
+  Return Movies where some of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SOME: MovieActorsConnectionWhere
+  """Return Movies where all of the related People match this filter"""
+  actors_ALL: PersonWhere
+  """Return Movies where none of the related People match this filter"""
+  actors_NONE: PersonWhere
+  """Return Movies where one of the related People match this filter"""
+  actors_SINGLE: PersonWhere
+  """Return Movies where some of the related People match this filter"""
+  actors_SOME: PersonWhere
+  id: ID
+  id_CONTAINS: ID
+  id_ENDS_WITH: ID
+  id_IN: [ID]
+  id_STARTS_WITH: ID
+  """
+  Return Movies where all of the related MovieProducersConnections match this filter
+  """
+  producersConnection_ALL: MovieProducersConnectionWhere
+  """
+  Return Movies where none of the related MovieProducersConnections match this filter
+  """
+  producersConnection_NONE: MovieProducersConnectionWhere
+  """
+  Return Movies where one of the related MovieProducersConnections match this filter
+  """
+  producersConnection_SINGLE: MovieProducersConnectionWhere
+  """
+  Return Movies where some of the related MovieProducersConnections match this filter
+  """
+  producersConnection_SOME: MovieProducersConnectionWhere
+  """Return Movies where all of the related People match this filter"""
+  producers_ALL: PersonWhere
+  """Return Movies where none of the related People match this filter"""
+  producers_NONE: PersonWhere
+  """Return Movies where one of the related People match this filter"""
+  producers_SINGLE: PersonWhere
+  """Return Movies where some of the related People match this filter"""
+  producers_SOME: PersonWhere
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+type PeopleConnection {
+  edges: [PersonEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+type Person {
+  name: String
+}
+
+type PersonEdge {
+  cursor: String!
+  node: Person!
+}
+
+input PersonOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more PersonSort objects to sort People by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [PersonSort!]
+}
+
+"""
+Fields to sort People by. The order in which sorts are applied is not guaranteed when specifying many fields in one PersonSort object.
+"""
+input PersonSort {
+  name: SortDirection
+}
+
+input PersonWhere {
+  AND: [PersonWhere!]
+  NOT: PersonWhere
+  OR: [PersonWhere!]
+  name: String
+  name_CONTAINS: String
+  name_ENDS_WITH: String
+  name_IN: [String]
+  name_STARTS_WITH: String
+}
+
+type Query {
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+  people(options: PersonOptions, where: PersonWhere): [Person!]!
+  peopleConnection(after: String, first: Int, sort: [PersonSort], where: PersonWhere): PeopleConnection!
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
+
+== Related to a union type
+
+=== Should not generate UpdateFieldInput input with no nested operations
+
+.Schema
+[source,graphql,schema=true]
+----
+type PersonOne {
+  name: String
+}
+
+type PersonTwo {
+  nameTwo: String
+}
+
+union Person = PersonOne | PersonTwo
+
+type Movie {
+  id: ID
+  actors: [Person!]! @relationship(type: "ACTED_IN", direction: IN, nestedOperations: [])
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+type Movie {
+  actors(directed: Boolean = true, options: QueryOptions, where: PersonWhere): [Person!]!
+  actorsConnection(after: String, directed: Boolean = true, first: Int, where: MovieActorsConnectionWhere): MovieActorsConnection!
+  id: ID
+}
+
+type MovieActorsConnection {
+  edges: [MovieActorsRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input MovieActorsConnectionWhere {
+  PersonOne: MovieActorsPersonOneConnectionWhere
+  PersonTwo: MovieActorsPersonTwoConnectionWhere
+}
+
+input MovieActorsPersonOneConnectionWhere {
+  AND: [MovieActorsPersonOneConnectionWhere!]
+  NOT: MovieActorsPersonOneConnectionWhere
+  OR: [MovieActorsPersonOneConnectionWhere!]
+  node: PersonOneWhere
+}
+
+input MovieActorsPersonTwoConnectionWhere {
+  AND: [MovieActorsPersonTwoConnectionWhere!]
+  NOT: MovieActorsPersonTwoConnectionWhere
+  OR: [MovieActorsPersonTwoConnectionWhere!]
+  node: PersonTwoWhere
+}
+
+type MovieActorsRelationship {
+  cursor: String!
+  node: Person!
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MovieSort!]
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
+"""
+input MovieSort {
+  id: SortDirection
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  """
+  Return Movies where all of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_ALL: MovieActorsConnectionWhere
+  """
+  Return Movies where none of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_NONE: MovieActorsConnectionWhere
+  """
+  Return Movies where one of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SINGLE: MovieActorsConnectionWhere
+  """
+  Return Movies where some of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SOME: MovieActorsConnectionWhere
+  """Return Movies where all of the related People match this filter"""
+  actors_ALL: PersonWhere
+  """Return Movies where none of the related People match this filter"""
+  actors_NONE: PersonWhere
+  """Return Movies where one of the related People match this filter"""
+  actors_SINGLE: PersonWhere
+  """Return Movies where some of the related People match this filter"""
+  actors_SOME: PersonWhere
+  id: ID
+  id_CONTAINS: ID
+  id_ENDS_WITH: ID
+  id_IN: [ID]
+  id_STARTS_WITH: ID
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+union Person = PersonOne | PersonTwo
+
+type PersonOne {
+  name: String
+}
+
+type PersonOneEdge {
+  cursor: String!
+  node: PersonOne!
+}
+
+input PersonOneOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more PersonOneSort objects to sort PersonOnes by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [PersonOneSort!]
+}
+
+"""
+Fields to sort PersonOnes by. The order in which sorts are applied is not guaranteed when specifying many fields in one PersonOneSort object.
+"""
+input PersonOneSort {
+  name: SortDirection
+}
+
+input PersonOneWhere {
+  AND: [PersonOneWhere!]
+  NOT: PersonOneWhere
+  OR: [PersonOneWhere!]
+  name: String
+  name_CONTAINS: String
+  name_ENDS_WITH: String
+  name_IN: [String]
+  name_STARTS_WITH: String
+}
+
+type PersonOnesConnection {
+  edges: [PersonOneEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+type PersonTwo {
+  nameTwo: String
+}
+
+type PersonTwoEdge {
+  cursor: String!
+  node: PersonTwo!
+}
+
+input PersonTwoOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more PersonTwoSort objects to sort PersonTwos by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [PersonTwoSort!]
+}
+
+"""
+Fields to sort PersonTwos by. The order in which sorts are applied is not guaranteed when specifying many fields in one PersonTwoSort object.
+"""
+input PersonTwoSort {
+  nameTwo: SortDirection
+}
+
+input PersonTwoWhere {
+  AND: [PersonTwoWhere!]
+  NOT: PersonTwoWhere
+  OR: [PersonTwoWhere!]
+  nameTwo: String
+  nameTwo_CONTAINS: String
+  nameTwo_ENDS_WITH: String
+  nameTwo_IN: [String]
+  nameTwo_STARTS_WITH: String
+}
+
+type PersonTwosConnection {
+  edges: [PersonTwoEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input PersonWhere {
+  PersonOne: PersonOneWhere
+  PersonTwo: PersonTwoWhere
+}
+
+type Query {
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+  people(options: QueryOptions, where: PersonWhere): [Person!]!
+  personOnes(options: PersonOneOptions, where: PersonOneWhere): [PersonOne!]!
+  personOnesConnection(after: String, first: Int, sort: [PersonOneSort], where: PersonOneWhere): PersonOnesConnection!
+  personTwos(options: PersonTwoOptions, where: PersonTwoWhere): [PersonTwo!]!
+  personTwosConnection(after: String, first: Int, sort: [PersonTwoSort], where: PersonTwoWhere): PersonTwosConnection!
+}
+
+"""Input type for options that can be specified on a query operation."""
+input QueryOptions {
+  limit: Int
+  offset: Int
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
+
+=== Single relationship with nested operation CREATE specified
+
+.Schema
+[source,graphql,schema=true]
+----
+type PersonOne {
+  name: String
+}
+
+type PersonTwo {
+  nameTwo: String
+}
+
+union Person = PersonOne | PersonTwo
+
+type Movie {
+  id: ID
+  actors: [Person!]! @relationship(type: "ACTED_IN", direction: IN, nestedOperations: [CREATE])
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+type Movie {
+  actors(directed: Boolean = true, options: QueryOptions, where: PersonWhere): [Person!]!
+  actorsConnection(after: String, directed: Boolean = true, first: Int, where: MovieActorsConnectionWhere): MovieActorsConnection!
+  id: ID
+}
+
+type MovieActorsConnection {
+  edges: [MovieActorsRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input MovieActorsConnectionWhere {
+  PersonOne: MovieActorsPersonOneConnectionWhere
+  PersonTwo: MovieActorsPersonTwoConnectionWhere
+}
+
+input MovieActorsPersonOneConnectionWhere {
+  AND: [MovieActorsPersonOneConnectionWhere!]
+  NOT: MovieActorsPersonOneConnectionWhere
+  OR: [MovieActorsPersonOneConnectionWhere!]
+  node: PersonOneWhere
+}
+
+input MovieActorsPersonTwoConnectionWhere {
+  AND: [MovieActorsPersonTwoConnectionWhere!]
+  NOT: MovieActorsPersonTwoConnectionWhere
+  OR: [MovieActorsPersonTwoConnectionWhere!]
+  node: PersonTwoWhere
+}
+
+type MovieActorsRelationship {
+  cursor: String!
+  node: Person!
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MovieSort!]
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
+"""
+input MovieSort {
+  id: SortDirection
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  """
+  Return Movies where all of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_ALL: MovieActorsConnectionWhere
+  """
+  Return Movies where none of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_NONE: MovieActorsConnectionWhere
+  """
+  Return Movies where one of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SINGLE: MovieActorsConnectionWhere
+  """
+  Return Movies where some of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SOME: MovieActorsConnectionWhere
+  """Return Movies where all of the related People match this filter"""
+  actors_ALL: PersonWhere
+  """Return Movies where none of the related People match this filter"""
+  actors_NONE: PersonWhere
+  """Return Movies where one of the related People match this filter"""
+  actors_SINGLE: PersonWhere
+  """Return Movies where some of the related People match this filter"""
+  actors_SOME: PersonWhere
+  id: ID
+  id_CONTAINS: ID
+  id_ENDS_WITH: ID
+  id_IN: [ID]
+  id_STARTS_WITH: ID
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+union Person = PersonOne | PersonTwo
+
+type PersonOne {
+  name: String
+}
+
+type PersonOneEdge {
+  cursor: String!
+  node: PersonOne!
+}
+
+input PersonOneOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more PersonOneSort objects to sort PersonOnes by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [PersonOneSort!]
+}
+
+"""
+Fields to sort PersonOnes by. The order in which sorts are applied is not guaranteed when specifying many fields in one PersonOneSort object.
+"""
+input PersonOneSort {
+  name: SortDirection
+}
+
+input PersonOneWhere {
+  AND: [PersonOneWhere!]
+  NOT: PersonOneWhere
+  OR: [PersonOneWhere!]
+  name: String
+  name_CONTAINS: String
+  name_ENDS_WITH: String
+  name_IN: [String]
+  name_STARTS_WITH: String
+}
+
+type PersonOnesConnection {
+  edges: [PersonOneEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+type PersonTwo {
+  nameTwo: String
+}
+
+type PersonTwoEdge {
+  cursor: String!
+  node: PersonTwo!
+}
+
+input PersonTwoOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more PersonTwoSort objects to sort PersonTwos by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [PersonTwoSort!]
+}
+
+"""
+Fields to sort PersonTwos by. The order in which sorts are applied is not guaranteed when specifying many fields in one PersonTwoSort object.
+"""
+input PersonTwoSort {
+  nameTwo: SortDirection
+}
+
+input PersonTwoWhere {
+  AND: [PersonTwoWhere!]
+  NOT: PersonTwoWhere
+  OR: [PersonTwoWhere!]
+  nameTwo: String
+  nameTwo_CONTAINS: String
+  nameTwo_ENDS_WITH: String
+  nameTwo_IN: [String]
+  nameTwo_STARTS_WITH: String
+}
+
+type PersonTwosConnection {
+  edges: [PersonTwoEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input PersonWhere {
+  PersonOne: PersonOneWhere
+  PersonTwo: PersonTwoWhere
+}
+
+type Query {
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+  people(options: QueryOptions, where: PersonWhere): [Person!]!
+  personOnes(options: PersonOneOptions, where: PersonOneWhere): [PersonOne!]!
+  personOnesConnection(after: String, first: Int, sort: [PersonOneSort], where: PersonOneWhere): PersonOnesConnection!
+  personTwos(options: PersonTwoOptions, where: PersonTwoWhere): [PersonTwo!]!
+  personTwosConnection(after: String, first: Int, sort: [PersonTwoSort], where: PersonTwoWhere): PersonTwosConnection!
+}
+
+"""Input type for options that can be specified on a query operation."""
+input QueryOptions {
+  limit: Int
+  offset: Int
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
+
+=== Single relationship with nested operation CONNECT specified
+
+.Schema
+[source,graphql,schema=true]
+----
+type PersonOne {
+  name: String
+}
+
+type PersonTwo {
+  nameTwo: String
+}
+
+union Person = PersonOne | PersonTwo
+
+type Movie {
+  id: ID
+  actors: [Person!]! @relationship(type: "ACTED_IN", direction: IN, nestedOperations: [CONNECT])
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+type Movie {
+  actors(directed: Boolean = true, options: QueryOptions, where: PersonWhere): [Person!]!
+  actorsConnection(after: String, directed: Boolean = true, first: Int, where: MovieActorsConnectionWhere): MovieActorsConnection!
+  id: ID
+}
+
+type MovieActorsConnection {
+  edges: [MovieActorsRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input MovieActorsConnectionWhere {
+  PersonOne: MovieActorsPersonOneConnectionWhere
+  PersonTwo: MovieActorsPersonTwoConnectionWhere
+}
+
+input MovieActorsPersonOneConnectionWhere {
+  AND: [MovieActorsPersonOneConnectionWhere!]
+  NOT: MovieActorsPersonOneConnectionWhere
+  OR: [MovieActorsPersonOneConnectionWhere!]
+  node: PersonOneWhere
+}
+
+input MovieActorsPersonTwoConnectionWhere {
+  AND: [MovieActorsPersonTwoConnectionWhere!]
+  NOT: MovieActorsPersonTwoConnectionWhere
+  OR: [MovieActorsPersonTwoConnectionWhere!]
+  node: PersonTwoWhere
+}
+
+type MovieActorsRelationship {
+  cursor: String!
+  node: Person!
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MovieSort!]
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
+"""
+input MovieSort {
+  id: SortDirection
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  """
+  Return Movies where all of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_ALL: MovieActorsConnectionWhere
+  """
+  Return Movies where none of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_NONE: MovieActorsConnectionWhere
+  """
+  Return Movies where one of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SINGLE: MovieActorsConnectionWhere
+  """
+  Return Movies where some of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SOME: MovieActorsConnectionWhere
+  """Return Movies where all of the related People match this filter"""
+  actors_ALL: PersonWhere
+  """Return Movies where none of the related People match this filter"""
+  actors_NONE: PersonWhere
+  """Return Movies where one of the related People match this filter"""
+  actors_SINGLE: PersonWhere
+  """Return Movies where some of the related People match this filter"""
+  actors_SOME: PersonWhere
+  id: ID
+  id_CONTAINS: ID
+  id_ENDS_WITH: ID
+  id_IN: [ID]
+  id_STARTS_WITH: ID
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+union Person = PersonOne | PersonTwo
+
+type PersonOne {
+  name: String
+}
+
+type PersonOneEdge {
+  cursor: String!
+  node: PersonOne!
+}
+
+input PersonOneOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more PersonOneSort objects to sort PersonOnes by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [PersonOneSort!]
+}
+
+"""
+Fields to sort PersonOnes by. The order in which sorts are applied is not guaranteed when specifying many fields in one PersonOneSort object.
+"""
+input PersonOneSort {
+  name: SortDirection
+}
+
+input PersonOneWhere {
+  AND: [PersonOneWhere!]
+  NOT: PersonOneWhere
+  OR: [PersonOneWhere!]
+  name: String
+  name_CONTAINS: String
+  name_ENDS_WITH: String
+  name_IN: [String]
+  name_STARTS_WITH: String
+}
+
+type PersonOnesConnection {
+  edges: [PersonOneEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+type PersonTwo {
+  nameTwo: String
+}
+
+type PersonTwoEdge {
+  cursor: String!
+  node: PersonTwo!
+}
+
+input PersonTwoOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more PersonTwoSort objects to sort PersonTwos by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [PersonTwoSort!]
+}
+
+"""
+Fields to sort PersonTwos by. The order in which sorts are applied is not guaranteed when specifying many fields in one PersonTwoSort object.
+"""
+input PersonTwoSort {
+  nameTwo: SortDirection
+}
+
+input PersonTwoWhere {
+  AND: [PersonTwoWhere!]
+  NOT: PersonTwoWhere
+  OR: [PersonTwoWhere!]
+  nameTwo: String
+  nameTwo_CONTAINS: String
+  nameTwo_ENDS_WITH: String
+  nameTwo_IN: [String]
+  nameTwo_STARTS_WITH: String
+}
+
+type PersonTwosConnection {
+  edges: [PersonTwoEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input PersonWhere {
+  PersonOne: PersonOneWhere
+  PersonTwo: PersonTwoWhere
+}
+
+type Query {
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+  people(options: QueryOptions, where: PersonWhere): [Person!]!
+  personOnes(options: PersonOneOptions, where: PersonOneWhere): [PersonOne!]!
+  personOnesConnection(after: String, first: Int, sort: [PersonOneSort], where: PersonOneWhere): PersonOnesConnection!
+  personTwos(options: PersonTwoOptions, where: PersonTwoWhere): [PersonTwo!]!
+  personTwosConnection(after: String, first: Int, sort: [PersonTwoSort], where: PersonTwoWhere): PersonTwosConnection!
+}
+
+"""Input type for options that can be specified on a query operation."""
+input QueryOptions {
+  limit: Int
+  offset: Int
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
+
+=== Single relationship with nested operation UPDATE specified
+
+.Schema
+[source,graphql,schema=true]
+----
+type PersonOne {
+  name: String
+}
+
+type PersonTwo {
+  nameTwo: String
+}
+
+union Person = PersonOne | PersonTwo
+
+type Movie {
+  id: ID
+  actors: [Person!]! @relationship(type: "ACTED_IN", direction: IN, nestedOperations: [UPDATE])
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+type Movie {
+  actors(directed: Boolean = true, options: QueryOptions, where: PersonWhere): [Person!]!
+  actorsConnection(after: String, directed: Boolean = true, first: Int, where: MovieActorsConnectionWhere): MovieActorsConnection!
+  id: ID
+}
+
+type MovieActorsConnection {
+  edges: [MovieActorsRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input MovieActorsConnectionWhere {
+  PersonOne: MovieActorsPersonOneConnectionWhere
+  PersonTwo: MovieActorsPersonTwoConnectionWhere
+}
+
+input MovieActorsPersonOneConnectionWhere {
+  AND: [MovieActorsPersonOneConnectionWhere!]
+  NOT: MovieActorsPersonOneConnectionWhere
+  OR: [MovieActorsPersonOneConnectionWhere!]
+  node: PersonOneWhere
+}
+
+input MovieActorsPersonTwoConnectionWhere {
+  AND: [MovieActorsPersonTwoConnectionWhere!]
+  NOT: MovieActorsPersonTwoConnectionWhere
+  OR: [MovieActorsPersonTwoConnectionWhere!]
+  node: PersonTwoWhere
+}
+
+type MovieActorsRelationship {
+  cursor: String!
+  node: Person!
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MovieSort!]
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
+"""
+input MovieSort {
+  id: SortDirection
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  """
+  Return Movies where all of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_ALL: MovieActorsConnectionWhere
+  """
+  Return Movies where none of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_NONE: MovieActorsConnectionWhere
+  """
+  Return Movies where one of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SINGLE: MovieActorsConnectionWhere
+  """
+  Return Movies where some of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SOME: MovieActorsConnectionWhere
+  """Return Movies where all of the related People match this filter"""
+  actors_ALL: PersonWhere
+  """Return Movies where none of the related People match this filter"""
+  actors_NONE: PersonWhere
+  """Return Movies where one of the related People match this filter"""
+  actors_SINGLE: PersonWhere
+  """Return Movies where some of the related People match this filter"""
+  actors_SOME: PersonWhere
+  id: ID
+  id_CONTAINS: ID
+  id_ENDS_WITH: ID
+  id_IN: [ID]
+  id_STARTS_WITH: ID
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+union Person = PersonOne | PersonTwo
+
+type PersonOne {
+  name: String
+}
+
+type PersonOneEdge {
+  cursor: String!
+  node: PersonOne!
+}
+
+input PersonOneOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more PersonOneSort objects to sort PersonOnes by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [PersonOneSort!]
+}
+
+"""
+Fields to sort PersonOnes by. The order in which sorts are applied is not guaranteed when specifying many fields in one PersonOneSort object.
+"""
+input PersonOneSort {
+  name: SortDirection
+}
+
+input PersonOneWhere {
+  AND: [PersonOneWhere!]
+  NOT: PersonOneWhere
+  OR: [PersonOneWhere!]
+  name: String
+  name_CONTAINS: String
+  name_ENDS_WITH: String
+  name_IN: [String]
+  name_STARTS_WITH: String
+}
+
+type PersonOnesConnection {
+  edges: [PersonOneEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+type PersonTwo {
+  nameTwo: String
+}
+
+type PersonTwoEdge {
+  cursor: String!
+  node: PersonTwo!
+}
+
+input PersonTwoOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more PersonTwoSort objects to sort PersonTwos by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [PersonTwoSort!]
+}
+
+"""
+Fields to sort PersonTwos by. The order in which sorts are applied is not guaranteed when specifying many fields in one PersonTwoSort object.
+"""
+input PersonTwoSort {
+  nameTwo: SortDirection
+}
+
+input PersonTwoWhere {
+  AND: [PersonTwoWhere!]
+  NOT: PersonTwoWhere
+  OR: [PersonTwoWhere!]
+  nameTwo: String
+  nameTwo_CONTAINS: String
+  nameTwo_ENDS_WITH: String
+  nameTwo_IN: [String]
+  nameTwo_STARTS_WITH: String
+}
+
+type PersonTwosConnection {
+  edges: [PersonTwoEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input PersonWhere {
+  PersonOne: PersonOneWhere
+  PersonTwo: PersonTwoWhere
+}
+
+type Query {
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+  people(options: QueryOptions, where: PersonWhere): [Person!]!
+  personOnes(options: PersonOneOptions, where: PersonOneWhere): [PersonOne!]!
+  personOnesConnection(after: String, first: Int, sort: [PersonOneSort], where: PersonOneWhere): PersonOnesConnection!
+  personTwos(options: PersonTwoOptions, where: PersonTwoWhere): [PersonTwo!]!
+  personTwosConnection(after: String, first: Int, sort: [PersonTwoSort], where: PersonTwoWhere): PersonTwosConnection!
+}
+
+"""Input type for options that can be specified on a query operation."""
+input QueryOptions {
+  limit: Int
+  offset: Int
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
+
+=== Single relationship with nested operation DELETE specified
+
+.Schema
+[source,graphql,schema=true]
+----
+type PersonOne {
+  name: String
+}
+
+type PersonTwo {
+  nameTwo: String
+}
+
+union Person = PersonOne | PersonTwo
+
+type Movie {
+  id: ID
+  actors: [Person!]! @relationship(type: "ACTED_IN", direction: IN, nestedOperations: [DELETE])
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+type Movie {
+  actors(directed: Boolean = true, options: QueryOptions, where: PersonWhere): [Person!]!
+  actorsConnection(after: String, directed: Boolean = true, first: Int, where: MovieActorsConnectionWhere): MovieActorsConnection!
+  id: ID
+}
+
+type MovieActorsConnection {
+  edges: [MovieActorsRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input MovieActorsConnectionWhere {
+  PersonOne: MovieActorsPersonOneConnectionWhere
+  PersonTwo: MovieActorsPersonTwoConnectionWhere
+}
+
+input MovieActorsPersonOneConnectionWhere {
+  AND: [MovieActorsPersonOneConnectionWhere!]
+  NOT: MovieActorsPersonOneConnectionWhere
+  OR: [MovieActorsPersonOneConnectionWhere!]
+  node: PersonOneWhere
+}
+
+input MovieActorsPersonTwoConnectionWhere {
+  AND: [MovieActorsPersonTwoConnectionWhere!]
+  NOT: MovieActorsPersonTwoConnectionWhere
+  OR: [MovieActorsPersonTwoConnectionWhere!]
+  node: PersonTwoWhere
+}
+
+type MovieActorsRelationship {
+  cursor: String!
+  node: Person!
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MovieSort!]
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
+"""
+input MovieSort {
+  id: SortDirection
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  """
+  Return Movies where all of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_ALL: MovieActorsConnectionWhere
+  """
+  Return Movies where none of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_NONE: MovieActorsConnectionWhere
+  """
+  Return Movies where one of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SINGLE: MovieActorsConnectionWhere
+  """
+  Return Movies where some of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SOME: MovieActorsConnectionWhere
+  """Return Movies where all of the related People match this filter"""
+  actors_ALL: PersonWhere
+  """Return Movies where none of the related People match this filter"""
+  actors_NONE: PersonWhere
+  """Return Movies where one of the related People match this filter"""
+  actors_SINGLE: PersonWhere
+  """Return Movies where some of the related People match this filter"""
+  actors_SOME: PersonWhere
+  id: ID
+  id_CONTAINS: ID
+  id_ENDS_WITH: ID
+  id_IN: [ID]
+  id_STARTS_WITH: ID
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+union Person = PersonOne | PersonTwo
+
+type PersonOne {
+  name: String
+}
+
+type PersonOneEdge {
+  cursor: String!
+  node: PersonOne!
+}
+
+input PersonOneOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more PersonOneSort objects to sort PersonOnes by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [PersonOneSort!]
+}
+
+"""
+Fields to sort PersonOnes by. The order in which sorts are applied is not guaranteed when specifying many fields in one PersonOneSort object.
+"""
+input PersonOneSort {
+  name: SortDirection
+}
+
+input PersonOneWhere {
+  AND: [PersonOneWhere!]
+  NOT: PersonOneWhere
+  OR: [PersonOneWhere!]
+  name: String
+  name_CONTAINS: String
+  name_ENDS_WITH: String
+  name_IN: [String]
+  name_STARTS_WITH: String
+}
+
+type PersonOnesConnection {
+  edges: [PersonOneEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+type PersonTwo {
+  nameTwo: String
+}
+
+type PersonTwoEdge {
+  cursor: String!
+  node: PersonTwo!
+}
+
+input PersonTwoOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more PersonTwoSort objects to sort PersonTwos by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [PersonTwoSort!]
+}
+
+"""
+Fields to sort PersonTwos by. The order in which sorts are applied is not guaranteed when specifying many fields in one PersonTwoSort object.
+"""
+input PersonTwoSort {
+  nameTwo: SortDirection
+}
+
+input PersonTwoWhere {
+  AND: [PersonTwoWhere!]
+  NOT: PersonTwoWhere
+  OR: [PersonTwoWhere!]
+  nameTwo: String
+  nameTwo_CONTAINS: String
+  nameTwo_ENDS_WITH: String
+  nameTwo_IN: [String]
+  nameTwo_STARTS_WITH: String
+}
+
+type PersonTwosConnection {
+  edges: [PersonTwoEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input PersonWhere {
+  PersonOne: PersonOneWhere
+  PersonTwo: PersonTwoWhere
+}
+
+type Query {
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+  people(options: QueryOptions, where: PersonWhere): [Person!]!
+  personOnes(options: PersonOneOptions, where: PersonOneWhere): [PersonOne!]!
+  personOnesConnection(after: String, first: Int, sort: [PersonOneSort], where: PersonOneWhere): PersonOnesConnection!
+  personTwos(options: PersonTwoOptions, where: PersonTwoWhere): [PersonTwo!]!
+  personTwosConnection(after: String, first: Int, sort: [PersonTwoSort], where: PersonTwoWhere): PersonTwosConnection!
+}
+
+"""Input type for options that can be specified on a query operation."""
+input QueryOptions {
+  limit: Int
+  offset: Int
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
+
+=== Single relationship with nested operation DISCONNECT specified
+
+.Schema
+[source,graphql,schema=true]
+----
+type PersonOne {
+  name: String
+}
+
+type PersonTwo {
+  nameTwo: String
+}
+
+union Person = PersonOne | PersonTwo
+
+type Movie {
+  id: ID
+  actors: [Person!]! @relationship(type: "ACTED_IN", direction: IN, nestedOperations: [DISCONNECT])
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+type Movie {
+  actors(directed: Boolean = true, options: QueryOptions, where: PersonWhere): [Person!]!
+  actorsConnection(after: String, directed: Boolean = true, first: Int, where: MovieActorsConnectionWhere): MovieActorsConnection!
+  id: ID
+}
+
+type MovieActorsConnection {
+  edges: [MovieActorsRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input MovieActorsConnectionWhere {
+  PersonOne: MovieActorsPersonOneConnectionWhere
+  PersonTwo: MovieActorsPersonTwoConnectionWhere
+}
+
+input MovieActorsPersonOneConnectionWhere {
+  AND: [MovieActorsPersonOneConnectionWhere!]
+  NOT: MovieActorsPersonOneConnectionWhere
+  OR: [MovieActorsPersonOneConnectionWhere!]
+  node: PersonOneWhere
+}
+
+input MovieActorsPersonTwoConnectionWhere {
+  AND: [MovieActorsPersonTwoConnectionWhere!]
+  NOT: MovieActorsPersonTwoConnectionWhere
+  OR: [MovieActorsPersonTwoConnectionWhere!]
+  node: PersonTwoWhere
+}
+
+type MovieActorsRelationship {
+  cursor: String!
+  node: Person!
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MovieSort!]
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
+"""
+input MovieSort {
+  id: SortDirection
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  """
+  Return Movies where all of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_ALL: MovieActorsConnectionWhere
+  """
+  Return Movies where none of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_NONE: MovieActorsConnectionWhere
+  """
+  Return Movies where one of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SINGLE: MovieActorsConnectionWhere
+  """
+  Return Movies where some of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SOME: MovieActorsConnectionWhere
+  """Return Movies where all of the related People match this filter"""
+  actors_ALL: PersonWhere
+  """Return Movies where none of the related People match this filter"""
+  actors_NONE: PersonWhere
+  """Return Movies where one of the related People match this filter"""
+  actors_SINGLE: PersonWhere
+  """Return Movies where some of the related People match this filter"""
+  actors_SOME: PersonWhere
+  id: ID
+  id_CONTAINS: ID
+  id_ENDS_WITH: ID
+  id_IN: [ID]
+  id_STARTS_WITH: ID
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+union Person = PersonOne | PersonTwo
+
+type PersonOne {
+  name: String
+}
+
+type PersonOneEdge {
+  cursor: String!
+  node: PersonOne!
+}
+
+input PersonOneOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more PersonOneSort objects to sort PersonOnes by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [PersonOneSort!]
+}
+
+"""
+Fields to sort PersonOnes by. The order in which sorts are applied is not guaranteed when specifying many fields in one PersonOneSort object.
+"""
+input PersonOneSort {
+  name: SortDirection
+}
+
+input PersonOneWhere {
+  AND: [PersonOneWhere!]
+  NOT: PersonOneWhere
+  OR: [PersonOneWhere!]
+  name: String
+  name_CONTAINS: String
+  name_ENDS_WITH: String
+  name_IN: [String]
+  name_STARTS_WITH: String
+}
+
+type PersonOnesConnection {
+  edges: [PersonOneEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+type PersonTwo {
+  nameTwo: String
+}
+
+type PersonTwoEdge {
+  cursor: String!
+  node: PersonTwo!
+}
+
+input PersonTwoOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more PersonTwoSort objects to sort PersonTwos by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [PersonTwoSort!]
+}
+
+"""
+Fields to sort PersonTwos by. The order in which sorts are applied is not guaranteed when specifying many fields in one PersonTwoSort object.
+"""
+input PersonTwoSort {
+  nameTwo: SortDirection
+}
+
+input PersonTwoWhere {
+  AND: [PersonTwoWhere!]
+  NOT: PersonTwoWhere
+  OR: [PersonTwoWhere!]
+  nameTwo: String
+  nameTwo_CONTAINS: String
+  nameTwo_ENDS_WITH: String
+  nameTwo_IN: [String]
+  nameTwo_STARTS_WITH: String
+}
+
+type PersonTwosConnection {
+  edges: [PersonTwoEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input PersonWhere {
+  PersonOne: PersonOneWhere
+  PersonTwo: PersonTwoWhere
+}
+
+type Query {
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+  people(options: QueryOptions, where: PersonWhere): [Person!]!
+  personOnes(options: PersonOneOptions, where: PersonOneWhere): [PersonOne!]!
+  personOnesConnection(after: String, first: Int, sort: [PersonOneSort], where: PersonOneWhere): PersonOnesConnection!
+  personTwos(options: PersonTwoOptions, where: PersonTwoWhere): [PersonTwo!]!
+  personTwosConnection(after: String, first: Int, sort: [PersonTwoSort], where: PersonTwoWhere): PersonTwosConnection!
+}
+
+"""Input type for options that can be specified on a query operation."""
+input QueryOptions {
+  limit: Int
+  offset: Int
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
+
+=== Should not generate any nested operations if only CONNECT_OR_CREATE is specified and the related type does not have a unique field
+
+.Schema
+[source,graphql,schema=true]
+----
+type PersonOne {
+  name: String
+}
+
+type PersonTwo {
+  nameTwo: String
+}
+
+union Person = PersonOne | PersonTwo
+
+type Movie {
+  id: ID
+  actors: [Person!]! @relationship(type: "ACTED_IN", direction: IN, nestedOperations: [CONNECT_OR_CREATE])
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+type Movie {
+  actors(directed: Boolean = true, options: QueryOptions, where: PersonWhere): [Person!]!
+  actorsConnection(after: String, directed: Boolean = true, first: Int, where: MovieActorsConnectionWhere): MovieActorsConnection!
+  id: ID
+}
+
+type MovieActorsConnection {
+  edges: [MovieActorsRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input MovieActorsConnectionWhere {
+  PersonOne: MovieActorsPersonOneConnectionWhere
+  PersonTwo: MovieActorsPersonTwoConnectionWhere
+}
+
+input MovieActorsPersonOneConnectionWhere {
+  AND: [MovieActorsPersonOneConnectionWhere!]
+  NOT: MovieActorsPersonOneConnectionWhere
+  OR: [MovieActorsPersonOneConnectionWhere!]
+  node: PersonOneWhere
+}
+
+input MovieActorsPersonTwoConnectionWhere {
+  AND: [MovieActorsPersonTwoConnectionWhere!]
+  NOT: MovieActorsPersonTwoConnectionWhere
+  OR: [MovieActorsPersonTwoConnectionWhere!]
+  node: PersonTwoWhere
+}
+
+type MovieActorsRelationship {
+  cursor: String!
+  node: Person!
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MovieSort!]
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
+"""
+input MovieSort {
+  id: SortDirection
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  """
+  Return Movies where all of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_ALL: MovieActorsConnectionWhere
+  """
+  Return Movies where none of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_NONE: MovieActorsConnectionWhere
+  """
+  Return Movies where one of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SINGLE: MovieActorsConnectionWhere
+  """
+  Return Movies where some of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SOME: MovieActorsConnectionWhere
+  """Return Movies where all of the related People match this filter"""
+  actors_ALL: PersonWhere
+  """Return Movies where none of the related People match this filter"""
+  actors_NONE: PersonWhere
+  """Return Movies where one of the related People match this filter"""
+  actors_SINGLE: PersonWhere
+  """Return Movies where some of the related People match this filter"""
+  actors_SOME: PersonWhere
+  id: ID
+  id_CONTAINS: ID
+  id_ENDS_WITH: ID
+  id_IN: [ID]
+  id_STARTS_WITH: ID
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+union Person = PersonOne | PersonTwo
+
+type PersonOne {
+  name: String
+}
+
+type PersonOneEdge {
+  cursor: String!
+  node: PersonOne!
+}
+
+input PersonOneOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more PersonOneSort objects to sort PersonOnes by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [PersonOneSort!]
+}
+
+"""
+Fields to sort PersonOnes by. The order in which sorts are applied is not guaranteed when specifying many fields in one PersonOneSort object.
+"""
+input PersonOneSort {
+  name: SortDirection
+}
+
+input PersonOneWhere {
+  AND: [PersonOneWhere!]
+  NOT: PersonOneWhere
+  OR: [PersonOneWhere!]
+  name: String
+  name_CONTAINS: String
+  name_ENDS_WITH: String
+  name_IN: [String]
+  name_STARTS_WITH: String
+}
+
+type PersonOnesConnection {
+  edges: [PersonOneEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+type PersonTwo {
+  nameTwo: String
+}
+
+type PersonTwoEdge {
+  cursor: String!
+  node: PersonTwo!
+}
+
+input PersonTwoOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more PersonTwoSort objects to sort PersonTwos by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [PersonTwoSort!]
+}
+
+"""
+Fields to sort PersonTwos by. The order in which sorts are applied is not guaranteed when specifying many fields in one PersonTwoSort object.
+"""
+input PersonTwoSort {
+  nameTwo: SortDirection
+}
+
+input PersonTwoWhere {
+  AND: [PersonTwoWhere!]
+  NOT: PersonTwoWhere
+  OR: [PersonTwoWhere!]
+  nameTwo: String
+  nameTwo_CONTAINS: String
+  nameTwo_ENDS_WITH: String
+  nameTwo_IN: [String]
+  nameTwo_STARTS_WITH: String
+}
+
+type PersonTwosConnection {
+  edges: [PersonTwoEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input PersonWhere {
+  PersonOne: PersonOneWhere
+  PersonTwo: PersonTwoWhere
+}
+
+type Query {
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+  people(options: QueryOptions, where: PersonWhere): [Person!]!
+  personOnes(options: PersonOneOptions, where: PersonOneWhere): [PersonOne!]!
+  personOnesConnection(after: String, first: Int, sort: [PersonOneSort], where: PersonOneWhere): PersonOnesConnection!
+  personTwos(options: PersonTwoOptions, where: PersonTwoWhere): [PersonTwo!]!
+  personTwosConnection(after: String, first: Int, sort: [PersonTwoSort], where: PersonTwoWhere): PersonTwosConnection!
+}
+
+"""Input type for options that can be specified on a query operation."""
+input QueryOptions {
+  limit: Int
+  offset: Int
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
+
+=== Two relationships with nested operations specified on one
+
+.Schema
+[source,graphql,schema=true]
+----
+type PersonOne {
+  name: String
+}
+
+type PersonTwo {
+  nameTwo: String
+}
+
+union Person = PersonOne | PersonTwo
+
+type Movie {
+  id: ID
+  actors: [Person!]! @relationship(type: "ACTED_IN", direction: IN)
+  producers: [Person!]! @relationship(type: "PRODUCED", direction: IN, nestedOperations: [DISCONNECT])
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+type Movie {
+  actors(directed: Boolean = true, options: QueryOptions, where: PersonWhere): [Person!]!
+  actorsConnection(after: String, directed: Boolean = true, first: Int, where: MovieActorsConnectionWhere): MovieActorsConnection!
+  id: ID
+  producers(directed: Boolean = true, options: QueryOptions, where: PersonWhere): [Person!]!
+  producersConnection(after: String, directed: Boolean = true, first: Int, where: MovieProducersConnectionWhere): MovieProducersConnection!
+}
+
+type MovieActorsConnection {
+  edges: [MovieActorsRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input MovieActorsConnectionWhere {
+  PersonOne: MovieActorsPersonOneConnectionWhere
+  PersonTwo: MovieActorsPersonTwoConnectionWhere
+}
+
+input MovieActorsPersonOneConnectionWhere {
+  AND: [MovieActorsPersonOneConnectionWhere!]
+  NOT: MovieActorsPersonOneConnectionWhere
+  OR: [MovieActorsPersonOneConnectionWhere!]
+  node: PersonOneWhere
+}
+
+input MovieActorsPersonTwoConnectionWhere {
+  AND: [MovieActorsPersonTwoConnectionWhere!]
+  NOT: MovieActorsPersonTwoConnectionWhere
+  OR: [MovieActorsPersonTwoConnectionWhere!]
+  node: PersonTwoWhere
+}
+
+type MovieActorsRelationship {
+  cursor: String!
+  node: Person!
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MovieSort!]
+}
+
+type MovieProducersConnection {
+  edges: [MovieProducersRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input MovieProducersConnectionWhere {
+  PersonOne: MovieProducersPersonOneConnectionWhere
+  PersonTwo: MovieProducersPersonTwoConnectionWhere
+}
+
+input MovieProducersPersonOneConnectionWhere {
+  AND: [MovieProducersPersonOneConnectionWhere!]
+  NOT: MovieProducersPersonOneConnectionWhere
+  OR: [MovieProducersPersonOneConnectionWhere!]
+  node: PersonOneWhere
+}
+
+input MovieProducersPersonTwoConnectionWhere {
+  AND: [MovieProducersPersonTwoConnectionWhere!]
+  NOT: MovieProducersPersonTwoConnectionWhere
+  OR: [MovieProducersPersonTwoConnectionWhere!]
+  node: PersonTwoWhere
+}
+
+type MovieProducersRelationship {
+  cursor: String!
+  node: Person!
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
+"""
+input MovieSort {
+  id: SortDirection
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  """
+  Return Movies where all of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_ALL: MovieActorsConnectionWhere
+  """
+  Return Movies where none of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_NONE: MovieActorsConnectionWhere
+  """
+  Return Movies where one of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SINGLE: MovieActorsConnectionWhere
+  """
+  Return Movies where some of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SOME: MovieActorsConnectionWhere
+  """Return Movies where all of the related People match this filter"""
+  actors_ALL: PersonWhere
+  """Return Movies where none of the related People match this filter"""
+  actors_NONE: PersonWhere
+  """Return Movies where one of the related People match this filter"""
+  actors_SINGLE: PersonWhere
+  """Return Movies where some of the related People match this filter"""
+  actors_SOME: PersonWhere
+  id: ID
+  id_CONTAINS: ID
+  id_ENDS_WITH: ID
+  id_IN: [ID]
+  id_STARTS_WITH: ID
+  """
+  Return Movies where all of the related MovieProducersConnections match this filter
+  """
+  producersConnection_ALL: MovieProducersConnectionWhere
+  """
+  Return Movies where none of the related MovieProducersConnections match this filter
+  """
+  producersConnection_NONE: MovieProducersConnectionWhere
+  """
+  Return Movies where one of the related MovieProducersConnections match this filter
+  """
+  producersConnection_SINGLE: MovieProducersConnectionWhere
+  """
+  Return Movies where some of the related MovieProducersConnections match this filter
+  """
+  producersConnection_SOME: MovieProducersConnectionWhere
+  """Return Movies where all of the related People match this filter"""
+  producers_ALL: PersonWhere
+  """Return Movies where none of the related People match this filter"""
+  producers_NONE: PersonWhere
+  """Return Movies where one of the related People match this filter"""
+  producers_SINGLE: PersonWhere
+  """Return Movies where some of the related People match this filter"""
+  producers_SOME: PersonWhere
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+union Person = PersonOne | PersonTwo
+
+type PersonOne {
+  name: String
+}
+
+type PersonOneEdge {
+  cursor: String!
+  node: PersonOne!
+}
+
+input PersonOneOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more PersonOneSort objects to sort PersonOnes by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [PersonOneSort!]
+}
+
+"""
+Fields to sort PersonOnes by. The order in which sorts are applied is not guaranteed when specifying many fields in one PersonOneSort object.
+"""
+input PersonOneSort {
+  name: SortDirection
+}
+
+input PersonOneWhere {
+  AND: [PersonOneWhere!]
+  NOT: PersonOneWhere
+  OR: [PersonOneWhere!]
+  name: String
+  name_CONTAINS: String
+  name_ENDS_WITH: String
+  name_IN: [String]
+  name_STARTS_WITH: String
+}
+
+type PersonOnesConnection {
+  edges: [PersonOneEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+type PersonTwo {
+  nameTwo: String
+}
+
+type PersonTwoEdge {
+  cursor: String!
+  node: PersonTwo!
+}
+
+input PersonTwoOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more PersonTwoSort objects to sort PersonTwos by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [PersonTwoSort!]
+}
+
+"""
+Fields to sort PersonTwos by. The order in which sorts are applied is not guaranteed when specifying many fields in one PersonTwoSort object.
+"""
+input PersonTwoSort {
+  nameTwo: SortDirection
+}
+
+input PersonTwoWhere {
+  AND: [PersonTwoWhere!]
+  NOT: PersonTwoWhere
+  OR: [PersonTwoWhere!]
+  nameTwo: String
+  nameTwo_CONTAINS: String
+  nameTwo_ENDS_WITH: String
+  nameTwo_IN: [String]
+  nameTwo_STARTS_WITH: String
+}
+
+type PersonTwosConnection {
+  edges: [PersonTwoEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input PersonWhere {
+  PersonOne: PersonOneWhere
+  PersonTwo: PersonTwoWhere
+}
+
+type Query {
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+  people(options: QueryOptions, where: PersonWhere): [Person!]!
+  personOnes(options: PersonOneOptions, where: PersonOneWhere): [PersonOne!]!
+  personOnesConnection(after: String, first: Int, sort: [PersonOneSort], where: PersonOneWhere): PersonOnesConnection!
+  personTwos(options: PersonTwoOptions, where: PersonTwoWhere): [PersonTwo!]!
+  personTwosConnection(after: String, first: Int, sort: [PersonTwoSort], where: PersonTwoWhere): PersonTwosConnection!
+}
+
+"""Input type for options that can be specified on a query operation."""
+input QueryOptions {
+  limit: Int
+  offset: Int
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
+
+=== Two relationships with nested operations specified on both
+
+.Schema
+[source,graphql,schema=true]
+----
+type PersonOne {
+  name: String
+}
+
+type PersonTwo {
+  nameTwo: String
+}
+
+union Person = PersonOne | PersonTwo
+
+type Movie {
+  id: ID
+  actors: [Person!]! @relationship(type: "ACTED_IN", direction: IN, nestedOperations: [CREATE])
+  producers: [Person!]! @relationship(type: "PRODUCED", direction: IN, nestedOperations: [DISCONNECT])
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+type Movie {
+  actors(directed: Boolean = true, options: QueryOptions, where: PersonWhere): [Person!]!
+  actorsConnection(after: String, directed: Boolean = true, first: Int, where: MovieActorsConnectionWhere): MovieActorsConnection!
+  id: ID
+  producers(directed: Boolean = true, options: QueryOptions, where: PersonWhere): [Person!]!
+  producersConnection(after: String, directed: Boolean = true, first: Int, where: MovieProducersConnectionWhere): MovieProducersConnection!
+}
+
+type MovieActorsConnection {
+  edges: [MovieActorsRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input MovieActorsConnectionWhere {
+  PersonOne: MovieActorsPersonOneConnectionWhere
+  PersonTwo: MovieActorsPersonTwoConnectionWhere
+}
+
+input MovieActorsPersonOneConnectionWhere {
+  AND: [MovieActorsPersonOneConnectionWhere!]
+  NOT: MovieActorsPersonOneConnectionWhere
+  OR: [MovieActorsPersonOneConnectionWhere!]
+  node: PersonOneWhere
+}
+
+input MovieActorsPersonTwoConnectionWhere {
+  AND: [MovieActorsPersonTwoConnectionWhere!]
+  NOT: MovieActorsPersonTwoConnectionWhere
+  OR: [MovieActorsPersonTwoConnectionWhere!]
+  node: PersonTwoWhere
+}
+
+type MovieActorsRelationship {
+  cursor: String!
+  node: Person!
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MovieSort!]
+}
+
+type MovieProducersConnection {
+  edges: [MovieProducersRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input MovieProducersConnectionWhere {
+  PersonOne: MovieProducersPersonOneConnectionWhere
+  PersonTwo: MovieProducersPersonTwoConnectionWhere
+}
+
+input MovieProducersPersonOneConnectionWhere {
+  AND: [MovieProducersPersonOneConnectionWhere!]
+  NOT: MovieProducersPersonOneConnectionWhere
+  OR: [MovieProducersPersonOneConnectionWhere!]
+  node: PersonOneWhere
+}
+
+input MovieProducersPersonTwoConnectionWhere {
+  AND: [MovieProducersPersonTwoConnectionWhere!]
+  NOT: MovieProducersPersonTwoConnectionWhere
+  OR: [MovieProducersPersonTwoConnectionWhere!]
+  node: PersonTwoWhere
+}
+
+type MovieProducersRelationship {
+  cursor: String!
+  node: Person!
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
+"""
+input MovieSort {
+  id: SortDirection
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  """
+  Return Movies where all of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_ALL: MovieActorsConnectionWhere
+  """
+  Return Movies where none of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_NONE: MovieActorsConnectionWhere
+  """
+  Return Movies where one of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SINGLE: MovieActorsConnectionWhere
+  """
+  Return Movies where some of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SOME: MovieActorsConnectionWhere
+  """Return Movies where all of the related People match this filter"""
+  actors_ALL: PersonWhere
+  """Return Movies where none of the related People match this filter"""
+  actors_NONE: PersonWhere
+  """Return Movies where one of the related People match this filter"""
+  actors_SINGLE: PersonWhere
+  """Return Movies where some of the related People match this filter"""
+  actors_SOME: PersonWhere
+  id: ID
+  id_CONTAINS: ID
+  id_ENDS_WITH: ID
+  id_IN: [ID]
+  id_STARTS_WITH: ID
+  """
+  Return Movies where all of the related MovieProducersConnections match this filter
+  """
+  producersConnection_ALL: MovieProducersConnectionWhere
+  """
+  Return Movies where none of the related MovieProducersConnections match this filter
+  """
+  producersConnection_NONE: MovieProducersConnectionWhere
+  """
+  Return Movies where one of the related MovieProducersConnections match this filter
+  """
+  producersConnection_SINGLE: MovieProducersConnectionWhere
+  """
+  Return Movies where some of the related MovieProducersConnections match this filter
+  """
+  producersConnection_SOME: MovieProducersConnectionWhere
+  """Return Movies where all of the related People match this filter"""
+  producers_ALL: PersonWhere
+  """Return Movies where none of the related People match this filter"""
+  producers_NONE: PersonWhere
+  """Return Movies where one of the related People match this filter"""
+  producers_SINGLE: PersonWhere
+  """Return Movies where some of the related People match this filter"""
+  producers_SOME: PersonWhere
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+union Person = PersonOne | PersonTwo
+
+type PersonOne {
+  name: String
+}
+
+type PersonOneEdge {
+  cursor: String!
+  node: PersonOne!
+}
+
+input PersonOneOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more PersonOneSort objects to sort PersonOnes by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [PersonOneSort!]
+}
+
+"""
+Fields to sort PersonOnes by. The order in which sorts are applied is not guaranteed when specifying many fields in one PersonOneSort object.
+"""
+input PersonOneSort {
+  name: SortDirection
+}
+
+input PersonOneWhere {
+  AND: [PersonOneWhere!]
+  NOT: PersonOneWhere
+  OR: [PersonOneWhere!]
+  name: String
+  name_CONTAINS: String
+  name_ENDS_WITH: String
+  name_IN: [String]
+  name_STARTS_WITH: String
+}
+
+type PersonOnesConnection {
+  edges: [PersonOneEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+type PersonTwo {
+  nameTwo: String
+}
+
+type PersonTwoEdge {
+  cursor: String!
+  node: PersonTwo!
+}
+
+input PersonTwoOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more PersonTwoSort objects to sort PersonTwos by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [PersonTwoSort!]
+}
+
+"""
+Fields to sort PersonTwos by. The order in which sorts are applied is not guaranteed when specifying many fields in one PersonTwoSort object.
+"""
+input PersonTwoSort {
+  nameTwo: SortDirection
+}
+
+input PersonTwoWhere {
+  AND: [PersonTwoWhere!]
+  NOT: PersonTwoWhere
+  OR: [PersonTwoWhere!]
+  nameTwo: String
+  nameTwo_CONTAINS: String
+  nameTwo_ENDS_WITH: String
+  nameTwo_IN: [String]
+  nameTwo_STARTS_WITH: String
+}
+
+type PersonTwosConnection {
+  edges: [PersonTwoEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input PersonWhere {
+  PersonOne: PersonOneWhere
+  PersonTwo: PersonTwoWhere
+}
+
+type Query {
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+  people(options: QueryOptions, where: PersonWhere): [Person!]!
+  personOnes(options: PersonOneOptions, where: PersonOneWhere): [PersonOne!]!
+  personOnesConnection(after: String, first: Int, sort: [PersonOneSort], where: PersonOneWhere): PersonOnesConnection!
+  personTwos(options: PersonTwoOptions, where: PersonTwoWhere): [PersonTwo!]!
+  personTwosConnection(after: String, first: Int, sort: [PersonTwoSort], where: PersonTwoWhere): PersonTwosConnection!
+}
+
+"""Input type for options that can be specified on a query operation."""
+input QueryOptions {
+  limit: Int
+  offset: Int
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
+
+== Related to an interface type
+
+=== Should not generate UpdateFieldInput input with no nested operations
+
+.Schema
+[source,graphql,schema=true]
+----
+interface Person {
+  name: String
+}
+
+type PersonOne implements Person {
+  name: String
+  someExtraProp: [Int!]!
+}
+
+type PersonTwo implements Person {
+  name: String
+}
+
+type Movie {
+  id: ID
+  actors: [Person!]! @relationship(type: "ACTED_IN", direction: IN, nestedOperations: [])
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+type Movie {
+  actors(directed: Boolean = true, options: PersonOptions, where: PersonWhere): [Person!]!
+  actorsConnection(after: String, directed: Boolean = true, first: Int, sort: [MovieActorsConnectionSort!], where: MovieActorsConnectionWhere): MovieActorsConnection!
+  id: ID
+}
+
+type MovieActorsConnection {
+  edges: [MovieActorsRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input MovieActorsConnectionSort {
+  node: PersonSort
+}
+
+input MovieActorsConnectionWhere {
+  AND: [MovieActorsConnectionWhere!]
+  NOT: MovieActorsConnectionWhere
+  OR: [MovieActorsConnectionWhere!]
+  node: PersonWhere
+}
+
+type MovieActorsRelationship {
+  cursor: String!
+  node: Person!
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MovieSort!]
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
+"""
+input MovieSort {
+  id: SortDirection
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  """
+  Return Movies where all of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_ALL: MovieActorsConnectionWhere
+  """
+  Return Movies where none of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_NONE: MovieActorsConnectionWhere
+  """
+  Return Movies where one of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SINGLE: MovieActorsConnectionWhere
+  """
+  Return Movies where some of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SOME: MovieActorsConnectionWhere
+  """Return Movies where all of the related People match this filter"""
+  actors_ALL: PersonWhere
+  """Return Movies where none of the related People match this filter"""
+  actors_NONE: PersonWhere
+  """Return Movies where one of the related People match this filter"""
+  actors_SINGLE: PersonWhere
+  """Return Movies where some of the related People match this filter"""
+  actors_SOME: PersonWhere
+  id: ID
+  id_CONTAINS: ID
+  id_ENDS_WITH: ID
+  id_IN: [ID]
+  id_STARTS_WITH: ID
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+type PeopleConnection {
+  edges: [PersonEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+interface Person {
+  name: String
+}
+
+type PersonEdge {
+  cursor: String!
+  node: Person!
+}
+
+enum PersonImplementation {
+  PersonOne
+  PersonTwo
+}
+
+type PersonOne implements Person {
+  name: String
+  someExtraProp: [Int!]!
+}
+
+type PersonOneEdge {
+  cursor: String!
+  node: PersonOne!
+}
+
+input PersonOneOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more PersonOneSort objects to sort PersonOnes by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [PersonOneSort!]
+}
+
+"""
+Fields to sort PersonOnes by. The order in which sorts are applied is not guaranteed when specifying many fields in one PersonOneSort object.
+"""
+input PersonOneSort {
+  name: SortDirection
+}
+
+input PersonOneWhere {
+  AND: [PersonOneWhere!]
+  NOT: PersonOneWhere
+  OR: [PersonOneWhere!]
+  name: String
+  name_CONTAINS: String
+  name_ENDS_WITH: String
+  name_IN: [String]
+  name_STARTS_WITH: String
+  someExtraProp: [Int!]
+  someExtraProp_INCLUDES: Int
+}
+
+type PersonOnesConnection {
+  edges: [PersonOneEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input PersonOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more PersonSort objects to sort People by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [PersonSort]
+}
+
+"""
+Fields to sort People by. The order in which sorts are applied is not guaranteed when specifying many fields in one PersonSort object.
+"""
+input PersonSort {
+  name: SortDirection
+}
+
+type PersonTwo implements Person {
+  name: String
+}
+
+type PersonTwoEdge {
+  cursor: String!
+  node: PersonTwo!
+}
+
+input PersonTwoOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more PersonTwoSort objects to sort PersonTwos by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [PersonTwoSort!]
+}
+
+"""
+Fields to sort PersonTwos by. The order in which sorts are applied is not guaranteed when specifying many fields in one PersonTwoSort object.
+"""
+input PersonTwoSort {
+  name: SortDirection
+}
+
+input PersonTwoWhere {
+  AND: [PersonTwoWhere!]
+  NOT: PersonTwoWhere
+  OR: [PersonTwoWhere!]
+  name: String
+  name_CONTAINS: String
+  name_ENDS_WITH: String
+  name_IN: [String]
+  name_STARTS_WITH: String
+}
+
+type PersonTwosConnection {
+  edges: [PersonTwoEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input PersonWhere {
+  AND: [PersonWhere!]
+  NOT: PersonWhere
+  OR: [PersonWhere!]
+  name: String
+  name_CONTAINS: String
+  name_ENDS_WITH: String
+  name_IN: [String]
+  name_STARTS_WITH: String
+  typename_IN: [PersonImplementation!]
+}
+
+type Query {
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+  people(options: PersonOptions, where: PersonWhere): [Person!]!
+  peopleConnection(after: String, first: Int, sort: [PersonSort], where: PersonWhere): PeopleConnection!
+  personOnes(options: PersonOneOptions, where: PersonOneWhere): [PersonOne!]!
+  personOnesConnection(after: String, first: Int, sort: [PersonOneSort], where: PersonOneWhere): PersonOnesConnection!
+  personTwos(options: PersonTwoOptions, where: PersonTwoWhere): [PersonTwo!]!
+  personTwosConnection(after: String, first: Int, sort: [PersonTwoSort], where: PersonTwoWhere): PersonTwosConnection!
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
+
+=== Single relationship with nested operation CREATE specified
+
+.Schema
+[source,graphql,schema=true]
+----
+interface Person {
+  name: String
+}
+
+type PersonOne implements Person {
+  name: String
+  someExtraProp: [Int!]!
+}
+
+type PersonTwo implements Person {
+  name: String
+}
+
+type Movie {
+  id: ID
+  actors: [Person!]! @relationship(type: "ACTED_IN", direction: IN, nestedOperations: [CREATE])
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+type Movie {
+  actors(directed: Boolean = true, options: PersonOptions, where: PersonWhere): [Person!]!
+  actorsConnection(after: String, directed: Boolean = true, first: Int, sort: [MovieActorsConnectionSort!], where: MovieActorsConnectionWhere): MovieActorsConnection!
+  id: ID
+}
+
+type MovieActorsConnection {
+  edges: [MovieActorsRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input MovieActorsConnectionSort {
+  node: PersonSort
+}
+
+input MovieActorsConnectionWhere {
+  AND: [MovieActorsConnectionWhere!]
+  NOT: MovieActorsConnectionWhere
+  OR: [MovieActorsConnectionWhere!]
+  node: PersonWhere
+}
+
+type MovieActorsRelationship {
+  cursor: String!
+  node: Person!
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MovieSort!]
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
+"""
+input MovieSort {
+  id: SortDirection
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  """
+  Return Movies where all of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_ALL: MovieActorsConnectionWhere
+  """
+  Return Movies where none of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_NONE: MovieActorsConnectionWhere
+  """
+  Return Movies where one of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SINGLE: MovieActorsConnectionWhere
+  """
+  Return Movies where some of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SOME: MovieActorsConnectionWhere
+  """Return Movies where all of the related People match this filter"""
+  actors_ALL: PersonWhere
+  """Return Movies where none of the related People match this filter"""
+  actors_NONE: PersonWhere
+  """Return Movies where one of the related People match this filter"""
+  actors_SINGLE: PersonWhere
+  """Return Movies where some of the related People match this filter"""
+  actors_SOME: PersonWhere
+  id: ID
+  id_CONTAINS: ID
+  id_ENDS_WITH: ID
+  id_IN: [ID]
+  id_STARTS_WITH: ID
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+type PeopleConnection {
+  edges: [PersonEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+interface Person {
+  name: String
+}
+
+type PersonEdge {
+  cursor: String!
+  node: Person!
+}
+
+enum PersonImplementation {
+  PersonOne
+  PersonTwo
+}
+
+type PersonOne implements Person {
+  name: String
+  someExtraProp: [Int!]!
+}
+
+type PersonOneEdge {
+  cursor: String!
+  node: PersonOne!
+}
+
+input PersonOneOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more PersonOneSort objects to sort PersonOnes by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [PersonOneSort!]
+}
+
+"""
+Fields to sort PersonOnes by. The order in which sorts are applied is not guaranteed when specifying many fields in one PersonOneSort object.
+"""
+input PersonOneSort {
+  name: SortDirection
+}
+
+input PersonOneWhere {
+  AND: [PersonOneWhere!]
+  NOT: PersonOneWhere
+  OR: [PersonOneWhere!]
+  name: String
+  name_CONTAINS: String
+  name_ENDS_WITH: String
+  name_IN: [String]
+  name_STARTS_WITH: String
+  someExtraProp: [Int!]
+  someExtraProp_INCLUDES: Int
+}
+
+type PersonOnesConnection {
+  edges: [PersonOneEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input PersonOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more PersonSort objects to sort People by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [PersonSort]
+}
+
+"""
+Fields to sort People by. The order in which sorts are applied is not guaranteed when specifying many fields in one PersonSort object.
+"""
+input PersonSort {
+  name: SortDirection
+}
+
+type PersonTwo implements Person {
+  name: String
+}
+
+type PersonTwoEdge {
+  cursor: String!
+  node: PersonTwo!
+}
+
+input PersonTwoOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more PersonTwoSort objects to sort PersonTwos by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [PersonTwoSort!]
+}
+
+"""
+Fields to sort PersonTwos by. The order in which sorts are applied is not guaranteed when specifying many fields in one PersonTwoSort object.
+"""
+input PersonTwoSort {
+  name: SortDirection
+}
+
+input PersonTwoWhere {
+  AND: [PersonTwoWhere!]
+  NOT: PersonTwoWhere
+  OR: [PersonTwoWhere!]
+  name: String
+  name_CONTAINS: String
+  name_ENDS_WITH: String
+  name_IN: [String]
+  name_STARTS_WITH: String
+}
+
+type PersonTwosConnection {
+  edges: [PersonTwoEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input PersonWhere {
+  AND: [PersonWhere!]
+  NOT: PersonWhere
+  OR: [PersonWhere!]
+  name: String
+  name_CONTAINS: String
+  name_ENDS_WITH: String
+  name_IN: [String]
+  name_STARTS_WITH: String
+  typename_IN: [PersonImplementation!]
+}
+
+type Query {
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+  people(options: PersonOptions, where: PersonWhere): [Person!]!
+  peopleConnection(after: String, first: Int, sort: [PersonSort], where: PersonWhere): PeopleConnection!
+  personOnes(options: PersonOneOptions, where: PersonOneWhere): [PersonOne!]!
+  personOnesConnection(after: String, first: Int, sort: [PersonOneSort], where: PersonOneWhere): PersonOnesConnection!
+  personTwos(options: PersonTwoOptions, where: PersonTwoWhere): [PersonTwo!]!
+  personTwosConnection(after: String, first: Int, sort: [PersonTwoSort], where: PersonTwoWhere): PersonTwosConnection!
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
+
+=== Single relationship with nested operation CONNECT specified
+
+.Schema
+[source,graphql,schema=true]
+----
+interface Person {
+  name: String
+}
+
+type PersonOne implements Person {
+  name: String
+  someExtraProp: [Int!]!
+}
+
+type PersonTwo implements Person {
+  name: String
+}
+
+type Movie {
+  id: ID
+  actors: [Person!]! @relationship(type: "ACTED_IN", direction: IN, nestedOperations: [CONNECT])
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+type Movie {
+  actors(directed: Boolean = true, options: PersonOptions, where: PersonWhere): [Person!]!
+  actorsConnection(after: String, directed: Boolean = true, first: Int, sort: [MovieActorsConnectionSort!], where: MovieActorsConnectionWhere): MovieActorsConnection!
+  id: ID
+}
+
+type MovieActorsConnection {
+  edges: [MovieActorsRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input MovieActorsConnectionSort {
+  node: PersonSort
+}
+
+input MovieActorsConnectionWhere {
+  AND: [MovieActorsConnectionWhere!]
+  NOT: MovieActorsConnectionWhere
+  OR: [MovieActorsConnectionWhere!]
+  node: PersonWhere
+}
+
+type MovieActorsRelationship {
+  cursor: String!
+  node: Person!
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MovieSort!]
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
+"""
+input MovieSort {
+  id: SortDirection
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  """
+  Return Movies where all of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_ALL: MovieActorsConnectionWhere
+  """
+  Return Movies where none of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_NONE: MovieActorsConnectionWhere
+  """
+  Return Movies where one of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SINGLE: MovieActorsConnectionWhere
+  """
+  Return Movies where some of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SOME: MovieActorsConnectionWhere
+  """Return Movies where all of the related People match this filter"""
+  actors_ALL: PersonWhere
+  """Return Movies where none of the related People match this filter"""
+  actors_NONE: PersonWhere
+  """Return Movies where one of the related People match this filter"""
+  actors_SINGLE: PersonWhere
+  """Return Movies where some of the related People match this filter"""
+  actors_SOME: PersonWhere
+  id: ID
+  id_CONTAINS: ID
+  id_ENDS_WITH: ID
+  id_IN: [ID]
+  id_STARTS_WITH: ID
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+type PeopleConnection {
+  edges: [PersonEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+interface Person {
+  name: String
+}
+
+type PersonEdge {
+  cursor: String!
+  node: Person!
+}
+
+enum PersonImplementation {
+  PersonOne
+  PersonTwo
+}
+
+type PersonOne implements Person {
+  name: String
+  someExtraProp: [Int!]!
+}
+
+type PersonOneEdge {
+  cursor: String!
+  node: PersonOne!
+}
+
+input PersonOneOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more PersonOneSort objects to sort PersonOnes by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [PersonOneSort!]
+}
+
+"""
+Fields to sort PersonOnes by. The order in which sorts are applied is not guaranteed when specifying many fields in one PersonOneSort object.
+"""
+input PersonOneSort {
+  name: SortDirection
+}
+
+input PersonOneWhere {
+  AND: [PersonOneWhere!]
+  NOT: PersonOneWhere
+  OR: [PersonOneWhere!]
+  name: String
+  name_CONTAINS: String
+  name_ENDS_WITH: String
+  name_IN: [String]
+  name_STARTS_WITH: String
+  someExtraProp: [Int!]
+  someExtraProp_INCLUDES: Int
+}
+
+type PersonOnesConnection {
+  edges: [PersonOneEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input PersonOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more PersonSort objects to sort People by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [PersonSort]
+}
+
+"""
+Fields to sort People by. The order in which sorts are applied is not guaranteed when specifying many fields in one PersonSort object.
+"""
+input PersonSort {
+  name: SortDirection
+}
+
+type PersonTwo implements Person {
+  name: String
+}
+
+type PersonTwoEdge {
+  cursor: String!
+  node: PersonTwo!
+}
+
+input PersonTwoOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more PersonTwoSort objects to sort PersonTwos by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [PersonTwoSort!]
+}
+
+"""
+Fields to sort PersonTwos by. The order in which sorts are applied is not guaranteed when specifying many fields in one PersonTwoSort object.
+"""
+input PersonTwoSort {
+  name: SortDirection
+}
+
+input PersonTwoWhere {
+  AND: [PersonTwoWhere!]
+  NOT: PersonTwoWhere
+  OR: [PersonTwoWhere!]
+  name: String
+  name_CONTAINS: String
+  name_ENDS_WITH: String
+  name_IN: [String]
+  name_STARTS_WITH: String
+}
+
+type PersonTwosConnection {
+  edges: [PersonTwoEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input PersonWhere {
+  AND: [PersonWhere!]
+  NOT: PersonWhere
+  OR: [PersonWhere!]
+  name: String
+  name_CONTAINS: String
+  name_ENDS_WITH: String
+  name_IN: [String]
+  name_STARTS_WITH: String
+  typename_IN: [PersonImplementation!]
+}
+
+type Query {
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+  people(options: PersonOptions, where: PersonWhere): [Person!]!
+  peopleConnection(after: String, first: Int, sort: [PersonSort], where: PersonWhere): PeopleConnection!
+  personOnes(options: PersonOneOptions, where: PersonOneWhere): [PersonOne!]!
+  personOnesConnection(after: String, first: Int, sort: [PersonOneSort], where: PersonOneWhere): PersonOnesConnection!
+  personTwos(options: PersonTwoOptions, where: PersonTwoWhere): [PersonTwo!]!
+  personTwosConnection(after: String, first: Int, sort: [PersonTwoSort], where: PersonTwoWhere): PersonTwosConnection!
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
+
+=== Single relationship with nested operation UPDATE specified
+
+.Schema
+[source,graphql,schema=true]
+----
+interface Person {
+  name: String
+}
+
+type PersonOne implements Person {
+  name: String
+  someExtraProp: [Int!]!
+}
+
+type PersonTwo implements Person {
+  name: String
+}
+
+type Movie {
+  id: ID
+  actors: [Person!]! @relationship(type: "ACTED_IN", direction: IN, nestedOperations: [UPDATE])
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+type Movie {
+  actors(directed: Boolean = true, options: PersonOptions, where: PersonWhere): [Person!]!
+  actorsConnection(after: String, directed: Boolean = true, first: Int, sort: [MovieActorsConnectionSort!], where: MovieActorsConnectionWhere): MovieActorsConnection!
+  id: ID
+}
+
+type MovieActorsConnection {
+  edges: [MovieActorsRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input MovieActorsConnectionSort {
+  node: PersonSort
+}
+
+input MovieActorsConnectionWhere {
+  AND: [MovieActorsConnectionWhere!]
+  NOT: MovieActorsConnectionWhere
+  OR: [MovieActorsConnectionWhere!]
+  node: PersonWhere
+}
+
+type MovieActorsRelationship {
+  cursor: String!
+  node: Person!
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MovieSort!]
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
+"""
+input MovieSort {
+  id: SortDirection
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  """
+  Return Movies where all of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_ALL: MovieActorsConnectionWhere
+  """
+  Return Movies where none of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_NONE: MovieActorsConnectionWhere
+  """
+  Return Movies where one of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SINGLE: MovieActorsConnectionWhere
+  """
+  Return Movies where some of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SOME: MovieActorsConnectionWhere
+  """Return Movies where all of the related People match this filter"""
+  actors_ALL: PersonWhere
+  """Return Movies where none of the related People match this filter"""
+  actors_NONE: PersonWhere
+  """Return Movies where one of the related People match this filter"""
+  actors_SINGLE: PersonWhere
+  """Return Movies where some of the related People match this filter"""
+  actors_SOME: PersonWhere
+  id: ID
+  id_CONTAINS: ID
+  id_ENDS_WITH: ID
+  id_IN: [ID]
+  id_STARTS_WITH: ID
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+type PeopleConnection {
+  edges: [PersonEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+interface Person {
+  name: String
+}
+
+type PersonEdge {
+  cursor: String!
+  node: Person!
+}
+
+enum PersonImplementation {
+  PersonOne
+  PersonTwo
+}
+
+type PersonOne implements Person {
+  name: String
+  someExtraProp: [Int!]!
+}
+
+type PersonOneEdge {
+  cursor: String!
+  node: PersonOne!
+}
+
+input PersonOneOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more PersonOneSort objects to sort PersonOnes by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [PersonOneSort!]
+}
+
+"""
+Fields to sort PersonOnes by. The order in which sorts are applied is not guaranteed when specifying many fields in one PersonOneSort object.
+"""
+input PersonOneSort {
+  name: SortDirection
+}
+
+input PersonOneWhere {
+  AND: [PersonOneWhere!]
+  NOT: PersonOneWhere
+  OR: [PersonOneWhere!]
+  name: String
+  name_CONTAINS: String
+  name_ENDS_WITH: String
+  name_IN: [String]
+  name_STARTS_WITH: String
+  someExtraProp: [Int!]
+  someExtraProp_INCLUDES: Int
+}
+
+type PersonOnesConnection {
+  edges: [PersonOneEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input PersonOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more PersonSort objects to sort People by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [PersonSort]
+}
+
+"""
+Fields to sort People by. The order in which sorts are applied is not guaranteed when specifying many fields in one PersonSort object.
+"""
+input PersonSort {
+  name: SortDirection
+}
+
+type PersonTwo implements Person {
+  name: String
+}
+
+type PersonTwoEdge {
+  cursor: String!
+  node: PersonTwo!
+}
+
+input PersonTwoOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more PersonTwoSort objects to sort PersonTwos by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [PersonTwoSort!]
+}
+
+"""
+Fields to sort PersonTwos by. The order in which sorts are applied is not guaranteed when specifying many fields in one PersonTwoSort object.
+"""
+input PersonTwoSort {
+  name: SortDirection
+}
+
+input PersonTwoWhere {
+  AND: [PersonTwoWhere!]
+  NOT: PersonTwoWhere
+  OR: [PersonTwoWhere!]
+  name: String
+  name_CONTAINS: String
+  name_ENDS_WITH: String
+  name_IN: [String]
+  name_STARTS_WITH: String
+}
+
+type PersonTwosConnection {
+  edges: [PersonTwoEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input PersonWhere {
+  AND: [PersonWhere!]
+  NOT: PersonWhere
+  OR: [PersonWhere!]
+  name: String
+  name_CONTAINS: String
+  name_ENDS_WITH: String
+  name_IN: [String]
+  name_STARTS_WITH: String
+  typename_IN: [PersonImplementation!]
+}
+
+type Query {
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+  people(options: PersonOptions, where: PersonWhere): [Person!]!
+  peopleConnection(after: String, first: Int, sort: [PersonSort], where: PersonWhere): PeopleConnection!
+  personOnes(options: PersonOneOptions, where: PersonOneWhere): [PersonOne!]!
+  personOnesConnection(after: String, first: Int, sort: [PersonOneSort], where: PersonOneWhere): PersonOnesConnection!
+  personTwos(options: PersonTwoOptions, where: PersonTwoWhere): [PersonTwo!]!
+  personTwosConnection(after: String, first: Int, sort: [PersonTwoSort], where: PersonTwoWhere): PersonTwosConnection!
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
+
+=== Single relationship with nested operation DELETE specified
+
+.Schema
+[source,graphql,schema=true]
+----
+interface Person {
+  name: String
+}
+
+type PersonOne implements Person {
+  name: String
+  someExtraProp: [Int!]!
+}
+
+type PersonTwo implements Person {
+  name: String
+}
+
+type Movie {
+  id: ID
+  actors: [Person!]! @relationship(type: "ACTED_IN", direction: IN, nestedOperations: [DELETE])
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+type Movie {
+  actors(directed: Boolean = true, options: PersonOptions, where: PersonWhere): [Person!]!
+  actorsConnection(after: String, directed: Boolean = true, first: Int, sort: [MovieActorsConnectionSort!], where: MovieActorsConnectionWhere): MovieActorsConnection!
+  id: ID
+}
+
+type MovieActorsConnection {
+  edges: [MovieActorsRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input MovieActorsConnectionSort {
+  node: PersonSort
+}
+
+input MovieActorsConnectionWhere {
+  AND: [MovieActorsConnectionWhere!]
+  NOT: MovieActorsConnectionWhere
+  OR: [MovieActorsConnectionWhere!]
+  node: PersonWhere
+}
+
+type MovieActorsRelationship {
+  cursor: String!
+  node: Person!
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MovieSort!]
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
+"""
+input MovieSort {
+  id: SortDirection
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  """
+  Return Movies where all of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_ALL: MovieActorsConnectionWhere
+  """
+  Return Movies where none of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_NONE: MovieActorsConnectionWhere
+  """
+  Return Movies where one of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SINGLE: MovieActorsConnectionWhere
+  """
+  Return Movies where some of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SOME: MovieActorsConnectionWhere
+  """Return Movies where all of the related People match this filter"""
+  actors_ALL: PersonWhere
+  """Return Movies where none of the related People match this filter"""
+  actors_NONE: PersonWhere
+  """Return Movies where one of the related People match this filter"""
+  actors_SINGLE: PersonWhere
+  """Return Movies where some of the related People match this filter"""
+  actors_SOME: PersonWhere
+  id: ID
+  id_CONTAINS: ID
+  id_ENDS_WITH: ID
+  id_IN: [ID]
+  id_STARTS_WITH: ID
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+type PeopleConnection {
+  edges: [PersonEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+interface Person {
+  name: String
+}
+
+type PersonEdge {
+  cursor: String!
+  node: Person!
+}
+
+enum PersonImplementation {
+  PersonOne
+  PersonTwo
+}
+
+type PersonOne implements Person {
+  name: String
+  someExtraProp: [Int!]!
+}
+
+type PersonOneEdge {
+  cursor: String!
+  node: PersonOne!
+}
+
+input PersonOneOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more PersonOneSort objects to sort PersonOnes by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [PersonOneSort!]
+}
+
+"""
+Fields to sort PersonOnes by. The order in which sorts are applied is not guaranteed when specifying many fields in one PersonOneSort object.
+"""
+input PersonOneSort {
+  name: SortDirection
+}
+
+input PersonOneWhere {
+  AND: [PersonOneWhere!]
+  NOT: PersonOneWhere
+  OR: [PersonOneWhere!]
+  name: String
+  name_CONTAINS: String
+  name_ENDS_WITH: String
+  name_IN: [String]
+  name_STARTS_WITH: String
+  someExtraProp: [Int!]
+  someExtraProp_INCLUDES: Int
+}
+
+type PersonOnesConnection {
+  edges: [PersonOneEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input PersonOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more PersonSort objects to sort People by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [PersonSort]
+}
+
+"""
+Fields to sort People by. The order in which sorts are applied is not guaranteed when specifying many fields in one PersonSort object.
+"""
+input PersonSort {
+  name: SortDirection
+}
+
+type PersonTwo implements Person {
+  name: String
+}
+
+type PersonTwoEdge {
+  cursor: String!
+  node: PersonTwo!
+}
+
+input PersonTwoOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more PersonTwoSort objects to sort PersonTwos by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [PersonTwoSort!]
+}
+
+"""
+Fields to sort PersonTwos by. The order in which sorts are applied is not guaranteed when specifying many fields in one PersonTwoSort object.
+"""
+input PersonTwoSort {
+  name: SortDirection
+}
+
+input PersonTwoWhere {
+  AND: [PersonTwoWhere!]
+  NOT: PersonTwoWhere
+  OR: [PersonTwoWhere!]
+  name: String
+  name_CONTAINS: String
+  name_ENDS_WITH: String
+  name_IN: [String]
+  name_STARTS_WITH: String
+}
+
+type PersonTwosConnection {
+  edges: [PersonTwoEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input PersonWhere {
+  AND: [PersonWhere!]
+  NOT: PersonWhere
+  OR: [PersonWhere!]
+  name: String
+  name_CONTAINS: String
+  name_ENDS_WITH: String
+  name_IN: [String]
+  name_STARTS_WITH: String
+  typename_IN: [PersonImplementation!]
+}
+
+type Query {
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+  people(options: PersonOptions, where: PersonWhere): [Person!]!
+  peopleConnection(after: String, first: Int, sort: [PersonSort], where: PersonWhere): PeopleConnection!
+  personOnes(options: PersonOneOptions, where: PersonOneWhere): [PersonOne!]!
+  personOnesConnection(after: String, first: Int, sort: [PersonOneSort], where: PersonOneWhere): PersonOnesConnection!
+  personTwos(options: PersonTwoOptions, where: PersonTwoWhere): [PersonTwo!]!
+  personTwosConnection(after: String, first: Int, sort: [PersonTwoSort], where: PersonTwoWhere): PersonTwosConnection!
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
+
+=== Single relationship with nested operation DISCONNECT specified
+
+.Schema
+[source,graphql,schema=true]
+----
+interface Person {
+  name: String
+}
+
+type PersonOne implements Person {
+  name: String
+  someExtraProp: [Int!]!
+}
+
+type PersonTwo implements Person {
+  name: String
+}
+
+type Movie {
+  id: ID
+  actors: [Person!]! @relationship(type: "ACTED_IN", direction: IN, nestedOperations: [DISCONNECT])
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+type Movie {
+  actors(directed: Boolean = true, options: PersonOptions, where: PersonWhere): [Person!]!
+  actorsConnection(after: String, directed: Boolean = true, first: Int, sort: [MovieActorsConnectionSort!], where: MovieActorsConnectionWhere): MovieActorsConnection!
+  id: ID
+}
+
+type MovieActorsConnection {
+  edges: [MovieActorsRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input MovieActorsConnectionSort {
+  node: PersonSort
+}
+
+input MovieActorsConnectionWhere {
+  AND: [MovieActorsConnectionWhere!]
+  NOT: MovieActorsConnectionWhere
+  OR: [MovieActorsConnectionWhere!]
+  node: PersonWhere
+}
+
+type MovieActorsRelationship {
+  cursor: String!
+  node: Person!
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MovieSort!]
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
+"""
+input MovieSort {
+  id: SortDirection
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  """
+  Return Movies where all of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_ALL: MovieActorsConnectionWhere
+  """
+  Return Movies where none of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_NONE: MovieActorsConnectionWhere
+  """
+  Return Movies where one of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SINGLE: MovieActorsConnectionWhere
+  """
+  Return Movies where some of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SOME: MovieActorsConnectionWhere
+  """Return Movies where all of the related People match this filter"""
+  actors_ALL: PersonWhere
+  """Return Movies where none of the related People match this filter"""
+  actors_NONE: PersonWhere
+  """Return Movies where one of the related People match this filter"""
+  actors_SINGLE: PersonWhere
+  """Return Movies where some of the related People match this filter"""
+  actors_SOME: PersonWhere
+  id: ID
+  id_CONTAINS: ID
+  id_ENDS_WITH: ID
+  id_IN: [ID]
+  id_STARTS_WITH: ID
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+type PeopleConnection {
+  edges: [PersonEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+interface Person {
+  name: String
+}
+
+type PersonEdge {
+  cursor: String!
+  node: Person!
+}
+
+enum PersonImplementation {
+  PersonOne
+  PersonTwo
+}
+
+type PersonOne implements Person {
+  name: String
+  someExtraProp: [Int!]!
+}
+
+type PersonOneEdge {
+  cursor: String!
+  node: PersonOne!
+}
+
+input PersonOneOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more PersonOneSort objects to sort PersonOnes by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [PersonOneSort!]
+}
+
+"""
+Fields to sort PersonOnes by. The order in which sorts are applied is not guaranteed when specifying many fields in one PersonOneSort object.
+"""
+input PersonOneSort {
+  name: SortDirection
+}
+
+input PersonOneWhere {
+  AND: [PersonOneWhere!]
+  NOT: PersonOneWhere
+  OR: [PersonOneWhere!]
+  name: String
+  name_CONTAINS: String
+  name_ENDS_WITH: String
+  name_IN: [String]
+  name_STARTS_WITH: String
+  someExtraProp: [Int!]
+  someExtraProp_INCLUDES: Int
+}
+
+type PersonOnesConnection {
+  edges: [PersonOneEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input PersonOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more PersonSort objects to sort People by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [PersonSort]
+}
+
+"""
+Fields to sort People by. The order in which sorts are applied is not guaranteed when specifying many fields in one PersonSort object.
+"""
+input PersonSort {
+  name: SortDirection
+}
+
+type PersonTwo implements Person {
+  name: String
+}
+
+type PersonTwoEdge {
+  cursor: String!
+  node: PersonTwo!
+}
+
+input PersonTwoOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more PersonTwoSort objects to sort PersonTwos by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [PersonTwoSort!]
+}
+
+"""
+Fields to sort PersonTwos by. The order in which sorts are applied is not guaranteed when specifying many fields in one PersonTwoSort object.
+"""
+input PersonTwoSort {
+  name: SortDirection
+}
+
+input PersonTwoWhere {
+  AND: [PersonTwoWhere!]
+  NOT: PersonTwoWhere
+  OR: [PersonTwoWhere!]
+  name: String
+  name_CONTAINS: String
+  name_ENDS_WITH: String
+  name_IN: [String]
+  name_STARTS_WITH: String
+}
+
+type PersonTwosConnection {
+  edges: [PersonTwoEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input PersonWhere {
+  AND: [PersonWhere!]
+  NOT: PersonWhere
+  OR: [PersonWhere!]
+  name: String
+  name_CONTAINS: String
+  name_ENDS_WITH: String
+  name_IN: [String]
+  name_STARTS_WITH: String
+  typename_IN: [PersonImplementation!]
+}
+
+type Query {
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+  people(options: PersonOptions, where: PersonWhere): [Person!]!
+  peopleConnection(after: String, first: Int, sort: [PersonSort], where: PersonWhere): PeopleConnection!
+  personOnes(options: PersonOneOptions, where: PersonOneWhere): [PersonOne!]!
+  personOnesConnection(after: String, first: Int, sort: [PersonOneSort], where: PersonOneWhere): PersonOnesConnection!
+  personTwos(options: PersonTwoOptions, where: PersonTwoWhere): [PersonTwo!]!
+  personTwosConnection(after: String, first: Int, sort: [PersonTwoSort], where: PersonTwoWhere): PersonTwosConnection!
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
+
+=== Two relationships with nested operations specified on one
+
+.Schema
+[source,graphql,schema=true]
+----
+interface Person {
+  name: String
+}
+
+type PersonOne implements Person {
+  name: String
+  someExtraProp: [Int!]!
+}
+
+type PersonTwo implements Person {
+  name: String
+}
+
+type Movie {
+  id: ID
+  actors: [Person!]! @relationship(type: "ACTED_IN", direction: IN)
+  producers: [Person!]! @relationship(type: "PRODUCED", direction: IN, nestedOperations: [DISCONNECT])
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+type Movie {
+  actors(directed: Boolean = true, options: PersonOptions, where: PersonWhere): [Person!]!
+  actorsConnection(after: String, directed: Boolean = true, first: Int, sort: [MovieActorsConnectionSort!], where: MovieActorsConnectionWhere): MovieActorsConnection!
+  id: ID
+  producers(directed: Boolean = true, options: PersonOptions, where: PersonWhere): [Person!]!
+  producersConnection(after: String, directed: Boolean = true, first: Int, sort: [MovieProducersConnectionSort!], where: MovieProducersConnectionWhere): MovieProducersConnection!
+}
+
+type MovieActorsConnection {
+  edges: [MovieActorsRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input MovieActorsConnectionSort {
+  node: PersonSort
+}
+
+input MovieActorsConnectionWhere {
+  AND: [MovieActorsConnectionWhere!]
+  NOT: MovieActorsConnectionWhere
+  OR: [MovieActorsConnectionWhere!]
+  node: PersonWhere
+}
+
+type MovieActorsRelationship {
+  cursor: String!
+  node: Person!
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MovieSort!]
+}
+
+type MovieProducersConnection {
+  edges: [MovieProducersRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input MovieProducersConnectionSort {
+  node: PersonSort
+}
+
+input MovieProducersConnectionWhere {
+  AND: [MovieProducersConnectionWhere!]
+  NOT: MovieProducersConnectionWhere
+  OR: [MovieProducersConnectionWhere!]
+  node: PersonWhere
+}
+
+type MovieProducersRelationship {
+  cursor: String!
+  node: Person!
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
+"""
+input MovieSort {
+  id: SortDirection
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  """
+  Return Movies where all of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_ALL: MovieActorsConnectionWhere
+  """
+  Return Movies where none of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_NONE: MovieActorsConnectionWhere
+  """
+  Return Movies where one of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SINGLE: MovieActorsConnectionWhere
+  """
+  Return Movies where some of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SOME: MovieActorsConnectionWhere
+  """Return Movies where all of the related People match this filter"""
+  actors_ALL: PersonWhere
+  """Return Movies where none of the related People match this filter"""
+  actors_NONE: PersonWhere
+  """Return Movies where one of the related People match this filter"""
+  actors_SINGLE: PersonWhere
+  """Return Movies where some of the related People match this filter"""
+  actors_SOME: PersonWhere
+  id: ID
+  id_CONTAINS: ID
+  id_ENDS_WITH: ID
+  id_IN: [ID]
+  id_STARTS_WITH: ID
+  """
+  Return Movies where all of the related MovieProducersConnections match this filter
+  """
+  producersConnection_ALL: MovieProducersConnectionWhere
+  """
+  Return Movies where none of the related MovieProducersConnections match this filter
+  """
+  producersConnection_NONE: MovieProducersConnectionWhere
+  """
+  Return Movies where one of the related MovieProducersConnections match this filter
+  """
+  producersConnection_SINGLE: MovieProducersConnectionWhere
+  """
+  Return Movies where some of the related MovieProducersConnections match this filter
+  """
+  producersConnection_SOME: MovieProducersConnectionWhere
+  """Return Movies where all of the related People match this filter"""
+  producers_ALL: PersonWhere
+  """Return Movies where none of the related People match this filter"""
+  producers_NONE: PersonWhere
+  """Return Movies where one of the related People match this filter"""
+  producers_SINGLE: PersonWhere
+  """Return Movies where some of the related People match this filter"""
+  producers_SOME: PersonWhere
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+type PeopleConnection {
+  edges: [PersonEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+interface Person {
+  name: String
+}
+
+type PersonEdge {
+  cursor: String!
+  node: Person!
+}
+
+enum PersonImplementation {
+  PersonOne
+  PersonTwo
+}
+
+type PersonOne implements Person {
+  name: String
+  someExtraProp: [Int!]!
+}
+
+type PersonOneEdge {
+  cursor: String!
+  node: PersonOne!
+}
+
+input PersonOneOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more PersonOneSort objects to sort PersonOnes by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [PersonOneSort!]
+}
+
+"""
+Fields to sort PersonOnes by. The order in which sorts are applied is not guaranteed when specifying many fields in one PersonOneSort object.
+"""
+input PersonOneSort {
+  name: SortDirection
+}
+
+input PersonOneWhere {
+  AND: [PersonOneWhere!]
+  NOT: PersonOneWhere
+  OR: [PersonOneWhere!]
+  name: String
+  name_CONTAINS: String
+  name_ENDS_WITH: String
+  name_IN: [String]
+  name_STARTS_WITH: String
+  someExtraProp: [Int!]
+  someExtraProp_INCLUDES: Int
+}
+
+type PersonOnesConnection {
+  edges: [PersonOneEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input PersonOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more PersonSort objects to sort People by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [PersonSort]
+}
+
+"""
+Fields to sort People by. The order in which sorts are applied is not guaranteed when specifying many fields in one PersonSort object.
+"""
+input PersonSort {
+  name: SortDirection
+}
+
+type PersonTwo implements Person {
+  name: String
+}
+
+type PersonTwoEdge {
+  cursor: String!
+  node: PersonTwo!
+}
+
+input PersonTwoOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more PersonTwoSort objects to sort PersonTwos by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [PersonTwoSort!]
+}
+
+"""
+Fields to sort PersonTwos by. The order in which sorts are applied is not guaranteed when specifying many fields in one PersonTwoSort object.
+"""
+input PersonTwoSort {
+  name: SortDirection
+}
+
+input PersonTwoWhere {
+  AND: [PersonTwoWhere!]
+  NOT: PersonTwoWhere
+  OR: [PersonTwoWhere!]
+  name: String
+  name_CONTAINS: String
+  name_ENDS_WITH: String
+  name_IN: [String]
+  name_STARTS_WITH: String
+}
+
+type PersonTwosConnection {
+  edges: [PersonTwoEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input PersonWhere {
+  AND: [PersonWhere!]
+  NOT: PersonWhere
+  OR: [PersonWhere!]
+  name: String
+  name_CONTAINS: String
+  name_ENDS_WITH: String
+  name_IN: [String]
+  name_STARTS_WITH: String
+  typename_IN: [PersonImplementation!]
+}
+
+type Query {
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+  people(options: PersonOptions, where: PersonWhere): [Person!]!
+  peopleConnection(after: String, first: Int, sort: [PersonSort], where: PersonWhere): PeopleConnection!
+  personOnes(options: PersonOneOptions, where: PersonOneWhere): [PersonOne!]!
+  personOnesConnection(after: String, first: Int, sort: [PersonOneSort], where: PersonOneWhere): PersonOnesConnection!
+  personTwos(options: PersonTwoOptions, where: PersonTwoWhere): [PersonTwo!]!
+  personTwosConnection(after: String, first: Int, sort: [PersonTwoSort], where: PersonTwoWhere): PersonTwosConnection!
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
+
+=== Two relationships with nested operations specified on both
+
+.Schema
+[source,graphql,schema=true]
+----
+interface Person {
+  name: String
+}
+
+type PersonOne implements Person {
+  name: String
+  someExtraProp: [Int!]!
+}
+
+type PersonTwo implements Person {
+  name: String
+}
+
+type Movie {
+  id: ID
+  actors: [Person!]! @relationship(type: "ACTED_IN", direction: IN, nestedOperations: [CREATE, DELETE])
+  producers: [Person!]! @relationship(type: "PRODUCED", direction: IN, nestedOperations: [DISCONNECT])
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+type Movie {
+  actors(directed: Boolean = true, options: PersonOptions, where: PersonWhere): [Person!]!
+  actorsConnection(after: String, directed: Boolean = true, first: Int, sort: [MovieActorsConnectionSort!], where: MovieActorsConnectionWhere): MovieActorsConnection!
+  id: ID
+  producers(directed: Boolean = true, options: PersonOptions, where: PersonWhere): [Person!]!
+  producersConnection(after: String, directed: Boolean = true, first: Int, sort: [MovieProducersConnectionSort!], where: MovieProducersConnectionWhere): MovieProducersConnection!
+}
+
+type MovieActorsConnection {
+  edges: [MovieActorsRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input MovieActorsConnectionSort {
+  node: PersonSort
+}
+
+input MovieActorsConnectionWhere {
+  AND: [MovieActorsConnectionWhere!]
+  NOT: MovieActorsConnectionWhere
+  OR: [MovieActorsConnectionWhere!]
+  node: PersonWhere
+}
+
+type MovieActorsRelationship {
+  cursor: String!
+  node: Person!
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MovieSort!]
+}
+
+type MovieProducersConnection {
+  edges: [MovieProducersRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input MovieProducersConnectionSort {
+  node: PersonSort
+}
+
+input MovieProducersConnectionWhere {
+  AND: [MovieProducersConnectionWhere!]
+  NOT: MovieProducersConnectionWhere
+  OR: [MovieProducersConnectionWhere!]
+  node: PersonWhere
+}
+
+type MovieProducersRelationship {
+  cursor: String!
+  node: Person!
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
+"""
+input MovieSort {
+  id: SortDirection
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  """
+  Return Movies where all of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_ALL: MovieActorsConnectionWhere
+  """
+  Return Movies where none of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_NONE: MovieActorsConnectionWhere
+  """
+  Return Movies where one of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SINGLE: MovieActorsConnectionWhere
+  """
+  Return Movies where some of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SOME: MovieActorsConnectionWhere
+  """Return Movies where all of the related People match this filter"""
+  actors_ALL: PersonWhere
+  """Return Movies where none of the related People match this filter"""
+  actors_NONE: PersonWhere
+  """Return Movies where one of the related People match this filter"""
+  actors_SINGLE: PersonWhere
+  """Return Movies where some of the related People match this filter"""
+  actors_SOME: PersonWhere
+  id: ID
+  id_CONTAINS: ID
+  id_ENDS_WITH: ID
+  id_IN: [ID]
+  id_STARTS_WITH: ID
+  """
+  Return Movies where all of the related MovieProducersConnections match this filter
+  """
+  producersConnection_ALL: MovieProducersConnectionWhere
+  """
+  Return Movies where none of the related MovieProducersConnections match this filter
+  """
+  producersConnection_NONE: MovieProducersConnectionWhere
+  """
+  Return Movies where one of the related MovieProducersConnections match this filter
+  """
+  producersConnection_SINGLE: MovieProducersConnectionWhere
+  """
+  Return Movies where some of the related MovieProducersConnections match this filter
+  """
+  producersConnection_SOME: MovieProducersConnectionWhere
+  """Return Movies where all of the related People match this filter"""
+  producers_ALL: PersonWhere
+  """Return Movies where none of the related People match this filter"""
+  producers_NONE: PersonWhere
+  """Return Movies where one of the related People match this filter"""
+  producers_SINGLE: PersonWhere
+  """Return Movies where some of the related People match this filter"""
+  producers_SOME: PersonWhere
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+type PeopleConnection {
+  edges: [PersonEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+interface Person {
+  name: String
+}
+
+type PersonEdge {
+  cursor: String!
+  node: Person!
+}
+
+enum PersonImplementation {
+  PersonOne
+  PersonTwo
+}
+
+type PersonOne implements Person {
+  name: String
+  someExtraProp: [Int!]!
+}
+
+type PersonOneEdge {
+  cursor: String!
+  node: PersonOne!
+}
+
+input PersonOneOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more PersonOneSort objects to sort PersonOnes by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [PersonOneSort!]
+}
+
+"""
+Fields to sort PersonOnes by. The order in which sorts are applied is not guaranteed when specifying many fields in one PersonOneSort object.
+"""
+input PersonOneSort {
+  name: SortDirection
+}
+
+input PersonOneWhere {
+  AND: [PersonOneWhere!]
+  NOT: PersonOneWhere
+  OR: [PersonOneWhere!]
+  name: String
+  name_CONTAINS: String
+  name_ENDS_WITH: String
+  name_IN: [String]
+  name_STARTS_WITH: String
+  someExtraProp: [Int!]
+  someExtraProp_INCLUDES: Int
+}
+
+type PersonOnesConnection {
+  edges: [PersonOneEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input PersonOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more PersonSort objects to sort People by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [PersonSort]
+}
+
+"""
+Fields to sort People by. The order in which sorts are applied is not guaranteed when specifying many fields in one PersonSort object.
+"""
+input PersonSort {
+  name: SortDirection
+}
+
+type PersonTwo implements Person {
+  name: String
+}
+
+type PersonTwoEdge {
+  cursor: String!
+  node: PersonTwo!
+}
+
+input PersonTwoOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more PersonTwoSort objects to sort PersonTwos by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [PersonTwoSort!]
+}
+
+"""
+Fields to sort PersonTwos by. The order in which sorts are applied is not guaranteed when specifying many fields in one PersonTwoSort object.
+"""
+input PersonTwoSort {
+  name: SortDirection
+}
+
+input PersonTwoWhere {
+  AND: [PersonTwoWhere!]
+  NOT: PersonTwoWhere
+  OR: [PersonTwoWhere!]
+  name: String
+  name_CONTAINS: String
+  name_ENDS_WITH: String
+  name_IN: [String]
+  name_STARTS_WITH: String
+}
+
+type PersonTwosConnection {
+  edges: [PersonTwoEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input PersonWhere {
+  AND: [PersonWhere!]
+  NOT: PersonWhere
+  OR: [PersonWhere!]
+  name: String
+  name_CONTAINS: String
+  name_ENDS_WITH: String
+  name_IN: [String]
+  name_STARTS_WITH: String
+  typename_IN: [PersonImplementation!]
+}
+
+type Query {
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+  people(options: PersonOptions, where: PersonWhere): [Person!]!
+  peopleConnection(after: String, first: Int, sort: [PersonSort], where: PersonWhere): PeopleConnection!
+  personOnes(options: PersonOneOptions, where: PersonOneWhere): [PersonOne!]!
+  personOnesConnection(after: String, first: Int, sort: [PersonOneSort], where: PersonOneWhere): PersonOnesConnection!
+  personTwos(options: PersonTwoOptions, where: PersonTwoWhere): [PersonTwo!]!
+  personTwosConnection(after: String, first: Int, sort: [PersonTwoSort], where: PersonTwoWhere): PersonTwosConnection!
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
diff --git a/core/src/test/resources/tck-test-files/schema/v2/experimental-schema/interface-relationships.adoc b/core/src/test/resources/tck-test-files/schema/v2/experimental-schema/interface-relationships.adoc
index 788b2efd..0e16b389 100644
--- a/core/src/test/resources/tck-test-files/schema/v2/experimental-schema/interface-relationships.adoc
+++ b/core/src/test/resources/tck-test-files/schema/v2/experimental-schema/interface-relationships.adoc
@@ -33,7 +33,7 @@ type Actor {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -308,6 +308,3 @@ input SeriesWhere {
 }
 
 ----
-
-'''
-
diff --git a/core/src/test/resources/tck-test-files/schema/v2/experimental-schema/interface-relationships.js.adoc b/core/src/test/resources/tck-test-files/schema/v2/experimental-schema/interface-relationships.js.adoc
new file mode 100644
index 00000000..2b07f1d3
--- /dev/null
+++ b/core/src/test/resources/tck-test-files/schema/v2/experimental-schema/interface-relationships.js.adoc
@@ -0,0 +1,334 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= Interface Relationships
+
+== Interface Relationships - single
+
+.Schema
+[source,graphql,schema=true]
+----
+interface Production {
+  title: String!
+}
+
+type Movie implements Production {
+  title: String!
+  runtime: Int!
+}
+
+type Series implements Production {
+  title: String!
+  episodes: Int!
+}
+
+type ActedIn @relationshipProperties {
+  screenTime: Int!
+}
+
+type Actor {
+  name: String!
+  actedIn: [Production!]! @relationship(type: "ACTED_IN", direction: OUT, properties: "ActedIn")
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+"""
+The edge properties for the following fields:
+* Actor.actedIn
+"""
+type ActedIn {
+  screenTime: Int!
+}
+
+input ActedInSort {
+  screenTime: SortDirection
+}
+
+input ActedInWhere {
+  AND: [ActedInWhere!]
+  NOT: ActedInWhere
+  OR: [ActedInWhere!]
+  screenTime: Int
+  screenTime_GT: Int
+  screenTime_GTE: Int
+  screenTime_IN: [Int!]
+  screenTime_LT: Int
+  screenTime_LTE: Int
+}
+
+type Actor {
+  actedIn(directed: Boolean = true, options: ProductionOptions, where: ProductionWhere): [Production!]!
+  actedInConnection(after: String, directed: Boolean = true, first: Int, sort: [ActorActedInConnectionSort!], where: ActorActedInConnectionWhere): ActorActedInConnection!
+  name: String!
+}
+
+type ActorActedInConnection {
+  edges: [ActorActedInRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input ActorActedInConnectionSort {
+  edge: ActedInSort
+  node: ProductionSort
+}
+
+input ActorActedInConnectionWhere {
+  AND: [ActorActedInConnectionWhere!]
+  NOT: ActorActedInConnectionWhere
+  OR: [ActorActedInConnectionWhere!]
+  edge: ActedInWhere
+  node: ProductionWhere
+}
+
+type ActorActedInRelationship {
+  cursor: String!
+  node: Production!
+  properties: ActedIn!
+}
+
+type ActorEdge {
+  cursor: String!
+  node: Actor!
+}
+
+input ActorOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more ActorSort objects to sort Actors by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [ActorSort!]
+}
+
+"""
+Fields to sort Actors by. The order in which sorts are applied is not guaranteed when specifying many fields in one ActorSort object.
+"""
+input ActorSort {
+  name: SortDirection
+}
+
+input ActorWhere {
+  AND: [ActorWhere!]
+  NOT: ActorWhere
+  OR: [ActorWhere!]
+  """
+  Return Actors where all of the related ActorActedInConnections match this filter
+  """
+  actedInConnection_ALL: ActorActedInConnectionWhere
+  """
+  Return Actors where none of the related ActorActedInConnections match this filter
+  """
+  actedInConnection_NONE: ActorActedInConnectionWhere
+  """
+  Return Actors where one of the related ActorActedInConnections match this filter
+  """
+  actedInConnection_SINGLE: ActorActedInConnectionWhere
+  """
+  Return Actors where some of the related ActorActedInConnections match this filter
+  """
+  actedInConnection_SOME: ActorActedInConnectionWhere
+  """Return Actors where all of the related Productions match this filter"""
+  actedIn_ALL: ProductionWhere
+  """Return Actors where none of the related Productions match this filter"""
+  actedIn_NONE: ProductionWhere
+  """Return Actors where one of the related Productions match this filter"""
+  actedIn_SINGLE: ProductionWhere
+  """Return Actors where some of the related Productions match this filter"""
+  actedIn_SOME: ProductionWhere
+  name: String
+  name_CONTAINS: String
+  name_ENDS_WITH: String
+  name_IN: [String!]
+  name_STARTS_WITH: String
+}
+
+type ActorsConnection {
+  edges: [ActorEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+type Movie implements Production {
+  runtime: Int!
+  title: String!
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MovieSort!]
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
+"""
+input MovieSort {
+  runtime: SortDirection
+  title: SortDirection
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  runtime: Int
+  runtime_GT: Int
+  runtime_GTE: Int
+  runtime_IN: [Int!]
+  runtime_LT: Int
+  runtime_LTE: Int
+  title: String
+  title_CONTAINS: String
+  title_ENDS_WITH: String
+  title_IN: [String!]
+  title_STARTS_WITH: String
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+interface Production {
+  title: String!
+}
+
+type ProductionEdge {
+  cursor: String!
+  node: Production!
+}
+
+enum ProductionImplementation {
+  Movie
+  Series
+}
+
+input ProductionOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more ProductionSort objects to sort Productions by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [ProductionSort]
+}
+
+"""
+Fields to sort Productions by. The order in which sorts are applied is not guaranteed when specifying many fields in one ProductionSort object.
+"""
+input ProductionSort {
+  title: SortDirection
+}
+
+input ProductionWhere {
+  AND: [ProductionWhere!]
+  NOT: ProductionWhere
+  OR: [ProductionWhere!]
+  title: String
+  title_CONTAINS: String
+  title_ENDS_WITH: String
+  title_IN: [String!]
+  title_STARTS_WITH: String
+  typename_IN: [ProductionImplementation!]
+}
+
+type ProductionsConnection {
+  edges: [ProductionEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+type Query {
+  actors(options: ActorOptions, where: ActorWhere): [Actor!]!
+  actorsConnection(after: String, first: Int, sort: [ActorSort], where: ActorWhere): ActorsConnection!
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+  productions(options: ProductionOptions, where: ProductionWhere): [Production!]!
+  productionsConnection(after: String, first: Int, sort: [ProductionSort], where: ProductionWhere): ProductionsConnection!
+  series(options: SeriesOptions, where: SeriesWhere): [Series!]!
+  seriesConnection(after: String, first: Int, sort: [SeriesSort], where: SeriesWhere): SeriesConnection!
+}
+
+type Series implements Production {
+  episodes: Int!
+  title: String!
+}
+
+type SeriesConnection {
+  edges: [SeriesEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+type SeriesEdge {
+  cursor: String!
+  node: Series!
+}
+
+input SeriesOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more SeriesSort objects to sort Series by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [SeriesSort!]
+}
+
+"""
+Fields to sort Series by. The order in which sorts are applied is not guaranteed when specifying many fields in one SeriesSort object.
+"""
+input SeriesSort {
+  episodes: SortDirection
+  title: SortDirection
+}
+
+input SeriesWhere {
+  AND: [SeriesWhere!]
+  NOT: SeriesWhere
+  OR: [SeriesWhere!]
+  episodes: Int
+  episodes_GT: Int
+  episodes_GTE: Int
+  episodes_IN: [Int!]
+  episodes_LT: Int
+  episodes_LTE: Int
+  title: String
+  title_CONTAINS: String
+  title_ENDS_WITH: String
+  title_IN: [String!]
+  title_STARTS_WITH: String
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
diff --git a/core/src/test/resources/tck-test-files/schema/v2/experimental-schema/interfaces/aggregations.adoc b/core/src/test/resources/tck-test-files/schema/v2/experimental-schema/interfaces/aggregations.adoc
index 86904e92..a6ee52ed 100644
--- a/core/src/test/resources/tck-test-files/schema/v2/experimental-schema/interfaces/aggregations.adoc
+++ b/core/src/test/resources/tck-test-files/schema/v2/experimental-schema/interfaces/aggregations.adoc
@@ -21,7 +21,7 @@ type Movie implements Production {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -157,8 +157,6 @@ input ProductionWhere {
 
 ----
 
-'''
-
 == Interfaces With Relationships
 
 .Schema
@@ -192,7 +190,7 @@ type Actor {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -491,6 +489,3 @@ input SeriesWhere {
 }
 
 ----
-
-'''
-
diff --git a/core/src/test/resources/tck-test-files/schema/v2/experimental-schema/interfaces/aggregations.js.adoc b/core/src/test/resources/tck-test-files/schema/v2/experimental-schema/interfaces/aggregations.js.adoc
new file mode 100644
index 00000000..58656e43
--- /dev/null
+++ b/core/src/test/resources/tck-test-files/schema/v2/experimental-schema/interfaces/aggregations.js.adoc
@@ -0,0 +1,522 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= Interface Top Level Aggregations
+
+== Interfaces
+
+.Schema
+[source,graphql,schema=true]
+----
+interface Production {
+  title: String!
+  cost: Float!
+}
+
+type Movie implements Production {
+  title: String!
+  cost: Float!
+  runtime: Int!
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+type Movie implements Production {
+  cost: Float!
+  runtime: Int!
+  title: String!
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MovieSort!]
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
+"""
+input MovieSort {
+  cost: SortDirection
+  runtime: SortDirection
+  title: SortDirection
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  cost: Float
+  cost_GT: Float
+  cost_GTE: Float
+  cost_IN: [Float!]
+  cost_LT: Float
+  cost_LTE: Float
+  runtime: Int
+  runtime_GT: Int
+  runtime_GTE: Int
+  runtime_IN: [Int!]
+  runtime_LT: Int
+  runtime_LTE: Int
+  title: String
+  title_CONTAINS: String
+  title_ENDS_WITH: String
+  title_IN: [String!]
+  title_STARTS_WITH: String
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+interface Production {
+  cost: Float!
+  title: String!
+}
+
+type ProductionEdge {
+  cursor: String!
+  node: Production!
+}
+
+enum ProductionImplementation {
+  Movie
+}
+
+input ProductionOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more ProductionSort objects to sort Productions by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [ProductionSort]
+}
+
+"""
+Fields to sort Productions by. The order in which sorts are applied is not guaranteed when specifying many fields in one ProductionSort object.
+"""
+input ProductionSort {
+  cost: SortDirection
+  title: SortDirection
+}
+
+input ProductionWhere {
+  AND: [ProductionWhere!]
+  NOT: ProductionWhere
+  OR: [ProductionWhere!]
+  cost: Float
+  cost_GT: Float
+  cost_GTE: Float
+  cost_IN: [Float!]
+  cost_LT: Float
+  cost_LTE: Float
+  title: String
+  title_CONTAINS: String
+  title_ENDS_WITH: String
+  title_IN: [String!]
+  title_STARTS_WITH: String
+  typename_IN: [ProductionImplementation!]
+}
+
+type ProductionsConnection {
+  edges: [ProductionEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+type Query {
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+  productions(options: ProductionOptions, where: ProductionWhere): [Production!]!
+  productionsConnection(after: String, first: Int, sort: [ProductionSort], where: ProductionWhere): ProductionsConnection!
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
+
+== Interfaces With Relationships
+
+.Schema
+[source,graphql,schema=true]
+----
+interface Production {
+  title: String!
+  cost: Float!
+}
+
+type Movie implements Production {
+  title: String!
+  cost: Float!
+  runtime: Int!
+}
+
+type Series implements Production {
+  title: String!
+  cost: Float!
+  episodes: Int!
+}
+
+type ActedIn @relationshipProperties {
+  screenTime: Int!
+}
+
+type Actor {
+  name: String!
+  actedIn: [Production!]! @relationship(type: "ACTED_IN", direction: OUT, properties: "ActedIn")
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+"""
+The edge properties for the following fields:
+* Actor.actedIn
+"""
+type ActedIn {
+  screenTime: Int!
+}
+
+input ActedInSort {
+  screenTime: SortDirection
+}
+
+input ActedInWhere {
+  AND: [ActedInWhere!]
+  NOT: ActedInWhere
+  OR: [ActedInWhere!]
+  screenTime: Int
+  screenTime_GT: Int
+  screenTime_GTE: Int
+  screenTime_IN: [Int!]
+  screenTime_LT: Int
+  screenTime_LTE: Int
+}
+
+type Actor {
+  actedIn(directed: Boolean = true, options: ProductionOptions, where: ProductionWhere): [Production!]!
+  actedInConnection(after: String, directed: Boolean = true, first: Int, sort: [ActorActedInConnectionSort!], where: ActorActedInConnectionWhere): ActorActedInConnection!
+  name: String!
+}
+
+type ActorActedInConnection {
+  edges: [ActorActedInRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input ActorActedInConnectionSort {
+  edge: ActedInSort
+  node: ProductionSort
+}
+
+input ActorActedInConnectionWhere {
+  AND: [ActorActedInConnectionWhere!]
+  NOT: ActorActedInConnectionWhere
+  OR: [ActorActedInConnectionWhere!]
+  edge: ActedInWhere
+  node: ProductionWhere
+}
+
+type ActorActedInRelationship {
+  cursor: String!
+  node: Production!
+  properties: ActedIn!
+}
+
+type ActorEdge {
+  cursor: String!
+  node: Actor!
+}
+
+input ActorOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more ActorSort objects to sort Actors by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [ActorSort!]
+}
+
+"""
+Fields to sort Actors by. The order in which sorts are applied is not guaranteed when specifying many fields in one ActorSort object.
+"""
+input ActorSort {
+  name: SortDirection
+}
+
+input ActorWhere {
+  AND: [ActorWhere!]
+  NOT: ActorWhere
+  OR: [ActorWhere!]
+  """
+  Return Actors where all of the related ActorActedInConnections match this filter
+  """
+  actedInConnection_ALL: ActorActedInConnectionWhere
+  """
+  Return Actors where none of the related ActorActedInConnections match this filter
+  """
+  actedInConnection_NONE: ActorActedInConnectionWhere
+  """
+  Return Actors where one of the related ActorActedInConnections match this filter
+  """
+  actedInConnection_SINGLE: ActorActedInConnectionWhere
+  """
+  Return Actors where some of the related ActorActedInConnections match this filter
+  """
+  actedInConnection_SOME: ActorActedInConnectionWhere
+  """Return Actors where all of the related Productions match this filter"""
+  actedIn_ALL: ProductionWhere
+  """Return Actors where none of the related Productions match this filter"""
+  actedIn_NONE: ProductionWhere
+  """Return Actors where one of the related Productions match this filter"""
+  actedIn_SINGLE: ProductionWhere
+  """Return Actors where some of the related Productions match this filter"""
+  actedIn_SOME: ProductionWhere
+  name: String
+  name_CONTAINS: String
+  name_ENDS_WITH: String
+  name_IN: [String!]
+  name_STARTS_WITH: String
+}
+
+type ActorsConnection {
+  edges: [ActorEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+type Movie implements Production {
+  cost: Float!
+  runtime: Int!
+  title: String!
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MovieSort!]
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
+"""
+input MovieSort {
+  cost: SortDirection
+  runtime: SortDirection
+  title: SortDirection
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  cost: Float
+  cost_GT: Float
+  cost_GTE: Float
+  cost_IN: [Float!]
+  cost_LT: Float
+  cost_LTE: Float
+  runtime: Int
+  runtime_GT: Int
+  runtime_GTE: Int
+  runtime_IN: [Int!]
+  runtime_LT: Int
+  runtime_LTE: Int
+  title: String
+  title_CONTAINS: String
+  title_ENDS_WITH: String
+  title_IN: [String!]
+  title_STARTS_WITH: String
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+interface Production {
+  cost: Float!
+  title: String!
+}
+
+type ProductionEdge {
+  cursor: String!
+  node: Production!
+}
+
+enum ProductionImplementation {
+  Movie
+  Series
+}
+
+input ProductionOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more ProductionSort objects to sort Productions by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [ProductionSort]
+}
+
+"""
+Fields to sort Productions by. The order in which sorts are applied is not guaranteed when specifying many fields in one ProductionSort object.
+"""
+input ProductionSort {
+  cost: SortDirection
+  title: SortDirection
+}
+
+input ProductionWhere {
+  AND: [ProductionWhere!]
+  NOT: ProductionWhere
+  OR: [ProductionWhere!]
+  cost: Float
+  cost_GT: Float
+  cost_GTE: Float
+  cost_IN: [Float!]
+  cost_LT: Float
+  cost_LTE: Float
+  title: String
+  title_CONTAINS: String
+  title_ENDS_WITH: String
+  title_IN: [String!]
+  title_STARTS_WITH: String
+  typename_IN: [ProductionImplementation!]
+}
+
+type ProductionsConnection {
+  edges: [ProductionEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+type Query {
+  actors(options: ActorOptions, where: ActorWhere): [Actor!]!
+  actorsConnection(after: String, first: Int, sort: [ActorSort], where: ActorWhere): ActorsConnection!
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+  productions(options: ProductionOptions, where: ProductionWhere): [Production!]!
+  productionsConnection(after: String, first: Int, sort: [ProductionSort], where: ProductionWhere): ProductionsConnection!
+  series(options: SeriesOptions, where: SeriesWhere): [Series!]!
+  seriesConnection(after: String, first: Int, sort: [SeriesSort], where: SeriesWhere): SeriesConnection!
+}
+
+type Series implements Production {
+  cost: Float!
+  episodes: Int!
+  title: String!
+}
+
+type SeriesConnection {
+  edges: [SeriesEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+type SeriesEdge {
+  cursor: String!
+  node: Series!
+}
+
+input SeriesOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more SeriesSort objects to sort Series by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [SeriesSort!]
+}
+
+"""
+Fields to sort Series by. The order in which sorts are applied is not guaranteed when specifying many fields in one SeriesSort object.
+"""
+input SeriesSort {
+  cost: SortDirection
+  episodes: SortDirection
+  title: SortDirection
+}
+
+input SeriesWhere {
+  AND: [SeriesWhere!]
+  NOT: SeriesWhere
+  OR: [SeriesWhere!]
+  cost: Float
+  cost_GT: Float
+  cost_GTE: Float
+  cost_IN: [Float!]
+  cost_LT: Float
+  cost_LTE: Float
+  episodes: Int
+  episodes_GT: Int
+  episodes_GTE: Int
+  episodes_IN: [Int!]
+  episodes_LT: Int
+  episodes_LTE: Int
+  title: String
+  title_CONTAINS: String
+  title_ENDS_WITH: String
+  title_IN: [String!]
+  title_STARTS_WITH: String
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
diff --git a/core/src/test/resources/tck-test-files/schema/v2/experimental-schema/interfaces/typename-in.adoc b/core/src/test/resources/tck-test-files/schema/v2/experimental-schema/interfaces/typename-in.adoc
index 520a627c..1be8e757 100644
--- a/core/src/test/resources/tck-test-files/schema/v2/experimental-schema/interfaces/typename-in.adoc
+++ b/core/src/test/resources/tck-test-files/schema/v2/experimental-schema/interfaces/typename-in.adoc
@@ -32,7 +32,7 @@ type Actor {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -304,6 +304,3 @@ input SeriesWhere {
 }
 
 ----
-
-'''
-
diff --git a/core/src/test/resources/tck-test-files/schema/v2/experimental-schema/interfaces/typename-in.js.adoc b/core/src/test/resources/tck-test-files/schema/v2/experimental-schema/interfaces/typename-in.js.adoc
new file mode 100644
index 00000000..d7b20e6d
--- /dev/null
+++ b/core/src/test/resources/tck-test-files/schema/v2/experimental-schema/interfaces/typename-in.js.adoc
@@ -0,0 +1,330 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= typename_IN
+
+== typename_IN
+
+.Schema
+[source,graphql,schema=true]
+----
+interface Production {
+  title: String!
+  cost: Float!
+}
+
+type Movie implements Production {
+  title: String!
+  cost: Float!
+  runtime: Int!
+}
+
+type Series implements Production {
+  title: String!
+  cost: Float!
+  episodes: Int!
+}
+
+type Actor {
+  name: String!
+  actedIn: [Production!]! @relationship(type: "ACTED_IN", direction: OUT)
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+type Actor {
+  actedIn(directed: Boolean = true, options: ProductionOptions, where: ProductionWhere): [Production!]!
+  actedInConnection(after: String, directed: Boolean = true, first: Int, sort: [ActorActedInConnectionSort!], where: ActorActedInConnectionWhere): ActorActedInConnection!
+  name: String!
+}
+
+type ActorActedInConnection {
+  edges: [ActorActedInRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input ActorActedInConnectionSort {
+  node: ProductionSort
+}
+
+input ActorActedInConnectionWhere {
+  AND: [ActorActedInConnectionWhere!]
+  NOT: ActorActedInConnectionWhere
+  OR: [ActorActedInConnectionWhere!]
+  node: ProductionWhere
+}
+
+type ActorActedInRelationship {
+  cursor: String!
+  node: Production!
+}
+
+type ActorEdge {
+  cursor: String!
+  node: Actor!
+}
+
+input ActorOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more ActorSort objects to sort Actors by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [ActorSort!]
+}
+
+"""
+Fields to sort Actors by. The order in which sorts are applied is not guaranteed when specifying many fields in one ActorSort object.
+"""
+input ActorSort {
+  name: SortDirection
+}
+
+input ActorWhere {
+  AND: [ActorWhere!]
+  NOT: ActorWhere
+  OR: [ActorWhere!]
+  """
+  Return Actors where all of the related ActorActedInConnections match this filter
+  """
+  actedInConnection_ALL: ActorActedInConnectionWhere
+  """
+  Return Actors where none of the related ActorActedInConnections match this filter
+  """
+  actedInConnection_NONE: ActorActedInConnectionWhere
+  """
+  Return Actors where one of the related ActorActedInConnections match this filter
+  """
+  actedInConnection_SINGLE: ActorActedInConnectionWhere
+  """
+  Return Actors where some of the related ActorActedInConnections match this filter
+  """
+  actedInConnection_SOME: ActorActedInConnectionWhere
+  """Return Actors where all of the related Productions match this filter"""
+  actedIn_ALL: ProductionWhere
+  """Return Actors where none of the related Productions match this filter"""
+  actedIn_NONE: ProductionWhere
+  """Return Actors where one of the related Productions match this filter"""
+  actedIn_SINGLE: ProductionWhere
+  """Return Actors where some of the related Productions match this filter"""
+  actedIn_SOME: ProductionWhere
+  name: String
+  name_CONTAINS: String
+  name_ENDS_WITH: String
+  name_IN: [String!]
+  name_STARTS_WITH: String
+}
+
+type ActorsConnection {
+  edges: [ActorEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+type Movie implements Production {
+  cost: Float!
+  runtime: Int!
+  title: String!
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MovieSort!]
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
+"""
+input MovieSort {
+  cost: SortDirection
+  runtime: SortDirection
+  title: SortDirection
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  cost: Float
+  cost_GT: Float
+  cost_GTE: Float
+  cost_IN: [Float!]
+  cost_LT: Float
+  cost_LTE: Float
+  runtime: Int
+  runtime_GT: Int
+  runtime_GTE: Int
+  runtime_IN: [Int!]
+  runtime_LT: Int
+  runtime_LTE: Int
+  title: String
+  title_CONTAINS: String
+  title_ENDS_WITH: String
+  title_IN: [String!]
+  title_STARTS_WITH: String
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+interface Production {
+  cost: Float!
+  title: String!
+}
+
+type ProductionEdge {
+  cursor: String!
+  node: Production!
+}
+
+enum ProductionImplementation {
+  Movie
+  Series
+}
+
+input ProductionOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more ProductionSort objects to sort Productions by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [ProductionSort]
+}
+
+"""
+Fields to sort Productions by. The order in which sorts are applied is not guaranteed when specifying many fields in one ProductionSort object.
+"""
+input ProductionSort {
+  cost: SortDirection
+  title: SortDirection
+}
+
+input ProductionWhere {
+  AND: [ProductionWhere!]
+  NOT: ProductionWhere
+  OR: [ProductionWhere!]
+  cost: Float
+  cost_GT: Float
+  cost_GTE: Float
+  cost_IN: [Float!]
+  cost_LT: Float
+  cost_LTE: Float
+  title: String
+  title_CONTAINS: String
+  title_ENDS_WITH: String
+  title_IN: [String!]
+  title_STARTS_WITH: String
+  typename_IN: [ProductionImplementation!]
+}
+
+type ProductionsConnection {
+  edges: [ProductionEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+type Query {
+  actors(options: ActorOptions, where: ActorWhere): [Actor!]!
+  actorsConnection(after: String, first: Int, sort: [ActorSort], where: ActorWhere): ActorsConnection!
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+  productions(options: ProductionOptions, where: ProductionWhere): [Production!]!
+  productionsConnection(after: String, first: Int, sort: [ProductionSort], where: ProductionWhere): ProductionsConnection!
+  series(options: SeriesOptions, where: SeriesWhere): [Series!]!
+  seriesConnection(after: String, first: Int, sort: [SeriesSort], where: SeriesWhere): SeriesConnection!
+}
+
+type Series implements Production {
+  cost: Float!
+  episodes: Int!
+  title: String!
+}
+
+type SeriesConnection {
+  edges: [SeriesEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+type SeriesEdge {
+  cursor: String!
+  node: Series!
+}
+
+input SeriesOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more SeriesSort objects to sort Series by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [SeriesSort!]
+}
+
+"""
+Fields to sort Series by. The order in which sorts are applied is not guaranteed when specifying many fields in one SeriesSort object.
+"""
+input SeriesSort {
+  cost: SortDirection
+  episodes: SortDirection
+  title: SortDirection
+}
+
+input SeriesWhere {
+  AND: [SeriesWhere!]
+  NOT: SeriesWhere
+  OR: [SeriesWhere!]
+  cost: Float
+  cost_GT: Float
+  cost_GTE: Float
+  cost_IN: [Float!]
+  cost_LT: Float
+  cost_LTE: Float
+  episodes: Int
+  episodes_GT: Int
+  episodes_GTE: Int
+  episodes_IN: [Int!]
+  episodes_LT: Int
+  episodes_LTE: Int
+  title: String
+  title_CONTAINS: String
+  title_ENDS_WITH: String
+  title_IN: [String!]
+  title_STARTS_WITH: String
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
diff --git a/core/src/test/resources/tck-test-files/schema/v2/experimental-schema/math.adoc b/core/src/test/resources/tck-test-files/schema/v2/experimental-schema/math.adoc
index 6b011272..57f8a6ef 100644
--- a/core/src/test/resources/tck-test-files/schema/v2/experimental-schema/math.adoc
+++ b/core/src/test/resources/tck-test-files/schema/v2/experimental-schema/math.adoc
@@ -15,7 +15,7 @@ type Movie {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -90,8 +90,6 @@ input MovieWhere {
 
 ----
 
-'''
-
 == BigInt fields should be extended with Increment/Decrement operators
 
 .Schema
@@ -104,7 +102,7 @@ type Movie {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -182,8 +180,6 @@ input MovieWhere {
 
 ----
 
-'''
-
 == Float fields should be extended with Add/Subtract/Multiply/Divide operators
 
 .Schema
@@ -196,7 +192,7 @@ type Movie {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -271,8 +267,6 @@ input MovieWhere {
 
 ----
 
-'''
-
 == Operators should be presents in nested updates
 
 .Schema
@@ -291,7 +285,7 @@ type Director {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -474,8 +468,6 @@ input MovieWhere {
 
 ----
 
-'''
-
 == Should be supported in interfaces
 
 .Schema
@@ -498,7 +490,7 @@ type Person {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -739,8 +731,6 @@ input ProductionWhere {
 
 ----
 
-'''
-
 == Should be supported in Relationship properties
 
 .Schema
@@ -763,7 +753,7 @@ type ActedIn @relationshipProperties {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -984,6 +974,3 @@ input PersonWhere {
 }
 
 ----
-
-'''
-
diff --git a/core/src/test/resources/tck-test-files/schema/v2/experimental-schema/math.js.adoc b/core/src/test/resources/tck-test-files/schema/v2/experimental-schema/math.js.adoc
new file mode 100644
index 00000000..a484de6a
--- /dev/null
+++ b/core/src/test/resources/tck-test-files/schema/v2/experimental-schema/math.js.adoc
@@ -0,0 +1,1053 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= Algebraic
+
+== Int fields should be extended with Increment/Decrement operators
+
+.Schema
+[source,graphql,schema=true]
+----
+type Movie {
+  id: ID
+  viewers: Int!
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+type Movie {
+  id: ID
+  viewers: Int!
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MovieSort!]
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
+"""
+input MovieSort {
+  id: SortDirection
+  viewers: SortDirection
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  id: ID
+  id_CONTAINS: ID
+  id_ENDS_WITH: ID
+  id_IN: [ID]
+  id_STARTS_WITH: ID
+  viewers: Int
+  viewers_GT: Int
+  viewers_GTE: Int
+  viewers_IN: [Int!]
+  viewers_LT: Int
+  viewers_LTE: Int
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+type Query {
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
+
+== BigInt fields should be extended with Increment/Decrement operators
+
+.Schema
+[source,graphql,schema=true]
+----
+type Movie {
+  id: ID
+  viewers: BigInt!
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+"""
+A BigInt value up to 64 bits in size, which can be a number or a string if used inline, or a string only if used as a variable. Always returned as a string.
+"""
+scalar BigInt
+
+type Movie {
+  id: ID
+  viewers: BigInt!
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MovieSort!]
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
+"""
+input MovieSort {
+  id: SortDirection
+  viewers: SortDirection
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  id: ID
+  id_CONTAINS: ID
+  id_ENDS_WITH: ID
+  id_IN: [ID]
+  id_STARTS_WITH: ID
+  viewers: BigInt
+  viewers_GT: BigInt
+  viewers_GTE: BigInt
+  viewers_IN: [BigInt!]
+  viewers_LT: BigInt
+  viewers_LTE: BigInt
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+type Query {
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
+
+== Float fields should be extended with Add/Subtract/Multiply/Divide operators
+
+.Schema
+[source,graphql,schema=true]
+----
+type Movie {
+  id: ID
+  viewers: Float!
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+type Movie {
+  id: ID
+  viewers: Float!
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MovieSort!]
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
+"""
+input MovieSort {
+  id: SortDirection
+  viewers: SortDirection
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  id: ID
+  id_CONTAINS: ID
+  id_ENDS_WITH: ID
+  id_IN: [ID]
+  id_STARTS_WITH: ID
+  viewers: Float
+  viewers_GT: Float
+  viewers_GTE: Float
+  viewers_IN: [Float!]
+  viewers_LT: Float
+  viewers_LTE: Float
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+type Query {
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
+
+== Operators should be presents in nested updates
+
+.Schema
+[source,graphql,schema=true]
+----
+type Movie {
+  id: ID
+  viewers: Int!
+  directedBy: Director @relationship(type: "DIRECTS", direction: IN)
+}
+
+type Director {
+  lastName: String!
+  directs: [Movie!]! @relationship(type: "DIRECTS", direction: OUT)
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+type Director {
+  directs(directed: Boolean = true, options: MovieOptions, where: MovieWhere): [Movie!]!
+  directsConnection(after: String, directed: Boolean = true, first: Int, sort: [DirectorDirectsConnectionSort!], where: DirectorDirectsConnectionWhere): DirectorDirectsConnection!
+  lastName: String!
+}
+
+type DirectorDirectsConnection {
+  edges: [DirectorDirectsRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input DirectorDirectsConnectionSort {
+  node: MovieSort
+}
+
+input DirectorDirectsConnectionWhere {
+  AND: [DirectorDirectsConnectionWhere!]
+  NOT: DirectorDirectsConnectionWhere
+  OR: [DirectorDirectsConnectionWhere!]
+  node: MovieWhere
+}
+
+type DirectorDirectsRelationship {
+  cursor: String!
+  node: Movie!
+}
+
+type DirectorEdge {
+  cursor: String!
+  node: Director!
+}
+
+input DirectorOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more DirectorSort objects to sort Directors by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [DirectorSort!]
+}
+
+"""
+Fields to sort Directors by. The order in which sorts are applied is not guaranteed when specifying many fields in one DirectorSort object.
+"""
+input DirectorSort {
+  lastName: SortDirection
+}
+
+input DirectorWhere {
+  AND: [DirectorWhere!]
+  NOT: DirectorWhere
+  OR: [DirectorWhere!]
+  """
+  Return Directors where all of the related DirectorDirectsConnections match this filter
+  """
+  directsConnection_ALL: DirectorDirectsConnectionWhere
+  """
+  Return Directors where none of the related DirectorDirectsConnections match this filter
+  """
+  directsConnection_NONE: DirectorDirectsConnectionWhere
+  """
+  Return Directors where one of the related DirectorDirectsConnections match this filter
+  """
+  directsConnection_SINGLE: DirectorDirectsConnectionWhere
+  """
+  Return Directors where some of the related DirectorDirectsConnections match this filter
+  """
+  directsConnection_SOME: DirectorDirectsConnectionWhere
+  """Return Directors where all of the related Movies match this filter"""
+  directs_ALL: MovieWhere
+  """Return Directors where none of the related Movies match this filter"""
+  directs_NONE: MovieWhere
+  """Return Directors where one of the related Movies match this filter"""
+  directs_SINGLE: MovieWhere
+  """Return Directors where some of the related Movies match this filter"""
+  directs_SOME: MovieWhere
+  lastName: String
+  lastName_CONTAINS: String
+  lastName_ENDS_WITH: String
+  lastName_IN: [String!]
+  lastName_STARTS_WITH: String
+}
+
+type DirectorsConnection {
+  edges: [DirectorEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+type Movie {
+  directedBy(directed: Boolean = true, options: DirectorOptions, where: DirectorWhere): Director
+  directedByConnection(after: String, directed: Boolean = true, first: Int, sort: [MovieDirectedByConnectionSort!], where: MovieDirectedByConnectionWhere): MovieDirectedByConnection!
+  id: ID
+  viewers: Int!
+}
+
+type MovieDirectedByConnection {
+  edges: [MovieDirectedByRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input MovieDirectedByConnectionSort {
+  node: DirectorSort
+}
+
+input MovieDirectedByConnectionWhere {
+  AND: [MovieDirectedByConnectionWhere!]
+  NOT: MovieDirectedByConnectionWhere
+  OR: [MovieDirectedByConnectionWhere!]
+  node: DirectorWhere
+}
+
+type MovieDirectedByRelationship {
+  cursor: String!
+  node: Director!
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MovieSort!]
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
+"""
+input MovieSort {
+  id: SortDirection
+  viewers: SortDirection
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  directedBy: DirectorWhere
+  directedByConnection: MovieDirectedByConnectionWhere
+  directedByConnection_NOT: MovieDirectedByConnectionWhere
+  directedBy_NOT: DirectorWhere
+  id: ID
+  id_CONTAINS: ID
+  id_ENDS_WITH: ID
+  id_IN: [ID]
+  id_STARTS_WITH: ID
+  viewers: Int
+  viewers_GT: Int
+  viewers_GTE: Int
+  viewers_IN: [Int!]
+  viewers_LT: Int
+  viewers_LTE: Int
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+type Query {
+  directors(options: DirectorOptions, where: DirectorWhere): [Director!]!
+  directorsConnection(after: String, first: Int, sort: [DirectorSort], where: DirectorWhere): DirectorsConnection!
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
+
+== Should be supported in interfaces
+
+.Schema
+[source,graphql,schema=true]
+----
+interface Production {
+  viewers: Int!
+}
+
+type Movie implements Production {
+  id: ID
+  viewers: Int!
+  workers: [Person!]! @relationship(type: "WORKED_IN", direction: IN)
+}
+
+type Person {
+  name: String!
+  worksInProduction: [Production!]! @relationship(type: "WORKED_IN", direction: OUT)
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+type Movie implements Production {
+  id: ID
+  viewers: Int!
+  workers(directed: Boolean = true, options: PersonOptions, where: PersonWhere): [Person!]!
+  workersConnection(after: String, directed: Boolean = true, first: Int, sort: [MovieWorkersConnectionSort!], where: MovieWorkersConnectionWhere): MovieWorkersConnection!
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MovieSort!]
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
+"""
+input MovieSort {
+  id: SortDirection
+  viewers: SortDirection
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  id: ID
+  id_CONTAINS: ID
+  id_ENDS_WITH: ID
+  id_IN: [ID]
+  id_STARTS_WITH: ID
+  viewers: Int
+  viewers_GT: Int
+  viewers_GTE: Int
+  viewers_IN: [Int!]
+  viewers_LT: Int
+  viewers_LTE: Int
+  """
+  Return Movies where all of the related MovieWorkersConnections match this filter
+  """
+  workersConnection_ALL: MovieWorkersConnectionWhere
+  """
+  Return Movies where none of the related MovieWorkersConnections match this filter
+  """
+  workersConnection_NONE: MovieWorkersConnectionWhere
+  """
+  Return Movies where one of the related MovieWorkersConnections match this filter
+  """
+  workersConnection_SINGLE: MovieWorkersConnectionWhere
+  """
+  Return Movies where some of the related MovieWorkersConnections match this filter
+  """
+  workersConnection_SOME: MovieWorkersConnectionWhere
+  """Return Movies where all of the related People match this filter"""
+  workers_ALL: PersonWhere
+  """Return Movies where none of the related People match this filter"""
+  workers_NONE: PersonWhere
+  """Return Movies where one of the related People match this filter"""
+  workers_SINGLE: PersonWhere
+  """Return Movies where some of the related People match this filter"""
+  workers_SOME: PersonWhere
+}
+
+type MovieWorkersConnection {
+  edges: [MovieWorkersRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input MovieWorkersConnectionSort {
+  node: PersonSort
+}
+
+input MovieWorkersConnectionWhere {
+  AND: [MovieWorkersConnectionWhere!]
+  NOT: MovieWorkersConnectionWhere
+  OR: [MovieWorkersConnectionWhere!]
+  node: PersonWhere
+}
+
+type MovieWorkersRelationship {
+  cursor: String!
+  node: Person!
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+type PeopleConnection {
+  edges: [PersonEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+type Person {
+  name: String!
+  worksInProduction(directed: Boolean = true, options: ProductionOptions, where: ProductionWhere): [Production!]!
+  worksInProductionConnection(after: String, directed: Boolean = true, first: Int, sort: [PersonWorksInProductionConnectionSort!], where: PersonWorksInProductionConnectionWhere): PersonWorksInProductionConnection!
+}
+
+type PersonEdge {
+  cursor: String!
+  node: Person!
+}
+
+input PersonOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more PersonSort objects to sort People by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [PersonSort!]
+}
+
+"""
+Fields to sort People by. The order in which sorts are applied is not guaranteed when specifying many fields in one PersonSort object.
+"""
+input PersonSort {
+  name: SortDirection
+}
+
+input PersonWhere {
+  AND: [PersonWhere!]
+  NOT: PersonWhere
+  OR: [PersonWhere!]
+  name: String
+  name_CONTAINS: String
+  name_ENDS_WITH: String
+  name_IN: [String!]
+  name_STARTS_WITH: String
+  """
+  Return People where all of the related PersonWorksInProductionConnections match this filter
+  """
+  worksInProductionConnection_ALL: PersonWorksInProductionConnectionWhere
+  """
+  Return People where none of the related PersonWorksInProductionConnections match this filter
+  """
+  worksInProductionConnection_NONE: PersonWorksInProductionConnectionWhere
+  """
+  Return People where one of the related PersonWorksInProductionConnections match this filter
+  """
+  worksInProductionConnection_SINGLE: PersonWorksInProductionConnectionWhere
+  """
+  Return People where some of the related PersonWorksInProductionConnections match this filter
+  """
+  worksInProductionConnection_SOME: PersonWorksInProductionConnectionWhere
+  """Return People where all of the related Productions match this filter"""
+  worksInProduction_ALL: ProductionWhere
+  """Return People where none of the related Productions match this filter"""
+  worksInProduction_NONE: ProductionWhere
+  """Return People where one of the related Productions match this filter"""
+  worksInProduction_SINGLE: ProductionWhere
+  """Return People where some of the related Productions match this filter"""
+  worksInProduction_SOME: ProductionWhere
+}
+
+type PersonWorksInProductionConnection {
+  edges: [PersonWorksInProductionRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input PersonWorksInProductionConnectionSort {
+  node: ProductionSort
+}
+
+input PersonWorksInProductionConnectionWhere {
+  AND: [PersonWorksInProductionConnectionWhere!]
+  NOT: PersonWorksInProductionConnectionWhere
+  OR: [PersonWorksInProductionConnectionWhere!]
+  node: ProductionWhere
+}
+
+type PersonWorksInProductionRelationship {
+  cursor: String!
+  node: Production!
+}
+
+interface Production {
+  viewers: Int!
+}
+
+type ProductionEdge {
+  cursor: String!
+  node: Production!
+}
+
+enum ProductionImplementation {
+  Movie
+}
+
+input ProductionOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more ProductionSort objects to sort Productions by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [ProductionSort]
+}
+
+"""
+Fields to sort Productions by. The order in which sorts are applied is not guaranteed when specifying many fields in one ProductionSort object.
+"""
+input ProductionSort {
+  viewers: SortDirection
+}
+
+input ProductionWhere {
+  AND: [ProductionWhere!]
+  NOT: ProductionWhere
+  OR: [ProductionWhere!]
+  typename_IN: [ProductionImplementation!]
+  viewers: Int
+  viewers_GT: Int
+  viewers_GTE: Int
+  viewers_IN: [Int!]
+  viewers_LT: Int
+  viewers_LTE: Int
+}
+
+type ProductionsConnection {
+  edges: [ProductionEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+type Query {
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+  people(options: PersonOptions, where: PersonWhere): [Person!]!
+  peopleConnection(after: String, first: Int, sort: [PersonSort], where: PersonWhere): PeopleConnection!
+  productions(options: ProductionOptions, where: ProductionWhere): [Production!]!
+  productionsConnection(after: String, first: Int, sort: [ProductionSort], where: ProductionWhere): ProductionsConnection!
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
+
+== Should be supported in Relationship properties
+
+.Schema
+[source,graphql,schema=true]
+----
+type Person {
+  name: String!
+  actedInMovies: [Movie!]! @relationship(type: "ACTED_IN", properties: "ActedIn", direction: OUT)
+}
+
+type Movie {
+  title: String!
+  actors: [Person!]! @relationship(type: "ACTED_IN", properties: "ActedIn", direction: IN)
+}
+
+type ActedIn @relationshipProperties {
+  roles: [String!]
+  pay: Float
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+"""
+The edge properties for the following fields:
+* Person.actedInMovies
+* Movie.actors
+"""
+type ActedIn {
+  pay: Float
+  roles: [String!]
+}
+
+input ActedInSort {
+  pay: SortDirection
+  roles: SortDirection
+}
+
+input ActedInWhere {
+  AND: [ActedInWhere!]
+  NOT: ActedInWhere
+  OR: [ActedInWhere!]
+  pay: Float
+  pay_GT: Float
+  pay_GTE: Float
+  pay_IN: [Float]
+  pay_LT: Float
+  pay_LTE: Float
+  roles: [String!]
+  roles_INCLUDES: String
+}
+
+type Movie {
+  actors(directed: Boolean = true, options: PersonOptions, where: PersonWhere): [Person!]!
+  actorsConnection(after: String, directed: Boolean = true, first: Int, sort: [MovieActorsConnectionSort!], where: MovieActorsConnectionWhere): MovieActorsConnection!
+  title: String!
+}
+
+type MovieActorsConnection {
+  edges: [MovieActorsRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input MovieActorsConnectionSort {
+  edge: ActedInSort
+  node: PersonSort
+}
+
+input MovieActorsConnectionWhere {
+  AND: [MovieActorsConnectionWhere!]
+  NOT: MovieActorsConnectionWhere
+  OR: [MovieActorsConnectionWhere!]
+  edge: ActedInWhere
+  node: PersonWhere
+}
+
+type MovieActorsRelationship {
+  cursor: String!
+  node: Person!
+  properties: ActedIn!
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MovieSort!]
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
+"""
+input MovieSort {
+  title: SortDirection
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  """
+  Return Movies where all of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_ALL: MovieActorsConnectionWhere
+  """
+  Return Movies where none of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_NONE: MovieActorsConnectionWhere
+  """
+  Return Movies where one of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SINGLE: MovieActorsConnectionWhere
+  """
+  Return Movies where some of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SOME: MovieActorsConnectionWhere
+  """Return Movies where all of the related People match this filter"""
+  actors_ALL: PersonWhere
+  """Return Movies where none of the related People match this filter"""
+  actors_NONE: PersonWhere
+  """Return Movies where one of the related People match this filter"""
+  actors_SINGLE: PersonWhere
+  """Return Movies where some of the related People match this filter"""
+  actors_SOME: PersonWhere
+  title: String
+  title_CONTAINS: String
+  title_ENDS_WITH: String
+  title_IN: [String!]
+  title_STARTS_WITH: String
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+type PeopleConnection {
+  edges: [PersonEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+type Person {
+  actedInMovies(directed: Boolean = true, options: MovieOptions, where: MovieWhere): [Movie!]!
+  actedInMoviesConnection(after: String, directed: Boolean = true, first: Int, sort: [PersonActedInMoviesConnectionSort!], where: PersonActedInMoviesConnectionWhere): PersonActedInMoviesConnection!
+  name: String!
+}
+
+type PersonActedInMoviesConnection {
+  edges: [PersonActedInMoviesRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input PersonActedInMoviesConnectionSort {
+  edge: ActedInSort
+  node: MovieSort
+}
+
+input PersonActedInMoviesConnectionWhere {
+  AND: [PersonActedInMoviesConnectionWhere!]
+  NOT: PersonActedInMoviesConnectionWhere
+  OR: [PersonActedInMoviesConnectionWhere!]
+  edge: ActedInWhere
+  node: MovieWhere
+}
+
+type PersonActedInMoviesRelationship {
+  cursor: String!
+  node: Movie!
+  properties: ActedIn!
+}
+
+type PersonEdge {
+  cursor: String!
+  node: Person!
+}
+
+input PersonOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more PersonSort objects to sort People by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [PersonSort!]
+}
+
+"""
+Fields to sort People by. The order in which sorts are applied is not guaranteed when specifying many fields in one PersonSort object.
+"""
+input PersonSort {
+  name: SortDirection
+}
+
+input PersonWhere {
+  AND: [PersonWhere!]
+  NOT: PersonWhere
+  OR: [PersonWhere!]
+  """
+  Return People where all of the related PersonActedInMoviesConnections match this filter
+  """
+  actedInMoviesConnection_ALL: PersonActedInMoviesConnectionWhere
+  """
+  Return People where none of the related PersonActedInMoviesConnections match this filter
+  """
+  actedInMoviesConnection_NONE: PersonActedInMoviesConnectionWhere
+  """
+  Return People where one of the related PersonActedInMoviesConnections match this filter
+  """
+  actedInMoviesConnection_SINGLE: PersonActedInMoviesConnectionWhere
+  """
+  Return People where some of the related PersonActedInMoviesConnections match this filter
+  """
+  actedInMoviesConnection_SOME: PersonActedInMoviesConnectionWhere
+  """Return People where all of the related Movies match this filter"""
+  actedInMovies_ALL: MovieWhere
+  """Return People where none of the related Movies match this filter"""
+  actedInMovies_NONE: MovieWhere
+  """Return People where one of the related Movies match this filter"""
+  actedInMovies_SINGLE: MovieWhere
+  """Return People where some of the related Movies match this filter"""
+  actedInMovies_SOME: MovieWhere
+  name: String
+  name_CONTAINS: String
+  name_ENDS_WITH: String
+  name_IN: [String!]
+  name_STARTS_WITH: String
+}
+
+type Query {
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+  people(options: PersonOptions, where: PersonWhere): [Person!]!
+  peopleConnection(after: String, first: Int, sort: [PersonSort], where: PersonWhere): PeopleConnection!
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
diff --git a/core/src/test/resources/tck-test-files/schema/v2/experimental-schema/nested-aggregation-on-interface.adoc b/core/src/test/resources/tck-test-files/schema/v2/experimental-schema/nested-aggregation-on-interface.adoc
index 72baa237..6c6b30f9 100644
--- a/core/src/test/resources/tck-test-files/schema/v2/experimental-schema/nested-aggregation-on-interface.adoc
+++ b/core/src/test/resources/tck-test-files/schema/v2/experimental-schema/nested-aggregation-on-interface.adoc
@@ -38,7 +38,7 @@ type Actor {
 == should generate the correct schema
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -338,12 +338,10 @@ input SeriesWhere {
 
 ----
 
-'''
-
 == aggregate false should generate the correct schema without aggregations
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -642,6 +640,3 @@ input SeriesWhere {
 }
 
 ----
-
-'''
-
diff --git a/core/src/test/resources/tck-test-files/schema/v2/experimental-schema/nested-aggregation-on-interface.js.adoc b/core/src/test/resources/tck-test-files/schema/v2/experimental-schema/nested-aggregation-on-interface.js.adoc
new file mode 100644
index 00000000..3efcb768
--- /dev/null
+++ b/core/src/test/resources/tck-test-files/schema/v2/experimental-schema/nested-aggregation-on-interface.js.adoc
@@ -0,0 +1,689 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= nested aggregation on interface
+
+== Setup
+
+.Schema
+[source,graphql,schema=true]
+----
+interface Production {
+  title: String!
+  cost: Float!
+}
+
+type Movie implements Production {
+  title: String!
+  cost: Float!
+  runtime: Int!
+}
+
+type Series implements Production {
+  title: String!
+  cost: Float!
+  episodes: Int!
+}
+
+type ActedIn @relationshipProperties {
+  screenTime: Int!
+}
+
+type Actor {
+  name: String!
+  actedIn: [Production!]! @relationship(type: "ACTED_IN", direction: OUT, properties: "ActedIn")
+}
+----
+
+== should generate the correct schema
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+"""
+The edge properties for the following fields:
+* Actor.actedIn
+"""
+type ActedIn {
+  screenTime: Int!
+}
+
+input ActedInSort {
+  screenTime: SortDirection
+}
+
+input ActedInWhere {
+  AND: [ActedInWhere!]
+  NOT: ActedInWhere
+  OR: [ActedInWhere!]
+  screenTime: Int
+  screenTime_GT: Int
+  screenTime_GTE: Int
+  screenTime_IN: [Int!]
+  screenTime_LT: Int
+  screenTime_LTE: Int
+}
+
+type Actor {
+  actedIn(directed: Boolean = true, options: ProductionOptions, where: ProductionWhere): [Production!]!
+  actedInConnection(after: String, directed: Boolean = true, first: Int, sort: [ActorActedInConnectionSort!], where: ActorActedInConnectionWhere): ActorActedInConnection!
+  name: String!
+}
+
+type ActorActedInConnection {
+  edges: [ActorActedInRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input ActorActedInConnectionSort {
+  edge: ActedInSort
+  node: ProductionSort
+}
+
+input ActorActedInConnectionWhere {
+  AND: [ActorActedInConnectionWhere!]
+  NOT: ActorActedInConnectionWhere
+  OR: [ActorActedInConnectionWhere!]
+  edge: ActedInWhere
+  node: ProductionWhere
+}
+
+type ActorActedInRelationship {
+  cursor: String!
+  node: Production!
+  properties: ActedIn!
+}
+
+type ActorEdge {
+  cursor: String!
+  node: Actor!
+}
+
+input ActorOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more ActorSort objects to sort Actors by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [ActorSort!]
+}
+
+"""
+Fields to sort Actors by. The order in which sorts are applied is not guaranteed when specifying many fields in one ActorSort object.
+"""
+input ActorSort {
+  name: SortDirection
+}
+
+input ActorWhere {
+  AND: [ActorWhere!]
+  NOT: ActorWhere
+  OR: [ActorWhere!]
+  """
+  Return Actors where all of the related ActorActedInConnections match this filter
+  """
+  actedInConnection_ALL: ActorActedInConnectionWhere
+  """
+  Return Actors where none of the related ActorActedInConnections match this filter
+  """
+  actedInConnection_NONE: ActorActedInConnectionWhere
+  """
+  Return Actors where one of the related ActorActedInConnections match this filter
+  """
+  actedInConnection_SINGLE: ActorActedInConnectionWhere
+  """
+  Return Actors where some of the related ActorActedInConnections match this filter
+  """
+  actedInConnection_SOME: ActorActedInConnectionWhere
+  """Return Actors where all of the related Productions match this filter"""
+  actedIn_ALL: ProductionWhere
+  """Return Actors where none of the related Productions match this filter"""
+  actedIn_NONE: ProductionWhere
+  """Return Actors where one of the related Productions match this filter"""
+  actedIn_SINGLE: ProductionWhere
+  """Return Actors where some of the related Productions match this filter"""
+  actedIn_SOME: ProductionWhere
+  name: String
+  name_CONTAINS: String
+  name_ENDS_WITH: String
+  name_IN: [String!]
+  name_STARTS_WITH: String
+}
+
+type ActorsConnection {
+  edges: [ActorEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+type Movie implements Production {
+  cost: Float!
+  runtime: Int!
+  title: String!
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MovieSort!]
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
+"""
+input MovieSort {
+  cost: SortDirection
+  runtime: SortDirection
+  title: SortDirection
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  cost: Float
+  cost_GT: Float
+  cost_GTE: Float
+  cost_IN: [Float!]
+  cost_LT: Float
+  cost_LTE: Float
+  runtime: Int
+  runtime_GT: Int
+  runtime_GTE: Int
+  runtime_IN: [Int!]
+  runtime_LT: Int
+  runtime_LTE: Int
+  title: String
+  title_CONTAINS: String
+  title_ENDS_WITH: String
+  title_IN: [String!]
+  title_STARTS_WITH: String
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+interface Production {
+  cost: Float!
+  title: String!
+}
+
+type ProductionEdge {
+  cursor: String!
+  node: Production!
+}
+
+enum ProductionImplementation {
+  Movie
+  Series
+}
+
+input ProductionOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more ProductionSort objects to sort Productions by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [ProductionSort]
+}
+
+"""
+Fields to sort Productions by. The order in which sorts are applied is not guaranteed when specifying many fields in one ProductionSort object.
+"""
+input ProductionSort {
+  cost: SortDirection
+  title: SortDirection
+}
+
+input ProductionWhere {
+  AND: [ProductionWhere!]
+  NOT: ProductionWhere
+  OR: [ProductionWhere!]
+  cost: Float
+  cost_GT: Float
+  cost_GTE: Float
+  cost_IN: [Float!]
+  cost_LT: Float
+  cost_LTE: Float
+  title: String
+  title_CONTAINS: String
+  title_ENDS_WITH: String
+  title_IN: [String!]
+  title_STARTS_WITH: String
+  typename_IN: [ProductionImplementation!]
+}
+
+type ProductionsConnection {
+  edges: [ProductionEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+type Query {
+  actors(options: ActorOptions, where: ActorWhere): [Actor!]!
+  actorsConnection(after: String, first: Int, sort: [ActorSort], where: ActorWhere): ActorsConnection!
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+  productions(options: ProductionOptions, where: ProductionWhere): [Production!]!
+  productionsConnection(after: String, first: Int, sort: [ProductionSort], where: ProductionWhere): ProductionsConnection!
+  series(options: SeriesOptions, where: SeriesWhere): [Series!]!
+  seriesConnection(after: String, first: Int, sort: [SeriesSort], where: SeriesWhere): SeriesConnection!
+}
+
+type Series implements Production {
+  cost: Float!
+  episodes: Int!
+  title: String!
+}
+
+type SeriesConnection {
+  edges: [SeriesEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+type SeriesEdge {
+  cursor: String!
+  node: Series!
+}
+
+input SeriesOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more SeriesSort objects to sort Series by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [SeriesSort!]
+}
+
+"""
+Fields to sort Series by. The order in which sorts are applied is not guaranteed when specifying many fields in one SeriesSort object.
+"""
+input SeriesSort {
+  cost: SortDirection
+  episodes: SortDirection
+  title: SortDirection
+}
+
+input SeriesWhere {
+  AND: [SeriesWhere!]
+  NOT: SeriesWhere
+  OR: [SeriesWhere!]
+  cost: Float
+  cost_GT: Float
+  cost_GTE: Float
+  cost_IN: [Float!]
+  cost_LT: Float
+  cost_LTE: Float
+  episodes: Int
+  episodes_GT: Int
+  episodes_GTE: Int
+  episodes_IN: [Int!]
+  episodes_LT: Int
+  episodes_LTE: Int
+  title: String
+  title_CONTAINS: String
+  title_ENDS_WITH: String
+  title_IN: [String!]
+  title_STARTS_WITH: String
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
+
+== aggregate false should generate the correct schema without aggregations
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+"""
+The edge properties for the following fields:
+* Actor.actedIn
+"""
+type ActedIn {
+  screenTime: Int!
+}
+
+input ActedInSort {
+  screenTime: SortDirection
+}
+
+input ActedInWhere {
+  AND: [ActedInWhere!]
+  NOT: ActedInWhere
+  OR: [ActedInWhere!]
+  screenTime: Int
+  screenTime_GT: Int
+  screenTime_GTE: Int
+  screenTime_IN: [Int!]
+  screenTime_LT: Int
+  screenTime_LTE: Int
+}
+
+type Actor {
+  actedIn(directed: Boolean = true, options: ProductionOptions, where: ProductionWhere): [Production!]!
+  actedInConnection(after: String, directed: Boolean = true, first: Int, sort: [ActorActedInConnectionSort!], where: ActorActedInConnectionWhere): ActorActedInConnection!
+  name: String!
+}
+
+type ActorActedInConnection {
+  edges: [ActorActedInRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input ActorActedInConnectionSort {
+  edge: ActedInSort
+  node: ProductionSort
+}
+
+input ActorActedInConnectionWhere {
+  AND: [ActorActedInConnectionWhere!]
+  NOT: ActorActedInConnectionWhere
+  OR: [ActorActedInConnectionWhere!]
+  edge: ActedInWhere
+  node: ProductionWhere
+}
+
+type ActorActedInRelationship {
+  cursor: String!
+  node: Production!
+  properties: ActedIn!
+}
+
+type ActorEdge {
+  cursor: String!
+  node: Actor!
+}
+
+input ActorOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more ActorSort objects to sort Actors by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [ActorSort!]
+}
+
+"""
+Fields to sort Actors by. The order in which sorts are applied is not guaranteed when specifying many fields in one ActorSort object.
+"""
+input ActorSort {
+  name: SortDirection
+}
+
+input ActorWhere {
+  AND: [ActorWhere!]
+  NOT: ActorWhere
+  OR: [ActorWhere!]
+  """
+  Return Actors where all of the related ActorActedInConnections match this filter
+  """
+  actedInConnection_ALL: ActorActedInConnectionWhere
+  """
+  Return Actors where none of the related ActorActedInConnections match this filter
+  """
+  actedInConnection_NONE: ActorActedInConnectionWhere
+  """
+  Return Actors where one of the related ActorActedInConnections match this filter
+  """
+  actedInConnection_SINGLE: ActorActedInConnectionWhere
+  """
+  Return Actors where some of the related ActorActedInConnections match this filter
+  """
+  actedInConnection_SOME: ActorActedInConnectionWhere
+  """Return Actors where all of the related Productions match this filter"""
+  actedIn_ALL: ProductionWhere
+  """Return Actors where none of the related Productions match this filter"""
+  actedIn_NONE: ProductionWhere
+  """Return Actors where one of the related Productions match this filter"""
+  actedIn_SINGLE: ProductionWhere
+  """Return Actors where some of the related Productions match this filter"""
+  actedIn_SOME: ProductionWhere
+  name: String
+  name_CONTAINS: String
+  name_ENDS_WITH: String
+  name_IN: [String!]
+  name_STARTS_WITH: String
+}
+
+type ActorsConnection {
+  edges: [ActorEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+type Movie implements Production {
+  cost: Float!
+  runtime: Int!
+  title: String!
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MovieSort!]
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
+"""
+input MovieSort {
+  cost: SortDirection
+  runtime: SortDirection
+  title: SortDirection
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  cost: Float
+  cost_GT: Float
+  cost_GTE: Float
+  cost_IN: [Float!]
+  cost_LT: Float
+  cost_LTE: Float
+  runtime: Int
+  runtime_GT: Int
+  runtime_GTE: Int
+  runtime_IN: [Int!]
+  runtime_LT: Int
+  runtime_LTE: Int
+  title: String
+  title_CONTAINS: String
+  title_ENDS_WITH: String
+  title_IN: [String!]
+  title_STARTS_WITH: String
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+interface Production {
+  cost: Float!
+  title: String!
+}
+
+type ProductionEdge {
+  cursor: String!
+  node: Production!
+}
+
+enum ProductionImplementation {
+  Movie
+  Series
+}
+
+input ProductionOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more ProductionSort objects to sort Productions by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [ProductionSort]
+}
+
+"""
+Fields to sort Productions by. The order in which sorts are applied is not guaranteed when specifying many fields in one ProductionSort object.
+"""
+input ProductionSort {
+  cost: SortDirection
+  title: SortDirection
+}
+
+input ProductionWhere {
+  AND: [ProductionWhere!]
+  NOT: ProductionWhere
+  OR: [ProductionWhere!]
+  cost: Float
+  cost_GT: Float
+  cost_GTE: Float
+  cost_IN: [Float!]
+  cost_LT: Float
+  cost_LTE: Float
+  title: String
+  title_CONTAINS: String
+  title_ENDS_WITH: String
+  title_IN: [String!]
+  title_STARTS_WITH: String
+  typename_IN: [ProductionImplementation!]
+}
+
+type ProductionsConnection {
+  edges: [ProductionEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+type Query {
+  actors(options: ActorOptions, where: ActorWhere): [Actor!]!
+  actorsConnection(after: String, first: Int, sort: [ActorSort], where: ActorWhere): ActorsConnection!
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+  productions(options: ProductionOptions, where: ProductionWhere): [Production!]!
+  productionsConnection(after: String, first: Int, sort: [ProductionSort], where: ProductionWhere): ProductionsConnection!
+  series(options: SeriesOptions, where: SeriesWhere): [Series!]!
+  seriesConnection(after: String, first: Int, sort: [SeriesSort], where: SeriesWhere): SeriesConnection!
+}
+
+type Series implements Production {
+  cost: Float!
+  episodes: Int!
+  title: String!
+}
+
+type SeriesConnection {
+  edges: [SeriesEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+type SeriesEdge {
+  cursor: String!
+  node: Series!
+}
+
+input SeriesOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more SeriesSort objects to sort Series by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [SeriesSort!]
+}
+
+"""
+Fields to sort Series by. The order in which sorts are applied is not guaranteed when specifying many fields in one SeriesSort object.
+"""
+input SeriesSort {
+  cost: SortDirection
+  episodes: SortDirection
+  title: SortDirection
+}
+
+input SeriesWhere {
+  AND: [SeriesWhere!]
+  NOT: SeriesWhere
+  OR: [SeriesWhere!]
+  cost: Float
+  cost_GT: Float
+  cost_GTE: Float
+  cost_IN: [Float!]
+  cost_LT: Float
+  cost_LTE: Float
+  episodes: Int
+  episodes_GT: Int
+  episodes_GTE: Int
+  episodes_IN: [Int!]
+  episodes_LT: Int
+  episodes_LTE: Int
+  title: String
+  title_CONTAINS: String
+  title_ENDS_WITH: String
+  title_IN: [String!]
+  title_STARTS_WITH: String
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
diff --git a/core/src/test/resources/tck-test-files/schema/v2/experimental-schema/plural.adoc b/core/src/test/resources/tck-test-files/schema/v2/experimental-schema/plural.adoc
index 008caf3c..1e49c025 100644
--- a/core/src/test/resources/tck-test-files/schema/v2/experimental-schema/plural.adoc
+++ b/core/src/test/resources/tck-test-files/schema/v2/experimental-schema/plural.adoc
@@ -25,7 +25,7 @@ union Pet @plural(value: "petties") = Dog | Cat
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -197,6 +197,3 @@ input QueryOptions {
 }
 
 ----
-
-'''
-
diff --git a/core/src/test/resources/tck-test-files/schema/v2/experimental-schema/plural.js.adoc b/core/src/test/resources/tck-test-files/schema/v2/experimental-schema/plural.js.adoc
new file mode 100644
index 00000000..14bb816d
--- /dev/null
+++ b/core/src/test/resources/tck-test-files/schema/v2/experimental-schema/plural.js.adoc
@@ -0,0 +1,211 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= Plural option
+
+== Plural on interface and union
+
+.Schema
+[source,graphql,schema=true]
+----
+interface Animal @plural(value: "animales") {
+  name: String
+}
+
+type Dog implements Animal {
+  name: String
+  breed: String
+}
+
+type Cat {
+  queenOf: String
+}
+
+union Pet @plural(value: "petties") = Dog | Cat
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+interface Animal {
+  name: String
+}
+
+type AnimalEdge {
+  cursor: String!
+  node: Animal!
+}
+
+enum AnimalImplementation {
+  Dog
+}
+
+input AnimalOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more AnimalSort objects to sort Animales by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [AnimalSort]
+}
+
+"""
+Fields to sort Animales by. The order in which sorts are applied is not guaranteed when specifying many fields in one AnimalSort object.
+"""
+input AnimalSort {
+  name: SortDirection
+}
+
+input AnimalWhere {
+  AND: [AnimalWhere!]
+  NOT: AnimalWhere
+  OR: [AnimalWhere!]
+  name: String
+  name_CONTAINS: String
+  name_ENDS_WITH: String
+  name_IN: [String]
+  name_STARTS_WITH: String
+  typename_IN: [AnimalImplementation!]
+}
+
+type AnimalesConnection {
+  edges: [AnimalEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+type Cat {
+  queenOf: String
+}
+
+type CatEdge {
+  cursor: String!
+  node: Cat!
+}
+
+input CatOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more CatSort objects to sort Cats by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [CatSort!]
+}
+
+"""
+Fields to sort Cats by. The order in which sorts are applied is not guaranteed when specifying many fields in one CatSort object.
+"""
+input CatSort {
+  queenOf: SortDirection
+}
+
+input CatWhere {
+  AND: [CatWhere!]
+  NOT: CatWhere
+  OR: [CatWhere!]
+  queenOf: String
+  queenOf_CONTAINS: String
+  queenOf_ENDS_WITH: String
+  queenOf_IN: [String]
+  queenOf_STARTS_WITH: String
+}
+
+type CatsConnection {
+  edges: [CatEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+type Dog implements Animal {
+  breed: String
+  name: String
+}
+
+type DogEdge {
+  cursor: String!
+  node: Dog!
+}
+
+input DogOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more DogSort objects to sort Dogs by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [DogSort!]
+}
+
+"""
+Fields to sort Dogs by. The order in which sorts are applied is not guaranteed when specifying many fields in one DogSort object.
+"""
+input DogSort {
+  breed: SortDirection
+  name: SortDirection
+}
+
+input DogWhere {
+  AND: [DogWhere!]
+  NOT: DogWhere
+  OR: [DogWhere!]
+  breed: String
+  breed_CONTAINS: String
+  breed_ENDS_WITH: String
+  breed_IN: [String]
+  breed_STARTS_WITH: String
+  name: String
+  name_CONTAINS: String
+  name_ENDS_WITH: String
+  name_IN: [String]
+  name_STARTS_WITH: String
+}
+
+type DogsConnection {
+  edges: [DogEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+union Pet = Cat | Dog
+
+input PetWhere {
+  Cat: CatWhere
+  Dog: DogWhere
+}
+
+type Query {
+  animales(options: AnimalOptions, where: AnimalWhere): [Animal!]!
+  animalesConnection(after: String, first: Int, sort: [AnimalSort], where: AnimalWhere): AnimalesConnection!
+  cats(options: CatOptions, where: CatWhere): [Cat!]!
+  catsConnection(after: String, first: Int, sort: [CatSort], where: CatWhere): CatsConnection!
+  dogs(options: DogOptions, where: DogWhere): [Dog!]!
+  dogsConnection(after: String, first: Int, sort: [DogSort], where: DogWhere): DogsConnection!
+  petties(options: QueryOptions, where: PetWhere): [Pet!]!
+}
+
+"""Input type for options that can be specified on a query operation."""
+input QueryOptions {
+  limit: Int
+  offset: Int
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
diff --git a/core/src/test/resources/tck-test-files/schema/v2/experimental-schema/subscriptions.adoc b/core/src/test/resources/tck-test-files/schema/v2/experimental-schema/subscriptions.adoc
index 2b74111a..cf05bdfe 100644
--- a/core/src/test/resources/tck-test-files/schema/v2/experimental-schema/subscriptions.adoc
+++ b/core/src/test/resources/tck-test-files/schema/v2/experimental-schema/subscriptions.adoc
@@ -22,7 +22,7 @@ type Actor {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -188,8 +188,6 @@ input MovieWhere {
 
 ----
 
-'''
-
 == Empty EventPayload type
 
 .Schema
@@ -209,7 +207,7 @@ type Actor {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -398,8 +396,6 @@ input MovieWhere {
 
 ----
 
-'''
-
 == Empty EventPayload type on Union type
 
 .Schema
@@ -425,7 +421,7 @@ type Person {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -707,8 +703,6 @@ input StarWhere {
 
 ----
 
-'''
-
 == Empty EventPayload type, but @relationshipProperty exists
 
 .Schema
@@ -732,7 +726,7 @@ type Actor {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -950,6 +944,3 @@ input MovieWhere {
 }
 
 ----
-
-'''
-
diff --git a/core/src/test/resources/tck-test-files/schema/v2/experimental-schema/subscriptions.js.adoc b/core/src/test/resources/tck-test-files/schema/v2/experimental-schema/subscriptions.js.adoc
new file mode 100644
index 00000000..67086a4d
--- /dev/null
+++ b/core/src/test/resources/tck-test-files/schema/v2/experimental-schema/subscriptions.js.adoc
@@ -0,0 +1,1027 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= Subscriptions
+
+== Subscriptions
+
+.Schema
+[source,graphql,schema=true]
+----
+type Movie {
+  id: ID
+  actorCount: Int
+  averageRating: Float
+  isActive: Boolean
+  actors: [Actor!]! @relationship(type: "ACTED_IN", direction: IN)
+}
+
+type Actor {
+  name: String!
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+type Actor {
+  name: String!
+}
+
+type ActorEdge {
+  cursor: String!
+  node: Actor!
+}
+
+input ActorOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more ActorSort objects to sort Actors by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [ActorSort!]
+}
+
+"""
+Fields to sort Actors by. The order in which sorts are applied is not guaranteed when specifying many fields in one ActorSort object.
+"""
+input ActorSort {
+  name: SortDirection
+}
+
+input ActorWhere {
+  AND: [ActorWhere!]
+  NOT: ActorWhere
+  OR: [ActorWhere!]
+  name: String
+  name_CONTAINS: String
+  name_ENDS_WITH: String
+  name_IN: [String!]
+  name_STARTS_WITH: String
+}
+
+type ActorsConnection {
+  edges: [ActorEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+type Movie {
+  actorCount: Int
+  actors(directed: Boolean = true, options: ActorOptions, where: ActorWhere): [Actor!]!
+  actorsConnection(after: String, directed: Boolean = true, first: Int, sort: [MovieActorsConnectionSort!], where: MovieActorsConnectionWhere): MovieActorsConnection!
+  averageRating: Float
+  id: ID
+  isActive: Boolean
+}
+
+type MovieActorsConnection {
+  edges: [MovieActorsRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input MovieActorsConnectionSort {
+  node: ActorSort
+}
+
+input MovieActorsConnectionWhere {
+  AND: [MovieActorsConnectionWhere!]
+  NOT: MovieActorsConnectionWhere
+  OR: [MovieActorsConnectionWhere!]
+  node: ActorWhere
+}
+
+type MovieActorsRelationship {
+  cursor: String!
+  node: Actor!
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MovieSort!]
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
+"""
+input MovieSort {
+  actorCount: SortDirection
+  averageRating: SortDirection
+  id: SortDirection
+  isActive: SortDirection
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  actorCount: Int
+  actorCount_GT: Int
+  actorCount_GTE: Int
+  actorCount_IN: [Int]
+  actorCount_LT: Int
+  actorCount_LTE: Int
+  """
+  Return Movies where all of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_ALL: MovieActorsConnectionWhere
+  """
+  Return Movies where none of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_NONE: MovieActorsConnectionWhere
+  """
+  Return Movies where one of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SINGLE: MovieActorsConnectionWhere
+  """
+  Return Movies where some of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SOME: MovieActorsConnectionWhere
+  """Return Movies where all of the related Actors match this filter"""
+  actors_ALL: ActorWhere
+  """Return Movies where none of the related Actors match this filter"""
+  actors_NONE: ActorWhere
+  """Return Movies where one of the related Actors match this filter"""
+  actors_SINGLE: ActorWhere
+  """Return Movies where some of the related Actors match this filter"""
+  actors_SOME: ActorWhere
+  averageRating: Float
+  averageRating_GT: Float
+  averageRating_GTE: Float
+  averageRating_IN: [Float]
+  averageRating_LT: Float
+  averageRating_LTE: Float
+  id: ID
+  id_CONTAINS: ID
+  id_ENDS_WITH: ID
+  id_IN: [ID]
+  id_STARTS_WITH: ID
+  isActive: Boolean
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+type Query {
+  actors(options: ActorOptions, where: ActorWhere): [Actor!]!
+  actorsConnection(after: String, first: Int, sort: [ActorSort], where: ActorWhere): ActorsConnection!
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
+
+== Empty EventPayload type
+
+.Schema
+[source,graphql,schema=true]
+----
+type Movie {
+  id: ID
+  actorCount: Int
+  averageRating: Float
+  isActive: Boolean
+  actors: [Actor!]! @relationship(type: "ACTED_IN", direction: IN)
+}
+
+type Actor {
+  movies: [Movie!]! @relationship(type: "ACTED_IN", direction: OUT)
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+type Actor {
+  movies(directed: Boolean = true, options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, directed: Boolean = true, first: Int, sort: [ActorMoviesConnectionSort!], where: ActorMoviesConnectionWhere): ActorMoviesConnection!
+}
+
+type ActorEdge {
+  cursor: String!
+  node: Actor!
+}
+
+type ActorMoviesConnection {
+  edges: [ActorMoviesRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input ActorMoviesConnectionSort {
+  node: MovieSort
+}
+
+input ActorMoviesConnectionWhere {
+  AND: [ActorMoviesConnectionWhere!]
+  NOT: ActorMoviesConnectionWhere
+  OR: [ActorMoviesConnectionWhere!]
+  node: MovieWhere
+}
+
+type ActorMoviesRelationship {
+  cursor: String!
+  node: Movie!
+}
+
+input ActorOptions {
+  limit: Int
+  offset: Int
+}
+
+input ActorWhere {
+  AND: [ActorWhere!]
+  NOT: ActorWhere
+  OR: [ActorWhere!]
+  """
+  Return Actors where all of the related ActorMoviesConnections match this filter
+  """
+  moviesConnection_ALL: ActorMoviesConnectionWhere
+  """
+  Return Actors where none of the related ActorMoviesConnections match this filter
+  """
+  moviesConnection_NONE: ActorMoviesConnectionWhere
+  """
+  Return Actors where one of the related ActorMoviesConnections match this filter
+  """
+  moviesConnection_SINGLE: ActorMoviesConnectionWhere
+  """
+  Return Actors where some of the related ActorMoviesConnections match this filter
+  """
+  moviesConnection_SOME: ActorMoviesConnectionWhere
+  """Return Actors where all of the related Movies match this filter"""
+  movies_ALL: MovieWhere
+  """Return Actors where none of the related Movies match this filter"""
+  movies_NONE: MovieWhere
+  """Return Actors where one of the related Movies match this filter"""
+  movies_SINGLE: MovieWhere
+  """Return Actors where some of the related Movies match this filter"""
+  movies_SOME: MovieWhere
+}
+
+type ActorsConnection {
+  edges: [ActorEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+type Movie {
+  actorCount: Int
+  actors(directed: Boolean = true, options: ActorOptions, where: ActorWhere): [Actor!]!
+  actorsConnection(after: String, directed: Boolean = true, first: Int, where: MovieActorsConnectionWhere): MovieActorsConnection!
+  averageRating: Float
+  id: ID
+  isActive: Boolean
+}
+
+type MovieActorsConnection {
+  edges: [MovieActorsRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input MovieActorsConnectionWhere {
+  AND: [MovieActorsConnectionWhere!]
+  NOT: MovieActorsConnectionWhere
+  OR: [MovieActorsConnectionWhere!]
+  node: ActorWhere
+}
+
+type MovieActorsRelationship {
+  cursor: String!
+  node: Actor!
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MovieSort!]
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
+"""
+input MovieSort {
+  actorCount: SortDirection
+  averageRating: SortDirection
+  id: SortDirection
+  isActive: SortDirection
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  actorCount: Int
+  actorCount_GT: Int
+  actorCount_GTE: Int
+  actorCount_IN: [Int]
+  actorCount_LT: Int
+  actorCount_LTE: Int
+  """
+  Return Movies where all of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_ALL: MovieActorsConnectionWhere
+  """
+  Return Movies where none of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_NONE: MovieActorsConnectionWhere
+  """
+  Return Movies where one of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SINGLE: MovieActorsConnectionWhere
+  """
+  Return Movies where some of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SOME: MovieActorsConnectionWhere
+  """Return Movies where all of the related Actors match this filter"""
+  actors_ALL: ActorWhere
+  """Return Movies where none of the related Actors match this filter"""
+  actors_NONE: ActorWhere
+  """Return Movies where one of the related Actors match this filter"""
+  actors_SINGLE: ActorWhere
+  """Return Movies where some of the related Actors match this filter"""
+  actors_SOME: ActorWhere
+  averageRating: Float
+  averageRating_GT: Float
+  averageRating_GTE: Float
+  averageRating_IN: [Float]
+  averageRating_LT: Float
+  averageRating_LTE: Float
+  id: ID
+  id_CONTAINS: ID
+  id_ENDS_WITH: ID
+  id_IN: [ID]
+  id_STARTS_WITH: ID
+  isActive: Boolean
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+type Query {
+  actors(options: ActorOptions, where: ActorWhere): [Actor!]!
+  actorsConnection(after: String, first: Int, where: ActorWhere): ActorsConnection!
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
+
+== Empty EventPayload type on Union type
+
+.Schema
+[source,graphql,schema=true]
+----
+type Movie {
+  id: ID
+  actorCount: Int
+  averageRating: Float
+  isActive: Boolean
+  actors: [Actor!]! @relationship(type: "ACTED_IN", direction: IN)
+}
+
+union Actor = Star | Person
+
+type Star {
+  movies: [Movie!]! @relationship(type: "ACTED_IN", direction: OUT)
+}
+
+type Person {
+  movies: [Movie!]! @relationship(type: "ACTED_IN", direction: OUT)
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+union Actor = Person | Star
+
+input ActorWhere {
+  Person: PersonWhere
+  Star: StarWhere
+}
+
+type Movie {
+  actorCount: Int
+  actors(directed: Boolean = true, options: QueryOptions, where: ActorWhere): [Actor!]!
+  actorsConnection(after: String, directed: Boolean = true, first: Int, where: MovieActorsConnectionWhere): MovieActorsConnection!
+  averageRating: Float
+  id: ID
+  isActive: Boolean
+}
+
+type MovieActorsConnection {
+  edges: [MovieActorsRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input MovieActorsConnectionWhere {
+  Person: MovieActorsPersonConnectionWhere
+  Star: MovieActorsStarConnectionWhere
+}
+
+input MovieActorsPersonConnectionWhere {
+  AND: [MovieActorsPersonConnectionWhere!]
+  NOT: MovieActorsPersonConnectionWhere
+  OR: [MovieActorsPersonConnectionWhere!]
+  node: PersonWhere
+}
+
+type MovieActorsRelationship {
+  cursor: String!
+  node: Actor!
+}
+
+input MovieActorsStarConnectionWhere {
+  AND: [MovieActorsStarConnectionWhere!]
+  NOT: MovieActorsStarConnectionWhere
+  OR: [MovieActorsStarConnectionWhere!]
+  node: StarWhere
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MovieSort!]
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
+"""
+input MovieSort {
+  actorCount: SortDirection
+  averageRating: SortDirection
+  id: SortDirection
+  isActive: SortDirection
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  actorCount: Int
+  actorCount_GT: Int
+  actorCount_GTE: Int
+  actorCount_IN: [Int]
+  actorCount_LT: Int
+  actorCount_LTE: Int
+  """
+  Return Movies where all of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_ALL: MovieActorsConnectionWhere
+  """
+  Return Movies where none of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_NONE: MovieActorsConnectionWhere
+  """
+  Return Movies where one of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SINGLE: MovieActorsConnectionWhere
+  """
+  Return Movies where some of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SOME: MovieActorsConnectionWhere
+  """Return Movies where all of the related Actors match this filter"""
+  actors_ALL: ActorWhere
+  """Return Movies where none of the related Actors match this filter"""
+  actors_NONE: ActorWhere
+  """Return Movies where one of the related Actors match this filter"""
+  actors_SINGLE: ActorWhere
+  """Return Movies where some of the related Actors match this filter"""
+  actors_SOME: ActorWhere
+  averageRating: Float
+  averageRating_GT: Float
+  averageRating_GTE: Float
+  averageRating_IN: [Float]
+  averageRating_LT: Float
+  averageRating_LTE: Float
+  id: ID
+  id_CONTAINS: ID
+  id_ENDS_WITH: ID
+  id_IN: [ID]
+  id_STARTS_WITH: ID
+  isActive: Boolean
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+type PeopleConnection {
+  edges: [PersonEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+type Person {
+  movies(directed: Boolean = true, options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, directed: Boolean = true, first: Int, sort: [PersonMoviesConnectionSort!], where: PersonMoviesConnectionWhere): PersonMoviesConnection!
+}
+
+type PersonEdge {
+  cursor: String!
+  node: Person!
+}
+
+type PersonMoviesConnection {
+  edges: [PersonMoviesRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input PersonMoviesConnectionSort {
+  node: MovieSort
+}
+
+input PersonMoviesConnectionWhere {
+  AND: [PersonMoviesConnectionWhere!]
+  NOT: PersonMoviesConnectionWhere
+  OR: [PersonMoviesConnectionWhere!]
+  node: MovieWhere
+}
+
+type PersonMoviesRelationship {
+  cursor: String!
+  node: Movie!
+}
+
+input PersonOptions {
+  limit: Int
+  offset: Int
+}
+
+input PersonWhere {
+  AND: [PersonWhere!]
+  NOT: PersonWhere
+  OR: [PersonWhere!]
+  """
+  Return People where all of the related PersonMoviesConnections match this filter
+  """
+  moviesConnection_ALL: PersonMoviesConnectionWhere
+  """
+  Return People where none of the related PersonMoviesConnections match this filter
+  """
+  moviesConnection_NONE: PersonMoviesConnectionWhere
+  """
+  Return People where one of the related PersonMoviesConnections match this filter
+  """
+  moviesConnection_SINGLE: PersonMoviesConnectionWhere
+  """
+  Return People where some of the related PersonMoviesConnections match this filter
+  """
+  moviesConnection_SOME: PersonMoviesConnectionWhere
+  """Return People where all of the related Movies match this filter"""
+  movies_ALL: MovieWhere
+  """Return People where none of the related Movies match this filter"""
+  movies_NONE: MovieWhere
+  """Return People where one of the related Movies match this filter"""
+  movies_SINGLE: MovieWhere
+  """Return People where some of the related Movies match this filter"""
+  movies_SOME: MovieWhere
+}
+
+type Query {
+  actors(options: QueryOptions, where: ActorWhere): [Actor!]!
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+  people(options: PersonOptions, where: PersonWhere): [Person!]!
+  peopleConnection(after: String, first: Int, where: PersonWhere): PeopleConnection!
+  stars(options: StarOptions, where: StarWhere): [Star!]!
+  starsConnection(after: String, first: Int, where: StarWhere): StarsConnection!
+}
+
+"""Input type for options that can be specified on a query operation."""
+input QueryOptions {
+  limit: Int
+  offset: Int
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+
+type Star {
+  movies(directed: Boolean = true, options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, directed: Boolean = true, first: Int, sort: [StarMoviesConnectionSort!], where: StarMoviesConnectionWhere): StarMoviesConnection!
+}
+
+type StarEdge {
+  cursor: String!
+  node: Star!
+}
+
+type StarMoviesConnection {
+  edges: [StarMoviesRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input StarMoviesConnectionSort {
+  node: MovieSort
+}
+
+input StarMoviesConnectionWhere {
+  AND: [StarMoviesConnectionWhere!]
+  NOT: StarMoviesConnectionWhere
+  OR: [StarMoviesConnectionWhere!]
+  node: MovieWhere
+}
+
+type StarMoviesRelationship {
+  cursor: String!
+  node: Movie!
+}
+
+input StarOptions {
+  limit: Int
+  offset: Int
+}
+
+input StarWhere {
+  AND: [StarWhere!]
+  NOT: StarWhere
+  OR: [StarWhere!]
+  """
+  Return Stars where all of the related StarMoviesConnections match this filter
+  """
+  moviesConnection_ALL: StarMoviesConnectionWhere
+  """
+  Return Stars where none of the related StarMoviesConnections match this filter
+  """
+  moviesConnection_NONE: StarMoviesConnectionWhere
+  """
+  Return Stars where one of the related StarMoviesConnections match this filter
+  """
+  moviesConnection_SINGLE: StarMoviesConnectionWhere
+  """
+  Return Stars where some of the related StarMoviesConnections match this filter
+  """
+  moviesConnection_SOME: StarMoviesConnectionWhere
+  """Return Stars where all of the related Movies match this filter"""
+  movies_ALL: MovieWhere
+  """Return Stars where none of the related Movies match this filter"""
+  movies_NONE: MovieWhere
+  """Return Stars where one of the related Movies match this filter"""
+  movies_SINGLE: MovieWhere
+  """Return Stars where some of the related Movies match this filter"""
+  movies_SOME: MovieWhere
+}
+
+type StarsConnection {
+  edges: [StarEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+----
+
+== Empty EventPayload type, but @relationshipProperty exists
+
+.Schema
+[source,graphql,schema=true]
+----
+type Movie {
+  id: ID
+  actorCount: Int
+  averageRating: Float
+  isActive: Boolean
+  actors: [Actor!]! @relationship(type: "ACTED_IN", properties: "ActedIn", direction: IN)
+}
+
+type ActedIn @relationshipProperties {
+  screenTime: Int!
+}
+
+type Actor {
+  movies: [Movie!]! @relationship(type: "ACTED_IN", direction: OUT)
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+"""
+The edge properties for the following fields:
+* Movie.actors
+"""
+type ActedIn {
+  screenTime: Int!
+}
+
+input ActedInSort {
+  screenTime: SortDirection
+}
+
+input ActedInWhere {
+  AND: [ActedInWhere!]
+  NOT: ActedInWhere
+  OR: [ActedInWhere!]
+  screenTime: Int
+  screenTime_GT: Int
+  screenTime_GTE: Int
+  screenTime_IN: [Int!]
+  screenTime_LT: Int
+  screenTime_LTE: Int
+}
+
+type Actor {
+  movies(directed: Boolean = true, options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, directed: Boolean = true, first: Int, sort: [ActorMoviesConnectionSort!], where: ActorMoviesConnectionWhere): ActorMoviesConnection!
+}
+
+type ActorEdge {
+  cursor: String!
+  node: Actor!
+}
+
+type ActorMoviesConnection {
+  edges: [ActorMoviesRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input ActorMoviesConnectionSort {
+  node: MovieSort
+}
+
+input ActorMoviesConnectionWhere {
+  AND: [ActorMoviesConnectionWhere!]
+  NOT: ActorMoviesConnectionWhere
+  OR: [ActorMoviesConnectionWhere!]
+  node: MovieWhere
+}
+
+type ActorMoviesRelationship {
+  cursor: String!
+  node: Movie!
+}
+
+input ActorOptions {
+  limit: Int
+  offset: Int
+}
+
+input ActorWhere {
+  AND: [ActorWhere!]
+  NOT: ActorWhere
+  OR: [ActorWhere!]
+  """
+  Return Actors where all of the related ActorMoviesConnections match this filter
+  """
+  moviesConnection_ALL: ActorMoviesConnectionWhere
+  """
+  Return Actors where none of the related ActorMoviesConnections match this filter
+  """
+  moviesConnection_NONE: ActorMoviesConnectionWhere
+  """
+  Return Actors where one of the related ActorMoviesConnections match this filter
+  """
+  moviesConnection_SINGLE: ActorMoviesConnectionWhere
+  """
+  Return Actors where some of the related ActorMoviesConnections match this filter
+  """
+  moviesConnection_SOME: ActorMoviesConnectionWhere
+  """Return Actors where all of the related Movies match this filter"""
+  movies_ALL: MovieWhere
+  """Return Actors where none of the related Movies match this filter"""
+  movies_NONE: MovieWhere
+  """Return Actors where one of the related Movies match this filter"""
+  movies_SINGLE: MovieWhere
+  """Return Actors where some of the related Movies match this filter"""
+  movies_SOME: MovieWhere
+}
+
+type ActorsConnection {
+  edges: [ActorEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+type Movie {
+  actorCount: Int
+  actors(directed: Boolean = true, options: ActorOptions, where: ActorWhere): [Actor!]!
+  actorsConnection(after: String, directed: Boolean = true, first: Int, sort: [MovieActorsConnectionSort!], where: MovieActorsConnectionWhere): MovieActorsConnection!
+  averageRating: Float
+  id: ID
+  isActive: Boolean
+}
+
+type MovieActorsConnection {
+  edges: [MovieActorsRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input MovieActorsConnectionSort {
+  edge: ActedInSort
+}
+
+input MovieActorsConnectionWhere {
+  AND: [MovieActorsConnectionWhere!]
+  NOT: MovieActorsConnectionWhere
+  OR: [MovieActorsConnectionWhere!]
+  edge: ActedInWhere
+  node: ActorWhere
+}
+
+type MovieActorsRelationship {
+  cursor: String!
+  node: Actor!
+  properties: ActedIn!
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MovieSort!]
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
+"""
+input MovieSort {
+  actorCount: SortDirection
+  averageRating: SortDirection
+  id: SortDirection
+  isActive: SortDirection
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  actorCount: Int
+  actorCount_GT: Int
+  actorCount_GTE: Int
+  actorCount_IN: [Int]
+  actorCount_LT: Int
+  actorCount_LTE: Int
+  """
+  Return Movies where all of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_ALL: MovieActorsConnectionWhere
+  """
+  Return Movies where none of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_NONE: MovieActorsConnectionWhere
+  """
+  Return Movies where one of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SINGLE: MovieActorsConnectionWhere
+  """
+  Return Movies where some of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SOME: MovieActorsConnectionWhere
+  """Return Movies where all of the related Actors match this filter"""
+  actors_ALL: ActorWhere
+  """Return Movies where none of the related Actors match this filter"""
+  actors_NONE: ActorWhere
+  """Return Movies where one of the related Actors match this filter"""
+  actors_SINGLE: ActorWhere
+  """Return Movies where some of the related Actors match this filter"""
+  actors_SOME: ActorWhere
+  averageRating: Float
+  averageRating_GT: Float
+  averageRating_GTE: Float
+  averageRating_IN: [Float]
+  averageRating_LT: Float
+  averageRating_LTE: Float
+  id: ID
+  id_CONTAINS: ID
+  id_ENDS_WITH: ID
+  id_IN: [ID]
+  id_STARTS_WITH: ID
+  isActive: Boolean
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+type Query {
+  actors(options: ActorOptions, where: ActorWhere): [Actor!]!
+  actorsConnection(after: String, first: Int, where: ActorWhere): ActorsConnection!
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
diff --git a/core/src/test/resources/tck-test-files/schema/v2/extend.adoc b/core/src/test/resources/tck-test-files/schema/v2/extend.adoc
index 7ee7c75c..cade59fb 100644
--- a/core/src/test/resources/tck-test-files/schema/v2/extend.adoc
+++ b/core/src/test/resources/tck-test-files/schema/v2/extend.adoc
@@ -18,7 +18,7 @@ extend type Movie {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -91,6 +91,3 @@ input MovieWhere {
 }
 
 ----
-
-'''
-
diff --git a/core/src/test/resources/tck-test-files/schema/v2/extend.js.adoc b/core/src/test/resources/tck-test-files/schema/v2/extend.js.adoc
new file mode 100644
index 00000000..99df0b75
--- /dev/null
+++ b/core/src/test/resources/tck-test-files/schema/v2/extend.js.adoc
@@ -0,0 +1,97 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= Extend
+
+== Extend
+
+.Schema
+[source,graphql,schema=true]
+----
+type Movie {
+  id: ID
+}
+
+extend type Movie {
+  name: String
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+type Movie {
+  id: ID
+  name: String
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MovieSort!]
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
+"""
+input MovieSort {
+  id: SortDirection
+  name: SortDirection
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  id: ID
+  id_CONTAINS: ID
+  id_ENDS_WITH: ID
+  id_IN: [ID]
+  id_STARTS_WITH: ID
+  name: String
+  name_CONTAINS: String
+  name_ENDS_WITH: String
+  name_IN: [String]
+  name_STARTS_WITH: String
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+type Query {
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
diff --git a/core/src/test/resources/tck-test-files/schema/v2/inputs.adoc b/core/src/test/resources/tck-test-files/schema/v2/inputs.adoc
index b76c9f93..89ec01db 100644
--- a/core/src/test/resources/tck-test-files/schema/v2/inputs.adoc
+++ b/core/src/test/resources/tck-test-files/schema/v2/inputs.adoc
@@ -22,7 +22,7 @@ type Query {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -93,6 +93,3 @@ input NodeInput {
 }
 
 ----
-
-'''
-
diff --git a/core/src/test/resources/integration-test-files/errors.adoc b/core/src/test/resources/tck-test-files/schema/v2/inputs.js.adoc
similarity index 84%
rename from core/src/test/resources/integration-test-files/errors.adoc
rename to core/src/test/resources/tck-test-files/schema/v2/inputs.js.adoc
index efd3a74e..11059244 100644
--- a/core/src/test/resources/integration-test-files/errors.adoc
+++ b/core/src/test/resources/tck-test-files/schema/v2/inputs.js.adoc
@@ -1,20 +1,29 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
 :toc:
 :toclevels: 42
 
-= Errors
+= Inputs
 
-== An error should be thrown if no driver is supplied
+== Inputs
 
 .Schema
 [source,graphql,schema=true]
 ----
+input NodeInput {
+  id: ID
+}
+
 type Movie {
   id: ID
 }
+
+type Query {
+  name(input: NodeInput): String
+}
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -62,6 +71,10 @@ type MoviesConnection {
   totalCount: Int!
 }
 
+input NodeInput {
+  id: ID
+}
+
 """Pagination information (Relay)"""
 type PageInfo {
   endCursor: String
@@ -73,6 +86,7 @@ type PageInfo {
 type Query {
   movies(options: MovieOptions, where: MovieWhere): [Movie!]!
   moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+  name(input: NodeInput): String
 }
 
 """An enum for sorting in either ascending or descending order."""
@@ -83,6 +97,3 @@ enum SortDirection {
   DESC
 }
 ----
-
-'''
-
diff --git a/core/src/test/resources/tck-test-files/schema/v2/interface-relationships.adoc b/core/src/test/resources/tck-test-files/schema/v2/interface-relationships.adoc
index 788b2efd..0e16b389 100644
--- a/core/src/test/resources/tck-test-files/schema/v2/interface-relationships.adoc
+++ b/core/src/test/resources/tck-test-files/schema/v2/interface-relationships.adoc
@@ -33,7 +33,7 @@ type Actor {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -308,6 +308,3 @@ input SeriesWhere {
 }
 
 ----
-
-'''
-
diff --git a/core/src/test/resources/tck-test-files/schema/v2/interface-relationships.js.adoc b/core/src/test/resources/tck-test-files/schema/v2/interface-relationships.js.adoc
new file mode 100644
index 00000000..2b07f1d3
--- /dev/null
+++ b/core/src/test/resources/tck-test-files/schema/v2/interface-relationships.js.adoc
@@ -0,0 +1,334 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= Interface Relationships
+
+== Interface Relationships - single
+
+.Schema
+[source,graphql,schema=true]
+----
+interface Production {
+  title: String!
+}
+
+type Movie implements Production {
+  title: String!
+  runtime: Int!
+}
+
+type Series implements Production {
+  title: String!
+  episodes: Int!
+}
+
+type ActedIn @relationshipProperties {
+  screenTime: Int!
+}
+
+type Actor {
+  name: String!
+  actedIn: [Production!]! @relationship(type: "ACTED_IN", direction: OUT, properties: "ActedIn")
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+"""
+The edge properties for the following fields:
+* Actor.actedIn
+"""
+type ActedIn {
+  screenTime: Int!
+}
+
+input ActedInSort {
+  screenTime: SortDirection
+}
+
+input ActedInWhere {
+  AND: [ActedInWhere!]
+  NOT: ActedInWhere
+  OR: [ActedInWhere!]
+  screenTime: Int
+  screenTime_GT: Int
+  screenTime_GTE: Int
+  screenTime_IN: [Int!]
+  screenTime_LT: Int
+  screenTime_LTE: Int
+}
+
+type Actor {
+  actedIn(directed: Boolean = true, options: ProductionOptions, where: ProductionWhere): [Production!]!
+  actedInConnection(after: String, directed: Boolean = true, first: Int, sort: [ActorActedInConnectionSort!], where: ActorActedInConnectionWhere): ActorActedInConnection!
+  name: String!
+}
+
+type ActorActedInConnection {
+  edges: [ActorActedInRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input ActorActedInConnectionSort {
+  edge: ActedInSort
+  node: ProductionSort
+}
+
+input ActorActedInConnectionWhere {
+  AND: [ActorActedInConnectionWhere!]
+  NOT: ActorActedInConnectionWhere
+  OR: [ActorActedInConnectionWhere!]
+  edge: ActedInWhere
+  node: ProductionWhere
+}
+
+type ActorActedInRelationship {
+  cursor: String!
+  node: Production!
+  properties: ActedIn!
+}
+
+type ActorEdge {
+  cursor: String!
+  node: Actor!
+}
+
+input ActorOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more ActorSort objects to sort Actors by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [ActorSort!]
+}
+
+"""
+Fields to sort Actors by. The order in which sorts are applied is not guaranteed when specifying many fields in one ActorSort object.
+"""
+input ActorSort {
+  name: SortDirection
+}
+
+input ActorWhere {
+  AND: [ActorWhere!]
+  NOT: ActorWhere
+  OR: [ActorWhere!]
+  """
+  Return Actors where all of the related ActorActedInConnections match this filter
+  """
+  actedInConnection_ALL: ActorActedInConnectionWhere
+  """
+  Return Actors where none of the related ActorActedInConnections match this filter
+  """
+  actedInConnection_NONE: ActorActedInConnectionWhere
+  """
+  Return Actors where one of the related ActorActedInConnections match this filter
+  """
+  actedInConnection_SINGLE: ActorActedInConnectionWhere
+  """
+  Return Actors where some of the related ActorActedInConnections match this filter
+  """
+  actedInConnection_SOME: ActorActedInConnectionWhere
+  """Return Actors where all of the related Productions match this filter"""
+  actedIn_ALL: ProductionWhere
+  """Return Actors where none of the related Productions match this filter"""
+  actedIn_NONE: ProductionWhere
+  """Return Actors where one of the related Productions match this filter"""
+  actedIn_SINGLE: ProductionWhere
+  """Return Actors where some of the related Productions match this filter"""
+  actedIn_SOME: ProductionWhere
+  name: String
+  name_CONTAINS: String
+  name_ENDS_WITH: String
+  name_IN: [String!]
+  name_STARTS_WITH: String
+}
+
+type ActorsConnection {
+  edges: [ActorEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+type Movie implements Production {
+  runtime: Int!
+  title: String!
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MovieSort!]
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
+"""
+input MovieSort {
+  runtime: SortDirection
+  title: SortDirection
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  runtime: Int
+  runtime_GT: Int
+  runtime_GTE: Int
+  runtime_IN: [Int!]
+  runtime_LT: Int
+  runtime_LTE: Int
+  title: String
+  title_CONTAINS: String
+  title_ENDS_WITH: String
+  title_IN: [String!]
+  title_STARTS_WITH: String
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+interface Production {
+  title: String!
+}
+
+type ProductionEdge {
+  cursor: String!
+  node: Production!
+}
+
+enum ProductionImplementation {
+  Movie
+  Series
+}
+
+input ProductionOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more ProductionSort objects to sort Productions by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [ProductionSort]
+}
+
+"""
+Fields to sort Productions by. The order in which sorts are applied is not guaranteed when specifying many fields in one ProductionSort object.
+"""
+input ProductionSort {
+  title: SortDirection
+}
+
+input ProductionWhere {
+  AND: [ProductionWhere!]
+  NOT: ProductionWhere
+  OR: [ProductionWhere!]
+  title: String
+  title_CONTAINS: String
+  title_ENDS_WITH: String
+  title_IN: [String!]
+  title_STARTS_WITH: String
+  typename_IN: [ProductionImplementation!]
+}
+
+type ProductionsConnection {
+  edges: [ProductionEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+type Query {
+  actors(options: ActorOptions, where: ActorWhere): [Actor!]!
+  actorsConnection(after: String, first: Int, sort: [ActorSort], where: ActorWhere): ActorsConnection!
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+  productions(options: ProductionOptions, where: ProductionWhere): [Production!]!
+  productionsConnection(after: String, first: Int, sort: [ProductionSort], where: ProductionWhere): ProductionsConnection!
+  series(options: SeriesOptions, where: SeriesWhere): [Series!]!
+  seriesConnection(after: String, first: Int, sort: [SeriesSort], where: SeriesWhere): SeriesConnection!
+}
+
+type Series implements Production {
+  episodes: Int!
+  title: String!
+}
+
+type SeriesConnection {
+  edges: [SeriesEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+type SeriesEdge {
+  cursor: String!
+  node: Series!
+}
+
+input SeriesOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more SeriesSort objects to sort Series by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [SeriesSort!]
+}
+
+"""
+Fields to sort Series by. The order in which sorts are applied is not guaranteed when specifying many fields in one SeriesSort object.
+"""
+input SeriesSort {
+  episodes: SortDirection
+  title: SortDirection
+}
+
+input SeriesWhere {
+  AND: [SeriesWhere!]
+  NOT: SeriesWhere
+  OR: [SeriesWhere!]
+  episodes: Int
+  episodes_GT: Int
+  episodes_GTE: Int
+  episodes_IN: [Int!]
+  episodes_LT: Int
+  episodes_LTE: Int
+  title: String
+  title_CONTAINS: String
+  title_ENDS_WITH: String
+  title_IN: [String!]
+  title_STARTS_WITH: String
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
diff --git a/core/src/test/resources/tck-test-files/schema/v2/issues/1038.adoc b/core/src/test/resources/tck-test-files/schema/v2/issues/1038.adoc
index a608cbef..8bdbded0 100644
--- a/core/src/test/resources/tck-test-files/schema/v2/issues/1038.adoc
+++ b/core/src/test/resources/tck-test-files/schema/v2/issues/1038.adoc
@@ -20,7 +20,7 @@ type DNSZone {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -140,6 +140,3 @@ input DNSZoneWhere {
 }
 
 ----
-
-'''
-
diff --git a/core/src/test/resources/tck-test-files/schema/v2/issues/1038.js.adoc b/core/src/test/resources/tck-test-files/schema/v2/issues/1038.js.adoc
new file mode 100644
index 00000000..6ef8044c
--- /dev/null
+++ b/core/src/test/resources/tck-test-files/schema/v2/issues/1038.js.adoc
@@ -0,0 +1,150 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= https://github.com/neo4j/graphql/issues/1038
+
+== AWSAccount and DNSZone should be cased correctly
+
+.Schema
+[source,graphql,schema=true]
+----
+type AWSAccount {
+  code: String
+  accountName: String
+}
+
+type DNSZone {
+  awsId: String
+  zoneType: String
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+type AWSAccount {
+  accountName: String
+  code: String
+}
+
+type AWSAccountEdge {
+  cursor: String!
+  node: AWSAccount!
+}
+
+input AWSAccountOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more AWSAccountSort objects to sort AwsAccounts by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [AWSAccountSort!]
+}
+
+"""
+Fields to sort AwsAccounts by. The order in which sorts are applied is not guaranteed when specifying many fields in one AWSAccountSort object.
+"""
+input AWSAccountSort {
+  accountName: SortDirection
+  code: SortDirection
+}
+
+input AWSAccountWhere {
+  AND: [AWSAccountWhere!]
+  NOT: AWSAccountWhere
+  OR: [AWSAccountWhere!]
+  accountName: String
+  accountName_CONTAINS: String
+  accountName_ENDS_WITH: String
+  accountName_IN: [String]
+  accountName_STARTS_WITH: String
+  code: String
+  code_CONTAINS: String
+  code_ENDS_WITH: String
+  code_IN: [String]
+  code_STARTS_WITH: String
+}
+
+type AwsAccountsConnection {
+  edges: [AWSAccountEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+type DNSZone {
+  awsId: String
+  zoneType: String
+}
+
+type DNSZoneEdge {
+  cursor: String!
+  node: DNSZone!
+}
+
+input DNSZoneOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more DNSZoneSort objects to sort DnsZones by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [DNSZoneSort!]
+}
+
+"""
+Fields to sort DnsZones by. The order in which sorts are applied is not guaranteed when specifying many fields in one DNSZoneSort object.
+"""
+input DNSZoneSort {
+  awsId: SortDirection
+  zoneType: SortDirection
+}
+
+input DNSZoneWhere {
+  AND: [DNSZoneWhere!]
+  NOT: DNSZoneWhere
+  OR: [DNSZoneWhere!]
+  awsId: String
+  awsId_CONTAINS: String
+  awsId_ENDS_WITH: String
+  awsId_IN: [String]
+  awsId_STARTS_WITH: String
+  zoneType: String
+  zoneType_CONTAINS: String
+  zoneType_ENDS_WITH: String
+  zoneType_IN: [String]
+  zoneType_STARTS_WITH: String
+}
+
+type DnsZonesConnection {
+  edges: [DNSZoneEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+type Query {
+  awsAccounts(options: AWSAccountOptions, where: AWSAccountWhere): [AWSAccount!]!
+  awsAccountsConnection(after: String, first: Int, sort: [AWSAccountSort], where: AWSAccountWhere): AwsAccountsConnection!
+  dnsZones(options: DNSZoneOptions, where: DNSZoneWhere): [DNSZone!]!
+  dnsZonesConnection(after: String, first: Int, sort: [DNSZoneSort], where: DNSZoneWhere): DnsZonesConnection!
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
diff --git a/core/src/test/resources/tck-test-files/schema/v2/issues/1614.adoc b/core/src/test/resources/tck-test-files/schema/v2/issues/1614.adoc
index 1ad2c4ec..49cefd7c 100644
--- a/core/src/test/resources/tck-test-files/schema/v2/issues/1614.adoc
+++ b/core/src/test/resources/tck-test-files/schema/v2/issues/1614.adoc
@@ -28,7 +28,7 @@ type CrewMember {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -178,6 +178,3 @@ input MovieWhere {
 }
 
 ----
-
-'''
-
diff --git a/core/src/test/resources/tck-test-files/schema/v2/issues/1614.js.adoc b/core/src/test/resources/tck-test-files/schema/v2/issues/1614.js.adoc
new file mode 100644
index 00000000..b9a06a78
--- /dev/null
+++ b/core/src/test/resources/tck-test-files/schema/v2/issues/1614.js.adoc
@@ -0,0 +1,184 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= https://github.com/neo4j/graphql/issues/1614
+
+== should include enumFields on relationships
+
+.Schema
+[source,graphql,schema=true]
+----
+enum CrewPositionType {
+  BoomOperator
+  Gaffer
+  KeyGrip
+}
+
+type CrewPosition @relationshipProperties {
+  position: CrewPositionType
+}
+
+type Movie {
+  name: String!
+}
+
+type CrewMember {
+  movies: Movie! @relationship(type: "WORKED_ON", direction: OUT, properties: "CrewPosition")
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+type CrewMember {
+  movies(directed: Boolean = true, options: MovieOptions, where: MovieWhere): Movie!
+  moviesConnection(after: String, directed: Boolean = true, first: Int, sort: [CrewMemberMoviesConnectionSort!], where: CrewMemberMoviesConnectionWhere): CrewMemberMoviesConnection!
+}
+
+type CrewMemberEdge {
+  cursor: String!
+  node: CrewMember!
+}
+
+type CrewMemberMoviesConnection {
+  edges: [CrewMemberMoviesRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input CrewMemberMoviesConnectionSort {
+  edge: CrewPositionSort
+  node: MovieSort
+}
+
+input CrewMemberMoviesConnectionWhere {
+  AND: [CrewMemberMoviesConnectionWhere!]
+  NOT: CrewMemberMoviesConnectionWhere
+  OR: [CrewMemberMoviesConnectionWhere!]
+  edge: CrewPositionWhere
+  node: MovieWhere
+}
+
+type CrewMemberMoviesRelationship {
+  cursor: String!
+  node: Movie!
+  properties: CrewPosition!
+}
+
+input CrewMemberOptions {
+  limit: Int
+  offset: Int
+}
+
+input CrewMemberWhere {
+  AND: [CrewMemberWhere!]
+  NOT: CrewMemberWhere
+  OR: [CrewMemberWhere!]
+  movies: MovieWhere
+  moviesConnection: CrewMemberMoviesConnectionWhere
+  moviesConnection_NOT: CrewMemberMoviesConnectionWhere
+  movies_NOT: MovieWhere
+}
+
+type CrewMembersConnection {
+  edges: [CrewMemberEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""
+The edge properties for the following fields:
+* CrewMember.movies
+"""
+type CrewPosition {
+  position: CrewPositionType
+}
+
+input CrewPositionSort {
+  position: SortDirection
+}
+
+enum CrewPositionType {
+  BoomOperator
+  Gaffer
+  KeyGrip
+}
+
+input CrewPositionWhere {
+  AND: [CrewPositionWhere!]
+  NOT: CrewPositionWhere
+  OR: [CrewPositionWhere!]
+  position: CrewPositionType
+  position_IN: [CrewPositionType]
+}
+
+type Movie {
+  name: String!
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MovieSort!]
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
+"""
+input MovieSort {
+  name: SortDirection
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  name: String
+  name_CONTAINS: String
+  name_ENDS_WITH: String
+  name_IN: [String!]
+  name_STARTS_WITH: String
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+type Query {
+  crewMembers(options: CrewMemberOptions, where: CrewMemberWhere): [CrewMember!]!
+  crewMembersConnection(after: String, first: Int, where: CrewMemberWhere): CrewMembersConnection!
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
diff --git a/core/src/test/resources/tck-test-files/schema/v2/issues/162.adoc b/core/src/test/resources/tck-test-files/schema/v2/issues/162.adoc
index ca3666b1..3db789ac 100644
--- a/core/src/test/resources/tck-test-files/schema/v2/issues/162.adoc
+++ b/core/src/test/resources/tck-test-files/schema/v2/issues/162.adoc
@@ -24,7 +24,7 @@ type TigerJawLevel2Part1 {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -227,6 +227,3 @@ input TigerWhere {
 }
 
 ----
-
-'''
-
diff --git a/core/src/test/resources/tck-test-files/schema/v2/issues/162.js.adoc b/core/src/test/resources/tck-test-files/schema/v2/issues/162.js.adoc
new file mode 100644
index 00000000..457c31f8
--- /dev/null
+++ b/core/src/test/resources/tck-test-files/schema/v2/issues/162.js.adoc
@@ -0,0 +1,241 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= 162
+
+== 2 instances of DeleteInput type created
+
+.Schema
+[source,graphql,schema=true]
+----
+type Tiger {
+  x: Int
+}
+
+type TigerJawLevel2 {
+  id: ID
+  part1: TigerJawLevel2Part1! @relationship(type: "REL1", direction: OUT)
+}
+
+type TigerJawLevel2Part1 {
+  id: ID
+  tiger: Tiger! @relationship(type: "REL2", direction: OUT)
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+type Query {
+  tigerJawLevel2Part1s(options: TigerJawLevel2Part1Options, where: TigerJawLevel2Part1Where): [TigerJawLevel2Part1!]!
+  tigerJawLevel2Part1sConnection(after: String, first: Int, sort: [TigerJawLevel2Part1Sort], where: TigerJawLevel2Part1Where): TigerJawLevel2Part1sConnection!
+  tigerJawLevel2s(options: TigerJawLevel2Options, where: TigerJawLevel2Where): [TigerJawLevel2!]!
+  tigerJawLevel2sConnection(after: String, first: Int, sort: [TigerJawLevel2Sort], where: TigerJawLevel2Where): TigerJawLevel2sConnection!
+  tigers(options: TigerOptions, where: TigerWhere): [Tiger!]!
+  tigersConnection(after: String, first: Int, sort: [TigerSort], where: TigerWhere): TigersConnection!
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+
+type Tiger {
+  x: Int
+}
+
+type TigerEdge {
+  cursor: String!
+  node: Tiger!
+}
+
+type TigerJawLevel2 {
+  id: ID
+  part1(directed: Boolean = true, options: TigerJawLevel2Part1Options, where: TigerJawLevel2Part1Where): TigerJawLevel2Part1!
+  part1Connection(after: String, directed: Boolean = true, first: Int, sort: [TigerJawLevel2Part1ConnectionSort!], where: TigerJawLevel2Part1ConnectionWhere): TigerJawLevel2Part1Connection!
+}
+
+type TigerJawLevel2Edge {
+  cursor: String!
+  node: TigerJawLevel2!
+}
+
+input TigerJawLevel2Options {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more TigerJawLevel2Sort objects to sort TigerJawLevel2s by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [TigerJawLevel2Sort!]
+}
+
+type TigerJawLevel2Part1 {
+  id: ID
+  tiger(directed: Boolean = true, options: TigerOptions, where: TigerWhere): Tiger!
+  tigerConnection(after: String, directed: Boolean = true, first: Int, sort: [TigerJawLevel2Part1TigerConnectionSort!], where: TigerJawLevel2Part1TigerConnectionWhere): TigerJawLevel2Part1TigerConnection!
+}
+
+type TigerJawLevel2Part1Connection {
+  edges: [TigerJawLevel2Part1Relationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input TigerJawLevel2Part1ConnectionSort {
+  node: TigerJawLevel2Part1Sort
+}
+
+input TigerJawLevel2Part1ConnectionWhere {
+  AND: [TigerJawLevel2Part1ConnectionWhere!]
+  NOT: TigerJawLevel2Part1ConnectionWhere
+  OR: [TigerJawLevel2Part1ConnectionWhere!]
+  node: TigerJawLevel2Part1Where
+}
+
+type TigerJawLevel2Part1Edge {
+  cursor: String!
+  node: TigerJawLevel2Part1!
+}
+
+input TigerJawLevel2Part1Options {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more TigerJawLevel2Part1Sort objects to sort TigerJawLevel2Part1s by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [TigerJawLevel2Part1Sort!]
+}
+
+type TigerJawLevel2Part1Relationship {
+  cursor: String!
+  node: TigerJawLevel2Part1!
+}
+
+"""
+Fields to sort TigerJawLevel2Part1s by. The order in which sorts are applied is not guaranteed when specifying many fields in one TigerJawLevel2Part1Sort object.
+"""
+input TigerJawLevel2Part1Sort {
+  id: SortDirection
+}
+
+type TigerJawLevel2Part1TigerConnection {
+  edges: [TigerJawLevel2Part1TigerRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input TigerJawLevel2Part1TigerConnectionSort {
+  node: TigerSort
+}
+
+input TigerJawLevel2Part1TigerConnectionWhere {
+  AND: [TigerJawLevel2Part1TigerConnectionWhere!]
+  NOT: TigerJawLevel2Part1TigerConnectionWhere
+  OR: [TigerJawLevel2Part1TigerConnectionWhere!]
+  node: TigerWhere
+}
+
+type TigerJawLevel2Part1TigerRelationship {
+  cursor: String!
+  node: Tiger!
+}
+
+input TigerJawLevel2Part1Where {
+  AND: [TigerJawLevel2Part1Where!]
+  NOT: TigerJawLevel2Part1Where
+  OR: [TigerJawLevel2Part1Where!]
+  id: ID
+  id_CONTAINS: ID
+  id_ENDS_WITH: ID
+  id_IN: [ID]
+  id_STARTS_WITH: ID
+  tiger: TigerWhere
+  tigerConnection: TigerJawLevel2Part1TigerConnectionWhere
+  tigerConnection_NOT: TigerJawLevel2Part1TigerConnectionWhere
+  tiger_NOT: TigerWhere
+}
+
+type TigerJawLevel2Part1sConnection {
+  edges: [TigerJawLevel2Part1Edge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""
+Fields to sort TigerJawLevel2s by. The order in which sorts are applied is not guaranteed when specifying many fields in one TigerJawLevel2Sort object.
+"""
+input TigerJawLevel2Sort {
+  id: SortDirection
+}
+
+input TigerJawLevel2Where {
+  AND: [TigerJawLevel2Where!]
+  NOT: TigerJawLevel2Where
+  OR: [TigerJawLevel2Where!]
+  id: ID
+  id_CONTAINS: ID
+  id_ENDS_WITH: ID
+  id_IN: [ID]
+  id_STARTS_WITH: ID
+  part1: TigerJawLevel2Part1Where
+  part1Connection: TigerJawLevel2Part1ConnectionWhere
+  part1Connection_NOT: TigerJawLevel2Part1ConnectionWhere
+  part1_NOT: TigerJawLevel2Part1Where
+}
+
+type TigerJawLevel2sConnection {
+  edges: [TigerJawLevel2Edge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input TigerOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more TigerSort objects to sort Tigers by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [TigerSort!]
+}
+
+"""
+Fields to sort Tigers by. The order in which sorts are applied is not guaranteed when specifying many fields in one TigerSort object.
+"""
+input TigerSort {
+  x: SortDirection
+}
+
+input TigerWhere {
+  AND: [TigerWhere!]
+  NOT: TigerWhere
+  OR: [TigerWhere!]
+  x: Int
+  x_GT: Int
+  x_GTE: Int
+  x_IN: [Int]
+  x_LT: Int
+  x_LTE: Int
+}
+
+type TigersConnection {
+  edges: [TigerEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+----
diff --git a/core/src/test/resources/tck-test-files/schema/v2/issues/2187.adoc b/core/src/test/resources/tck-test-files/schema/v2/issues/2187.adoc
index ffea1ff6..d9111ab5 100644
--- a/core/src/test/resources/tck-test-files/schema/v2/issues/2187.adoc
+++ b/core/src/test/resources/tck-test-files/schema/v2/issues/2187.adoc
@@ -22,7 +22,7 @@ type Genre {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -224,6 +224,3 @@ input MovieWhere {
 }
 
 ----
-
-'''
-
diff --git a/core/src/test/resources/tck-test-files/schema/v2/issues/2187.js.adoc b/core/src/test/resources/tck-test-files/schema/v2/issues/2187.js.adoc
new file mode 100644
index 00000000..30e6b2f7
--- /dev/null
+++ b/core/src/test/resources/tck-test-files/schema/v2/issues/2187.js.adoc
@@ -0,0 +1,250 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= https://github.com/neo4j/graphql/issues/2187
+
+== Deprecated directive should be present on genres in generated schema
+
+.Schema
+[source,graphql,schema=true]
+----
+type Movie {
+  title: String @deprecated(reason: "Do not use title")
+  year: Int
+  imdbRating: Float
+  genres: [Genre!]! @relationship(type: "IN_GENRE", direction: OUT) @deprecated(reason: "Do not use genre")
+}
+
+type Genre {
+  name: String
+  movies: [Movie!]! @relationship(type: "IN_GENRE", direction: IN)
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+type Genre {
+  movies(directed: Boolean = true, options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, directed: Boolean = true, first: Int, sort: [GenreMoviesConnectionSort!], where: GenreMoviesConnectionWhere): GenreMoviesConnection!
+  name: String
+}
+
+type GenreEdge {
+  cursor: String!
+  node: Genre!
+}
+
+type GenreMoviesConnection {
+  edges: [GenreMoviesRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input GenreMoviesConnectionSort {
+  node: MovieSort
+}
+
+input GenreMoviesConnectionWhere {
+  AND: [GenreMoviesConnectionWhere!]
+  NOT: GenreMoviesConnectionWhere
+  OR: [GenreMoviesConnectionWhere!]
+  node: MovieWhere
+}
+
+type GenreMoviesRelationship {
+  cursor: String!
+  node: Movie!
+}
+
+input GenreOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more GenreSort objects to sort Genres by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [GenreSort!]
+}
+
+"""
+Fields to sort Genres by. The order in which sorts are applied is not guaranteed when specifying many fields in one GenreSort object.
+"""
+input GenreSort {
+  name: SortDirection
+}
+
+input GenreWhere {
+  AND: [GenreWhere!]
+  NOT: GenreWhere
+  OR: [GenreWhere!]
+  """
+  Return Genres where all of the related GenreMoviesConnections match this filter
+  """
+  moviesConnection_ALL: GenreMoviesConnectionWhere
+  """
+  Return Genres where none of the related GenreMoviesConnections match this filter
+  """
+  moviesConnection_NONE: GenreMoviesConnectionWhere
+  """
+  Return Genres where one of the related GenreMoviesConnections match this filter
+  """
+  moviesConnection_SINGLE: GenreMoviesConnectionWhere
+  """
+  Return Genres where some of the related GenreMoviesConnections match this filter
+  """
+  moviesConnection_SOME: GenreMoviesConnectionWhere
+  """Return Genres where all of the related Movies match this filter"""
+  movies_ALL: MovieWhere
+  """Return Genres where none of the related Movies match this filter"""
+  movies_NONE: MovieWhere
+  """Return Genres where one of the related Movies match this filter"""
+  movies_SINGLE: MovieWhere
+  """Return Genres where some of the related Movies match this filter"""
+  movies_SOME: MovieWhere
+  name: String
+  name_CONTAINS: String
+  name_ENDS_WITH: String
+  name_IN: [String]
+  name_STARTS_WITH: String
+}
+
+type GenresConnection {
+  edges: [GenreEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+type Movie {
+  genres(directed: Boolean = true, options: GenreOptions, where: GenreWhere): [Genre!]! @deprecated(reason: "Do not use genre")
+  genresConnection(after: String, directed: Boolean = true, first: Int, sort: [MovieGenresConnectionSort!], where: MovieGenresConnectionWhere): MovieGenresConnection! @deprecated(reason: "Do not use genre")
+  imdbRating: Float
+  title: String @deprecated(reason: "Do not use title")
+  year: Int
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+type MovieGenresConnection {
+  edges: [MovieGenresRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input MovieGenresConnectionSort {
+  node: GenreSort
+}
+
+input MovieGenresConnectionWhere {
+  AND: [MovieGenresConnectionWhere!]
+  NOT: MovieGenresConnectionWhere
+  OR: [MovieGenresConnectionWhere!]
+  node: GenreWhere
+}
+
+type MovieGenresRelationship {
+  cursor: String!
+  node: Genre!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MovieSort!]
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
+"""
+input MovieSort {
+  imdbRating: SortDirection
+  title: SortDirection @deprecated(reason: "Do not use title")
+  year: SortDirection
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  """
+  Return Movies where all of the related MovieGenresConnections match this filter
+  """
+  genresConnection_ALL: MovieGenresConnectionWhere @deprecated(reason: "Do not use genre")
+  """
+  Return Movies where none of the related MovieGenresConnections match this filter
+  """
+  genresConnection_NONE: MovieGenresConnectionWhere @deprecated(reason: "Do not use genre")
+  """
+  Return Movies where one of the related MovieGenresConnections match this filter
+  """
+  genresConnection_SINGLE: MovieGenresConnectionWhere @deprecated(reason: "Do not use genre")
+  """
+  Return Movies where some of the related MovieGenresConnections match this filter
+  """
+  genresConnection_SOME: MovieGenresConnectionWhere @deprecated(reason: "Do not use genre")
+  """Return Movies where all of the related Genres match this filter"""
+  genres_ALL: GenreWhere @deprecated(reason: "Do not use genre")
+  """Return Movies where none of the related Genres match this filter"""
+  genres_NONE: GenreWhere @deprecated(reason: "Do not use genre")
+  """Return Movies where one of the related Genres match this filter"""
+  genres_SINGLE: GenreWhere @deprecated(reason: "Do not use genre")
+  """Return Movies where some of the related Genres match this filter"""
+  genres_SOME: GenreWhere @deprecated(reason: "Do not use genre")
+  imdbRating: Float
+  imdbRating_GT: Float
+  imdbRating_GTE: Float
+  imdbRating_IN: [Float]
+  imdbRating_LT: Float
+  imdbRating_LTE: Float
+  title: String @deprecated(reason: "Do not use title")
+  title_CONTAINS: String @deprecated(reason: "Do not use title")
+  title_ENDS_WITH: String @deprecated(reason: "Do not use title")
+  title_IN: [String] @deprecated(reason: "Do not use title")
+  title_STARTS_WITH: String @deprecated(reason: "Do not use title")
+  year: Int
+  year_GT: Int
+  year_GTE: Int
+  year_IN: [Int]
+  year_LT: Int
+  year_LTE: Int
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+type Query {
+  genres(options: GenreOptions, where: GenreWhere): [Genre!]!
+  genresConnection(after: String, first: Int, sort: [GenreSort], where: GenreWhere): GenresConnection!
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
diff --git a/core/src/test/resources/tck-test-files/schema/v2/issues/2969.adoc b/core/src/test/resources/tck-test-files/schema/v2/issues/2969.adoc
index 0977461e..7b0523dd 100644
--- a/core/src/test/resources/tck-test-files/schema/v2/issues/2969.adoc
+++ b/core/src/test/resources/tck-test-files/schema/v2/issues/2969.adoc
@@ -21,7 +21,7 @@ type User {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -202,6 +202,3 @@ input UserWhere {
 }
 
 ----
-
-'''
-
diff --git a/core/src/test/resources/tck-test-files/schema/v2/issues/2969.js.adoc b/core/src/test/resources/tck-test-files/schema/v2/issues/2969.js.adoc
new file mode 100644
index 00000000..080843da
--- /dev/null
+++ b/core/src/test/resources/tck-test-files/schema/v2/issues/2969.js.adoc
@@ -0,0 +1,220 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= https://github.com/neo4j/graphql/issues/2969
+
+== authorAggregate should not be generated
+
+.Schema
+[source,graphql,schema=true]
+----
+type Post {
+  content: String!
+  author: User! @relationship(type: "HAS_AUTHOR", direction: OUT)
+}
+
+type User {
+  id: ID!
+  name: String!
+  posts: [Post!]! @relationship(type: "HAS_AUTHOR", direction: IN)
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+type Post {
+  author(directed: Boolean = true, options: UserOptions, where: UserWhere): User!
+  authorConnection(after: String, directed: Boolean = true, first: Int, sort: [PostAuthorConnectionSort!], where: PostAuthorConnectionWhere): PostAuthorConnection!
+  content: String!
+}
+
+type PostAuthorConnection {
+  edges: [PostAuthorRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input PostAuthorConnectionSort {
+  node: UserSort
+}
+
+input PostAuthorConnectionWhere {
+  AND: [PostAuthorConnectionWhere!]
+  NOT: PostAuthorConnectionWhere
+  OR: [PostAuthorConnectionWhere!]
+  node: UserWhere
+}
+
+type PostAuthorRelationship {
+  cursor: String!
+  node: User!
+}
+
+type PostEdge {
+  cursor: String!
+  node: Post!
+}
+
+input PostOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more PostSort objects to sort Posts by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [PostSort!]
+}
+
+"""
+Fields to sort Posts by. The order in which sorts are applied is not guaranteed when specifying many fields in one PostSort object.
+"""
+input PostSort {
+  content: SortDirection
+}
+
+input PostWhere {
+  AND: [PostWhere!]
+  NOT: PostWhere
+  OR: [PostWhere!]
+  author: UserWhere
+  authorConnection: PostAuthorConnectionWhere
+  authorConnection_NOT: PostAuthorConnectionWhere
+  author_NOT: UserWhere
+  content: String
+  content_CONTAINS: String
+  content_ENDS_WITH: String
+  content_IN: [String!]
+  content_STARTS_WITH: String
+}
+
+type PostsConnection {
+  edges: [PostEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+type Query {
+  posts(options: PostOptions, where: PostWhere): [Post!]!
+  postsConnection(after: String, first: Int, sort: [PostSort], where: PostWhere): PostsConnection!
+  users(options: UserOptions, where: UserWhere): [User!]!
+  usersConnection(after: String, first: Int, sort: [UserSort], where: UserWhere): UsersConnection!
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+
+type User {
+  id: ID!
+  name: String!
+  posts(directed: Boolean = true, options: PostOptions, where: PostWhere): [Post!]!
+  postsConnection(after: String, directed: Boolean = true, first: Int, sort: [UserPostsConnectionSort!], where: UserPostsConnectionWhere): UserPostsConnection!
+}
+
+type UserEdge {
+  cursor: String!
+  node: User!
+}
+
+input UserOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more UserSort objects to sort Users by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [UserSort!]
+}
+
+type UserPostsConnection {
+  edges: [UserPostsRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input UserPostsConnectionSort {
+  node: PostSort
+}
+
+input UserPostsConnectionWhere {
+  AND: [UserPostsConnectionWhere!]
+  NOT: UserPostsConnectionWhere
+  OR: [UserPostsConnectionWhere!]
+  node: PostWhere
+}
+
+type UserPostsRelationship {
+  cursor: String!
+  node: Post!
+}
+
+"""
+Fields to sort Users by. The order in which sorts are applied is not guaranteed when specifying many fields in one UserSort object.
+"""
+input UserSort {
+  id: SortDirection
+  name: SortDirection
+}
+
+input UserWhere {
+  AND: [UserWhere!]
+  NOT: UserWhere
+  OR: [UserWhere!]
+  id: ID
+  id_CONTAINS: ID
+  id_ENDS_WITH: ID
+  id_IN: [ID!]
+  id_STARTS_WITH: ID
+  name: String
+  name_CONTAINS: String
+  name_ENDS_WITH: String
+  name_IN: [String!]
+  name_STARTS_WITH: String
+  """
+  Return Users where all of the related UserPostsConnections match this filter
+  """
+  postsConnection_ALL: UserPostsConnectionWhere
+  """
+  Return Users where none of the related UserPostsConnections match this filter
+  """
+  postsConnection_NONE: UserPostsConnectionWhere
+  """
+  Return Users where one of the related UserPostsConnections match this filter
+  """
+  postsConnection_SINGLE: UserPostsConnectionWhere
+  """
+  Return Users where some of the related UserPostsConnections match this filter
+  """
+  postsConnection_SOME: UserPostsConnectionWhere
+  """Return Users where all of the related Posts match this filter"""
+  posts_ALL: PostWhere
+  """Return Users where none of the related Posts match this filter"""
+  posts_NONE: PostWhere
+  """Return Users where one of the related Posts match this filter"""
+  posts_SINGLE: PostWhere
+  """Return Users where some of the related Posts match this filter"""
+  posts_SOME: PostWhere
+}
+
+type UsersConnection {
+  edges: [UserEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+----
diff --git a/core/src/test/resources/tck-test-files/schema/v2/issues/2981.adoc b/core/src/test/resources/tck-test-files/schema/v2/issues/2981.adoc
index 470168be..18ac65dc 100644
--- a/core/src/test/resources/tck-test-files/schema/v2/issues/2981.adoc
+++ b/core/src/test/resources/tck-test-files/schema/v2/issues/2981.adoc
@@ -28,7 +28,7 @@ type BookTitle_EN {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -287,6 +287,3 @@ input QueryOptions {
 }
 
 ----
-
-'''
-
diff --git a/core/src/test/resources/tck-test-files/schema/v2/issues/2981.js.adoc b/core/src/test/resources/tck-test-files/schema/v2/issues/2981.js.adoc
new file mode 100644
index 00000000..e3717564
--- /dev/null
+++ b/core/src/test/resources/tck-test-files/schema/v2/issues/2981.js.adoc
@@ -0,0 +1,301 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= https://github.com/neo4j/graphql/issues/2981
+
+== BookTranslatedTitleCreateFieldInput fields should not be of type List
+
+.Schema
+[source,graphql,schema=true]
+----
+type Book {
+  originalTitle: String!
+  translatedTitle: BookTitle @relationship(type: "TRANSLATED_BOOK_TITLE", direction: IN)
+  isbn: String!
+}
+
+union BookTitle = BookTitle_SV | BookTitle_EN
+
+type BookTitle_SV {
+  book: Book! @relationship(type: "TRANSLATED_BOOK_TITLE", direction: OUT)
+  value: String!
+}
+
+type BookTitle_EN {
+  book: Book! @relationship(type: "TRANSLATED_BOOK_TITLE", direction: OUT)
+  value: String!
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+type Book {
+  isbn: String!
+  originalTitle: String!
+  translatedTitle(directed: Boolean = true, options: QueryOptions, where: BookTitleWhere): BookTitle
+  translatedTitleConnection(after: String, directed: Boolean = true, first: Int, where: BookTranslatedTitleConnectionWhere): BookTranslatedTitleConnection!
+}
+
+type BookEdge {
+  cursor: String!
+  node: Book!
+}
+
+input BookOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more BookSort objects to sort Books by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [BookSort!]
+}
+
+"""
+Fields to sort Books by. The order in which sorts are applied is not guaranteed when specifying many fields in one BookSort object.
+"""
+input BookSort {
+  isbn: SortDirection
+  originalTitle: SortDirection
+}
+
+union BookTitle = BookTitle_EN | BookTitle_SV
+
+type BookTitleEnsConnection {
+  edges: [BookTitle_ENEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+type BookTitleSvsConnection {
+  edges: [BookTitle_SVEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input BookTitleWhere {
+  BookTitle_EN: BookTitle_ENWhere
+  BookTitle_SV: BookTitle_SVWhere
+}
+
+type BookTitle_EN {
+  book(directed: Boolean = true, options: BookOptions, where: BookWhere): Book!
+  bookConnection(after: String, directed: Boolean = true, first: Int, sort: [BookTitle_ENBookConnectionSort!], where: BookTitle_ENBookConnectionWhere): BookTitle_ENBookConnection!
+  value: String!
+}
+
+type BookTitle_ENBookConnection {
+  edges: [BookTitle_ENBookRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input BookTitle_ENBookConnectionSort {
+  node: BookSort
+}
+
+input BookTitle_ENBookConnectionWhere {
+  AND: [BookTitle_ENBookConnectionWhere!]
+  NOT: BookTitle_ENBookConnectionWhere
+  OR: [BookTitle_ENBookConnectionWhere!]
+  node: BookWhere
+}
+
+type BookTitle_ENBookRelationship {
+  cursor: String!
+  node: Book!
+}
+
+type BookTitle_ENEdge {
+  cursor: String!
+  node: BookTitle_EN!
+}
+
+input BookTitle_ENOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more BookTitle_ENSort objects to sort BookTitleEns by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [BookTitle_ENSort!]
+}
+
+"""
+Fields to sort BookTitleEns by. The order in which sorts are applied is not guaranteed when specifying many fields in one BookTitle_ENSort object.
+"""
+input BookTitle_ENSort {
+  value: SortDirection
+}
+
+input BookTitle_ENWhere {
+  AND: [BookTitle_ENWhere!]
+  NOT: BookTitle_ENWhere
+  OR: [BookTitle_ENWhere!]
+  book: BookWhere
+  bookConnection: BookTitle_ENBookConnectionWhere
+  bookConnection_NOT: BookTitle_ENBookConnectionWhere
+  book_NOT: BookWhere
+  value: String
+  value_CONTAINS: String
+  value_ENDS_WITH: String
+  value_IN: [String!]
+  value_STARTS_WITH: String
+}
+
+type BookTitle_SV {
+  book(directed: Boolean = true, options: BookOptions, where: BookWhere): Book!
+  bookConnection(after: String, directed: Boolean = true, first: Int, sort: [BookTitle_SVBookConnectionSort!], where: BookTitle_SVBookConnectionWhere): BookTitle_SVBookConnection!
+  value: String!
+}
+
+type BookTitle_SVBookConnection {
+  edges: [BookTitle_SVBookRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input BookTitle_SVBookConnectionSort {
+  node: BookSort
+}
+
+input BookTitle_SVBookConnectionWhere {
+  AND: [BookTitle_SVBookConnectionWhere!]
+  NOT: BookTitle_SVBookConnectionWhere
+  OR: [BookTitle_SVBookConnectionWhere!]
+  node: BookWhere
+}
+
+type BookTitle_SVBookRelationship {
+  cursor: String!
+  node: Book!
+}
+
+type BookTitle_SVEdge {
+  cursor: String!
+  node: BookTitle_SV!
+}
+
+input BookTitle_SVOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more BookTitle_SVSort objects to sort BookTitleSvs by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [BookTitle_SVSort!]
+}
+
+"""
+Fields to sort BookTitleSvs by. The order in which sorts are applied is not guaranteed when specifying many fields in one BookTitle_SVSort object.
+"""
+input BookTitle_SVSort {
+  value: SortDirection
+}
+
+input BookTitle_SVWhere {
+  AND: [BookTitle_SVWhere!]
+  NOT: BookTitle_SVWhere
+  OR: [BookTitle_SVWhere!]
+  book: BookWhere
+  bookConnection: BookTitle_SVBookConnectionWhere
+  bookConnection_NOT: BookTitle_SVBookConnectionWhere
+  book_NOT: BookWhere
+  value: String
+  value_CONTAINS: String
+  value_ENDS_WITH: String
+  value_IN: [String!]
+  value_STARTS_WITH: String
+}
+
+input BookTranslatedTitleBookTitle_ENConnectionWhere {
+  AND: [BookTranslatedTitleBookTitle_ENConnectionWhere!]
+  NOT: BookTranslatedTitleBookTitle_ENConnectionWhere
+  OR: [BookTranslatedTitleBookTitle_ENConnectionWhere!]
+  node: BookTitle_ENWhere
+}
+
+input BookTranslatedTitleBookTitle_SVConnectionWhere {
+  AND: [BookTranslatedTitleBookTitle_SVConnectionWhere!]
+  NOT: BookTranslatedTitleBookTitle_SVConnectionWhere
+  OR: [BookTranslatedTitleBookTitle_SVConnectionWhere!]
+  node: BookTitle_SVWhere
+}
+
+type BookTranslatedTitleConnection {
+  edges: [BookTranslatedTitleRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input BookTranslatedTitleConnectionWhere {
+  BookTitle_EN: BookTranslatedTitleBookTitle_ENConnectionWhere
+  BookTitle_SV: BookTranslatedTitleBookTitle_SVConnectionWhere
+}
+
+type BookTranslatedTitleRelationship {
+  cursor: String!
+  node: BookTitle!
+}
+
+input BookWhere {
+  AND: [BookWhere!]
+  NOT: BookWhere
+  OR: [BookWhere!]
+  isbn: String
+  isbn_CONTAINS: String
+  isbn_ENDS_WITH: String
+  isbn_IN: [String!]
+  isbn_STARTS_WITH: String
+  originalTitle: String
+  originalTitle_CONTAINS: String
+  originalTitle_ENDS_WITH: String
+  originalTitle_IN: [String!]
+  originalTitle_STARTS_WITH: String
+  translatedTitle: BookTitleWhere
+  translatedTitleConnection: BookTranslatedTitleConnectionWhere
+  translatedTitleConnection_NOT: BookTranslatedTitleConnectionWhere
+  translatedTitle_NOT: BookTitleWhere
+}
+
+type BooksConnection {
+  edges: [BookEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+type Query {
+  bookTitleEns(options: BookTitle_ENOptions, where: BookTitle_ENWhere): [BookTitle_EN!]!
+  bookTitleEnsConnection(after: String, first: Int, sort: [BookTitle_ENSort], where: BookTitle_ENWhere): BookTitleEnsConnection!
+  bookTitleSvs(options: BookTitle_SVOptions, where: BookTitle_SVWhere): [BookTitle_SV!]!
+  bookTitleSvsConnection(after: String, first: Int, sort: [BookTitle_SVSort], where: BookTitle_SVWhere): BookTitleSvsConnection!
+  bookTitles(options: QueryOptions, where: BookTitleWhere): [BookTitle!]!
+  books(options: BookOptions, where: BookWhere): [Book!]!
+  booksConnection(after: String, first: Int, sort: [BookSort], where: BookWhere): BooksConnection!
+}
+
+"""Input type for options that can be specified on a query operation."""
+input QueryOptions {
+  limit: Int
+  offset: Int
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
diff --git a/core/src/test/resources/tck-test-files/schema/v2/issues/3816.adoc b/core/src/test/resources/tck-test-files/schema/v2/issues/3816.adoc
index 6c6ccb04..9a3dd282 100644
--- a/core/src/test/resources/tck-test-files/schema/v2/issues/3816.adoc
+++ b/core/src/test/resources/tck-test-files/schema/v2/issues/3816.adoc
@@ -20,7 +20,7 @@ type Genre {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -195,8 +195,6 @@ input MovieWhere {
 
 ----
 
-'''
-
 == No nested operations in one type
 
 .Schema
@@ -214,7 +212,7 @@ type Genre {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -388,6 +386,3 @@ input MovieWhere {
 }
 
 ----
-
-'''
-
diff --git a/core/src/test/resources/tck-test-files/schema/v2/issues/3816.js.adoc b/core/src/test/resources/tck-test-files/schema/v2/issues/3816.js.adoc
new file mode 100644
index 00000000..3ae457f8
--- /dev/null
+++ b/core/src/test/resources/tck-test-files/schema/v2/issues/3816.js.adoc
@@ -0,0 +1,419 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= https://github.com/neo4j/graphql/issues/3816
+
+== Combination of nested operations in reported issue
+
+.Schema
+[source,graphql,schema=true]
+----
+type Movie {
+  name: String!
+  genre: Genre! @relationship(type: "HAS_GENRE", direction: OUT, nestedOperations: [CONNECT, DISCONNECT])
+}
+
+type Genre {
+  name: String!
+  movies: [Movie!]! @relationship(type: "HAS_GENRE", direction: IN)
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+type Genre {
+  movies(directed: Boolean = true, options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, directed: Boolean = true, first: Int, sort: [GenreMoviesConnectionSort!], where: GenreMoviesConnectionWhere): GenreMoviesConnection!
+  name: String!
+}
+
+type GenreEdge {
+  cursor: String!
+  node: Genre!
+}
+
+type GenreMoviesConnection {
+  edges: [GenreMoviesRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input GenreMoviesConnectionSort {
+  node: MovieSort
+}
+
+input GenreMoviesConnectionWhere {
+  AND: [GenreMoviesConnectionWhere!]
+  NOT: GenreMoviesConnectionWhere
+  OR: [GenreMoviesConnectionWhere!]
+  node: MovieWhere
+}
+
+type GenreMoviesRelationship {
+  cursor: String!
+  node: Movie!
+}
+
+input GenreOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more GenreSort objects to sort Genres by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [GenreSort!]
+}
+
+"""
+Fields to sort Genres by. The order in which sorts are applied is not guaranteed when specifying many fields in one GenreSort object.
+"""
+input GenreSort {
+  name: SortDirection
+}
+
+input GenreWhere {
+  AND: [GenreWhere!]
+  NOT: GenreWhere
+  OR: [GenreWhere!]
+  """
+  Return Genres where all of the related GenreMoviesConnections match this filter
+  """
+  moviesConnection_ALL: GenreMoviesConnectionWhere
+  """
+  Return Genres where none of the related GenreMoviesConnections match this filter
+  """
+  moviesConnection_NONE: GenreMoviesConnectionWhere
+  """
+  Return Genres where one of the related GenreMoviesConnections match this filter
+  """
+  moviesConnection_SINGLE: GenreMoviesConnectionWhere
+  """
+  Return Genres where some of the related GenreMoviesConnections match this filter
+  """
+  moviesConnection_SOME: GenreMoviesConnectionWhere
+  """Return Genres where all of the related Movies match this filter"""
+  movies_ALL: MovieWhere
+  """Return Genres where none of the related Movies match this filter"""
+  movies_NONE: MovieWhere
+  """Return Genres where one of the related Movies match this filter"""
+  movies_SINGLE: MovieWhere
+  """Return Genres where some of the related Movies match this filter"""
+  movies_SOME: MovieWhere
+  name: String
+  name_CONTAINS: String
+  name_ENDS_WITH: String
+  name_IN: [String!]
+  name_STARTS_WITH: String
+}
+
+type GenresConnection {
+  edges: [GenreEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+type Movie {
+  genre(directed: Boolean = true, options: GenreOptions, where: GenreWhere): Genre!
+  genreConnection(after: String, directed: Boolean = true, first: Int, sort: [MovieGenreConnectionSort!], where: MovieGenreConnectionWhere): MovieGenreConnection!
+  name: String!
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+type MovieGenreConnection {
+  edges: [MovieGenreRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input MovieGenreConnectionSort {
+  node: GenreSort
+}
+
+input MovieGenreConnectionWhere {
+  AND: [MovieGenreConnectionWhere!]
+  NOT: MovieGenreConnectionWhere
+  OR: [MovieGenreConnectionWhere!]
+  node: GenreWhere
+}
+
+type MovieGenreRelationship {
+  cursor: String!
+  node: Genre!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MovieSort!]
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
+"""
+input MovieSort {
+  name: SortDirection
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  genre: GenreWhere
+  genreConnection: MovieGenreConnectionWhere
+  genreConnection_NOT: MovieGenreConnectionWhere
+  genre_NOT: GenreWhere
+  name: String
+  name_CONTAINS: String
+  name_ENDS_WITH: String
+  name_IN: [String!]
+  name_STARTS_WITH: String
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+type Query {
+  genres(options: GenreOptions, where: GenreWhere): [Genre!]!
+  genresConnection(after: String, first: Int, sort: [GenreSort], where: GenreWhere): GenresConnection!
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
+
+== No nested operations in one type
+
+.Schema
+[source,graphql,schema=true]
+----
+type Movie {
+  name: String!
+  genre: Genre! @relationship(type: "HAS_GENRE", direction: OUT, nestedOperations: [])
+}
+
+type Genre {
+  name: String!
+  movies: [Movie!]! @relationship(type: "HAS_GENRE", direction: IN)
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+type Genre {
+  movies(directed: Boolean = true, options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, directed: Boolean = true, first: Int, sort: [GenreMoviesConnectionSort!], where: GenreMoviesConnectionWhere): GenreMoviesConnection!
+  name: String!
+}
+
+type GenreEdge {
+  cursor: String!
+  node: Genre!
+}
+
+type GenreMoviesConnection {
+  edges: [GenreMoviesRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input GenreMoviesConnectionSort {
+  node: MovieSort
+}
+
+input GenreMoviesConnectionWhere {
+  AND: [GenreMoviesConnectionWhere!]
+  NOT: GenreMoviesConnectionWhere
+  OR: [GenreMoviesConnectionWhere!]
+  node: MovieWhere
+}
+
+type GenreMoviesRelationship {
+  cursor: String!
+  node: Movie!
+}
+
+input GenreOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more GenreSort objects to sort Genres by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [GenreSort!]
+}
+
+"""
+Fields to sort Genres by. The order in which sorts are applied is not guaranteed when specifying many fields in one GenreSort object.
+"""
+input GenreSort {
+  name: SortDirection
+}
+
+input GenreWhere {
+  AND: [GenreWhere!]
+  NOT: GenreWhere
+  OR: [GenreWhere!]
+  """
+  Return Genres where all of the related GenreMoviesConnections match this filter
+  """
+  moviesConnection_ALL: GenreMoviesConnectionWhere
+  """
+  Return Genres where none of the related GenreMoviesConnections match this filter
+  """
+  moviesConnection_NONE: GenreMoviesConnectionWhere
+  """
+  Return Genres where one of the related GenreMoviesConnections match this filter
+  """
+  moviesConnection_SINGLE: GenreMoviesConnectionWhere
+  """
+  Return Genres where some of the related GenreMoviesConnections match this filter
+  """
+  moviesConnection_SOME: GenreMoviesConnectionWhere
+  """Return Genres where all of the related Movies match this filter"""
+  movies_ALL: MovieWhere
+  """Return Genres where none of the related Movies match this filter"""
+  movies_NONE: MovieWhere
+  """Return Genres where one of the related Movies match this filter"""
+  movies_SINGLE: MovieWhere
+  """Return Genres where some of the related Movies match this filter"""
+  movies_SOME: MovieWhere
+  name: String
+  name_CONTAINS: String
+  name_ENDS_WITH: String
+  name_IN: [String!]
+  name_STARTS_WITH: String
+}
+
+type GenresConnection {
+  edges: [GenreEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+type Movie {
+  genre(directed: Boolean = true, options: GenreOptions, where: GenreWhere): Genre!
+  genreConnection(after: String, directed: Boolean = true, first: Int, sort: [MovieGenreConnectionSort!], where: MovieGenreConnectionWhere): MovieGenreConnection!
+  name: String!
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+type MovieGenreConnection {
+  edges: [MovieGenreRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input MovieGenreConnectionSort {
+  node: GenreSort
+}
+
+input MovieGenreConnectionWhere {
+  AND: [MovieGenreConnectionWhere!]
+  NOT: MovieGenreConnectionWhere
+  OR: [MovieGenreConnectionWhere!]
+  node: GenreWhere
+}
+
+type MovieGenreRelationship {
+  cursor: String!
+  node: Genre!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MovieSort!]
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
+"""
+input MovieSort {
+  name: SortDirection
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  genre: GenreWhere
+  genreConnection: MovieGenreConnectionWhere
+  genreConnection_NOT: MovieGenreConnectionWhere
+  genre_NOT: GenreWhere
+  name: String
+  name_CONTAINS: String
+  name_ENDS_WITH: String
+  name_IN: [String!]
+  name_STARTS_WITH: String
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+type Query {
+  genres(options: GenreOptions, where: GenreWhere): [Genre!]!
+  genresConnection(after: String, first: Int, sort: [GenreSort], where: GenreWhere): GenresConnection!
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
diff --git a/core/src/test/resources/tck-test-files/schema/v2/issues/5428.adoc b/core/src/test/resources/tck-test-files/schema/v2/issues/5428.adoc
index fb512852..3bee1d9d 100644
--- a/core/src/test/resources/tck-test-files/schema/v2/issues/5428.adoc
+++ b/core/src/test/resources/tck-test-files/schema/v2/issues/5428.adoc
@@ -14,7 +14,7 @@ type Test @plural(value: "Test") {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -80,6 +80,3 @@ input TestWhere {
 }
 
 ----
-
-'''
-
diff --git a/core/src/test/resources/tck-test-files/schema/v2/issues/5428.js.adoc b/core/src/test/resources/tck-test-files/schema/v2/issues/5428.js.adoc
new file mode 100644
index 00000000..251ecd34
--- /dev/null
+++ b/core/src/test/resources/tck-test-files/schema/v2/issues/5428.js.adoc
@@ -0,0 +1,86 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= https://github.com/neo4j/graphql/issues/5428
+
+== Non plural value in should not be pluralized
+
+.Schema
+[source,graphql,schema=true]
+----
+type Test @plural(value: "Test") {
+  Name: String
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+type Query {
+  test(options: TestOptions, where: TestWhere): [Test!]!
+  testConnection(after: String, first: Int, sort: [TestSort], where: TestWhere): TestConnection!
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+
+type Test {
+  Name: String
+}
+
+type TestConnection {
+  edges: [TestEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+type TestEdge {
+  cursor: String!
+  node: Test!
+}
+
+input TestOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more TestSort objects to sort Test by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [TestSort!]
+}
+
+"""
+Fields to sort Test by. The order in which sorts are applied is not guaranteed when specifying many fields in one TestSort object.
+"""
+input TestSort {
+  Name: SortDirection
+}
+
+input TestWhere {
+  AND: [TestWhere!]
+  NOT: TestWhere
+  Name: String
+  Name_CONTAINS: String
+  Name_ENDS_WITH: String
+  Name_IN: [String]
+  Name_STARTS_WITH: String
+  OR: [TestWhere!]
+}
+----
diff --git a/core/src/test/resources/tck-test-files/schema/v2/issues/609.adoc b/core/src/test/resources/tck-test-files/schema/v2/issues/609.adoc
index 589d2a2f..d9496f29 100644
--- a/core/src/test/resources/tck-test-files/schema/v2/issues/609.adoc
+++ b/core/src/test/resources/tck-test-files/schema/v2/issues/609.adoc
@@ -14,7 +14,7 @@ type Deprecated {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -80,6 +80,3 @@ input DeprecatedWhere {
 }
 
 ----
-
-'''
-
diff --git a/core/src/test/resources/tck-test-files/schema/v2/issues/609.js.adoc b/core/src/test/resources/tck-test-files/schema/v2/issues/609.js.adoc
new file mode 100644
index 00000000..24f0e38a
--- /dev/null
+++ b/core/src/test/resources/tck-test-files/schema/v2/issues/609.js.adoc
@@ -0,0 +1,86 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= 609
+
+== @deprecated directive should remain in output
+
+.Schema
+[source,graphql,schema=true]
+----
+type Deprecated {
+  deprecatedField: String @deprecated
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+type Deprecated {
+  deprecatedField: String @deprecated
+}
+
+type DeprecatedEdge {
+  cursor: String!
+  node: Deprecated!
+}
+
+input DeprecatedOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more DeprecatedSort objects to sort Deprecateds by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [DeprecatedSort!]
+}
+
+"""
+Fields to sort Deprecateds by. The order in which sorts are applied is not guaranteed when specifying many fields in one DeprecatedSort object.
+"""
+input DeprecatedSort {
+  deprecatedField: SortDirection @deprecated
+}
+
+input DeprecatedWhere {
+  AND: [DeprecatedWhere!]
+  NOT: DeprecatedWhere
+  OR: [DeprecatedWhere!]
+  deprecatedField: String @deprecated
+  deprecatedField_CONTAINS: String @deprecated
+  deprecatedField_ENDS_WITH: String @deprecated
+  deprecatedField_IN: [String] @deprecated
+  deprecatedField_STARTS_WITH: String @deprecated
+}
+
+type DeprecatedsConnection {
+  edges: [DeprecatedEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+type Query {
+  deprecateds(options: DeprecatedOptions, where: DeprecatedWhere): [Deprecated!]!
+  deprecatedsConnection(after: String, first: Int, sort: [DeprecatedSort], where: DeprecatedWhere): DeprecatedsConnection!
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
diff --git a/core/src/test/resources/tck-test-files/schema/v2/lowercase-type-names.adoc b/core/src/test/resources/tck-test-files/schema/v2/lowercase-type-names.adoc
index 0638647b..b0369048 100644
--- a/core/src/test/resources/tck-test-files/schema/v2/lowercase-type-names.adoc
+++ b/core/src/test/resources/tck-test-files/schema/v2/lowercase-type-names.adoc
@@ -25,7 +25,7 @@ type actor {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -253,6 +253,3 @@ input movieWhere {
 }
 
 ----
-
-'''
-
diff --git a/core/src/test/resources/tck-test-files/schema/v2/lowercase-type-names.js.adoc b/core/src/test/resources/tck-test-files/schema/v2/lowercase-type-names.js.adoc
new file mode 100644
index 00000000..520b4111
--- /dev/null
+++ b/core/src/test/resources/tck-test-files/schema/v2/lowercase-type-names.js.adoc
@@ -0,0 +1,279 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= lower case type names
+
+== should generate a valid schema
+
+.Schema
+[source,graphql,schema=true]
+----
+type movie {
+  name: String
+  year: Int
+  createdAt: DateTime
+  testId: String
+  actors: [actor!]! @relationship(type: "ACTED_IN", direction: IN)
+}
+
+type actor {
+  name: String
+  year: Int
+  createdAt: DateTime
+  movies: [movie!]! @relationship(type: "ACTED_IN", direction: OUT)
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+type ActorsConnection {
+  edges: [actorEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""A date and time, represented as an ISO-8601 string"""
+scalar DateTime
+
+type MoviesConnection {
+  edges: [movieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+type Query {
+  actors(options: actorOptions, where: actorWhere): [actor!]!
+  actorsConnection(after: String, first: Int, sort: [actorSort], where: actorWhere): ActorsConnection!
+  movies(options: movieOptions, where: movieWhere): [movie!]!
+  moviesConnection(after: String, first: Int, sort: [movieSort], where: movieWhere): MoviesConnection!
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+
+type actor {
+  createdAt: DateTime
+  movies(directed: Boolean = true, options: movieOptions, where: movieWhere): [movie!]!
+  moviesConnection(after: String, directed: Boolean = true, first: Int, sort: [actorMoviesConnectionSort!], where: actorMoviesConnectionWhere): actorMoviesConnection!
+  name: String
+  year: Int
+}
+
+type actorEdge {
+  cursor: String!
+  node: actor!
+}
+
+type actorMoviesConnection {
+  edges: [actorMoviesRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input actorMoviesConnectionSort {
+  node: movieSort
+}
+
+input actorMoviesConnectionWhere {
+  AND: [actorMoviesConnectionWhere!]
+  NOT: actorMoviesConnectionWhere
+  OR: [actorMoviesConnectionWhere!]
+  node: movieWhere
+}
+
+type actorMoviesRelationship {
+  cursor: String!
+  node: movie!
+}
+
+input actorOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more actorSort objects to sort Actors by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [actorSort!]
+}
+
+"""
+Fields to sort Actors by. The order in which sorts are applied is not guaranteed when specifying many fields in one actorSort object.
+"""
+input actorSort {
+  createdAt: SortDirection
+  name: SortDirection
+  year: SortDirection
+}
+
+input actorWhere {
+  AND: [actorWhere!]
+  NOT: actorWhere
+  OR: [actorWhere!]
+  createdAt: DateTime
+  createdAt_GT: DateTime
+  createdAt_GTE: DateTime
+  createdAt_IN: [DateTime]
+  createdAt_LT: DateTime
+  createdAt_LTE: DateTime
+  """
+  Return actors where all of the related actorMoviesConnections match this filter
+  """
+  moviesConnection_ALL: actorMoviesConnectionWhere
+  """
+  Return actors where none of the related actorMoviesConnections match this filter
+  """
+  moviesConnection_NONE: actorMoviesConnectionWhere
+  """
+  Return actors where one of the related actorMoviesConnections match this filter
+  """
+  moviesConnection_SINGLE: actorMoviesConnectionWhere
+  """
+  Return actors where some of the related actorMoviesConnections match this filter
+  """
+  moviesConnection_SOME: actorMoviesConnectionWhere
+  """Return actors where all of the related movies match this filter"""
+  movies_ALL: movieWhere
+  """Return actors where none of the related movies match this filter"""
+  movies_NONE: movieWhere
+  """Return actors where one of the related movies match this filter"""
+  movies_SINGLE: movieWhere
+  """Return actors where some of the related movies match this filter"""
+  movies_SOME: movieWhere
+  name: String
+  name_CONTAINS: String
+  name_ENDS_WITH: String
+  name_IN: [String]
+  name_STARTS_WITH: String
+  year: Int
+  year_GT: Int
+  year_GTE: Int
+  year_IN: [Int]
+  year_LT: Int
+  year_LTE: Int
+}
+
+type movie {
+  actors(directed: Boolean = true, options: actorOptions, where: actorWhere): [actor!]!
+  actorsConnection(after: String, directed: Boolean = true, first: Int, sort: [movieActorsConnectionSort!], where: movieActorsConnectionWhere): movieActorsConnection!
+  createdAt: DateTime
+  name: String
+  testId: String
+  year: Int
+}
+
+type movieActorsConnection {
+  edges: [movieActorsRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input movieActorsConnectionSort {
+  node: actorSort
+}
+
+input movieActorsConnectionWhere {
+  AND: [movieActorsConnectionWhere!]
+  NOT: movieActorsConnectionWhere
+  OR: [movieActorsConnectionWhere!]
+  node: actorWhere
+}
+
+type movieActorsRelationship {
+  cursor: String!
+  node: actor!
+}
+
+type movieEdge {
+  cursor: String!
+  node: movie!
+}
+
+input movieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more movieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [movieSort!]
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one movieSort object.
+"""
+input movieSort {
+  createdAt: SortDirection
+  name: SortDirection
+  testId: SortDirection
+  year: SortDirection
+}
+
+input movieWhere {
+  AND: [movieWhere!]
+  NOT: movieWhere
+  OR: [movieWhere!]
+  """
+  Return movies where all of the related movieActorsConnections match this filter
+  """
+  actorsConnection_ALL: movieActorsConnectionWhere
+  """
+  Return movies where none of the related movieActorsConnections match this filter
+  """
+  actorsConnection_NONE: movieActorsConnectionWhere
+  """
+  Return movies where one of the related movieActorsConnections match this filter
+  """
+  actorsConnection_SINGLE: movieActorsConnectionWhere
+  """
+  Return movies where some of the related movieActorsConnections match this filter
+  """
+  actorsConnection_SOME: movieActorsConnectionWhere
+  """Return movies where all of the related actors match this filter"""
+  actors_ALL: actorWhere
+  """Return movies where none of the related actors match this filter"""
+  actors_NONE: actorWhere
+  """Return movies where one of the related actors match this filter"""
+  actors_SINGLE: actorWhere
+  """Return movies where some of the related actors match this filter"""
+  actors_SOME: actorWhere
+  createdAt: DateTime
+  createdAt_GT: DateTime
+  createdAt_GTE: DateTime
+  createdAt_IN: [DateTime]
+  createdAt_LT: DateTime
+  createdAt_LTE: DateTime
+  name: String
+  name_CONTAINS: String
+  name_ENDS_WITH: String
+  name_IN: [String]
+  name_STARTS_WITH: String
+  testId: String
+  testId_CONTAINS: String
+  testId_ENDS_WITH: String
+  testId_IN: [String]
+  testId_STARTS_WITH: String
+  year: Int
+  year_GT: Int
+  year_GTE: Int
+  year_IN: [Int]
+  year_LT: Int
+  year_LTE: Int
+}
+----
diff --git a/core/src/test/resources/tck-test-files/schema/v2/math.adoc b/core/src/test/resources/tck-test-files/schema/v2/math.adoc
index 6b011272..57f8a6ef 100644
--- a/core/src/test/resources/tck-test-files/schema/v2/math.adoc
+++ b/core/src/test/resources/tck-test-files/schema/v2/math.adoc
@@ -15,7 +15,7 @@ type Movie {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -90,8 +90,6 @@ input MovieWhere {
 
 ----
 
-'''
-
 == BigInt fields should be extended with Increment/Decrement operators
 
 .Schema
@@ -104,7 +102,7 @@ type Movie {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -182,8 +180,6 @@ input MovieWhere {
 
 ----
 
-'''
-
 == Float fields should be extended with Add/Subtract/Multiply/Divide operators
 
 .Schema
@@ -196,7 +192,7 @@ type Movie {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -271,8 +267,6 @@ input MovieWhere {
 
 ----
 
-'''
-
 == Operators should be presents in nested updates
 
 .Schema
@@ -291,7 +285,7 @@ type Director {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -474,8 +468,6 @@ input MovieWhere {
 
 ----
 
-'''
-
 == Should be supported in interfaces
 
 .Schema
@@ -498,7 +490,7 @@ type Person {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -739,8 +731,6 @@ input ProductionWhere {
 
 ----
 
-'''
-
 == Should be supported in Relationship properties
 
 .Schema
@@ -763,7 +753,7 @@ type ActedIn @relationshipProperties {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -984,6 +974,3 @@ input PersonWhere {
 }
 
 ----
-
-'''
-
diff --git a/core/src/test/resources/tck-test-files/schema/v2/math.js.adoc b/core/src/test/resources/tck-test-files/schema/v2/math.js.adoc
new file mode 100644
index 00000000..a484de6a
--- /dev/null
+++ b/core/src/test/resources/tck-test-files/schema/v2/math.js.adoc
@@ -0,0 +1,1053 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= Algebraic
+
+== Int fields should be extended with Increment/Decrement operators
+
+.Schema
+[source,graphql,schema=true]
+----
+type Movie {
+  id: ID
+  viewers: Int!
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+type Movie {
+  id: ID
+  viewers: Int!
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MovieSort!]
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
+"""
+input MovieSort {
+  id: SortDirection
+  viewers: SortDirection
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  id: ID
+  id_CONTAINS: ID
+  id_ENDS_WITH: ID
+  id_IN: [ID]
+  id_STARTS_WITH: ID
+  viewers: Int
+  viewers_GT: Int
+  viewers_GTE: Int
+  viewers_IN: [Int!]
+  viewers_LT: Int
+  viewers_LTE: Int
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+type Query {
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
+
+== BigInt fields should be extended with Increment/Decrement operators
+
+.Schema
+[source,graphql,schema=true]
+----
+type Movie {
+  id: ID
+  viewers: BigInt!
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+"""
+A BigInt value up to 64 bits in size, which can be a number or a string if used inline, or a string only if used as a variable. Always returned as a string.
+"""
+scalar BigInt
+
+type Movie {
+  id: ID
+  viewers: BigInt!
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MovieSort!]
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
+"""
+input MovieSort {
+  id: SortDirection
+  viewers: SortDirection
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  id: ID
+  id_CONTAINS: ID
+  id_ENDS_WITH: ID
+  id_IN: [ID]
+  id_STARTS_WITH: ID
+  viewers: BigInt
+  viewers_GT: BigInt
+  viewers_GTE: BigInt
+  viewers_IN: [BigInt!]
+  viewers_LT: BigInt
+  viewers_LTE: BigInt
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+type Query {
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
+
+== Float fields should be extended with Add/Subtract/Multiply/Divide operators
+
+.Schema
+[source,graphql,schema=true]
+----
+type Movie {
+  id: ID
+  viewers: Float!
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+type Movie {
+  id: ID
+  viewers: Float!
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MovieSort!]
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
+"""
+input MovieSort {
+  id: SortDirection
+  viewers: SortDirection
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  id: ID
+  id_CONTAINS: ID
+  id_ENDS_WITH: ID
+  id_IN: [ID]
+  id_STARTS_WITH: ID
+  viewers: Float
+  viewers_GT: Float
+  viewers_GTE: Float
+  viewers_IN: [Float!]
+  viewers_LT: Float
+  viewers_LTE: Float
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+type Query {
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
+
+== Operators should be presents in nested updates
+
+.Schema
+[source,graphql,schema=true]
+----
+type Movie {
+  id: ID
+  viewers: Int!
+  directedBy: Director @relationship(type: "DIRECTS", direction: IN)
+}
+
+type Director {
+  lastName: String!
+  directs: [Movie!]! @relationship(type: "DIRECTS", direction: OUT)
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+type Director {
+  directs(directed: Boolean = true, options: MovieOptions, where: MovieWhere): [Movie!]!
+  directsConnection(after: String, directed: Boolean = true, first: Int, sort: [DirectorDirectsConnectionSort!], where: DirectorDirectsConnectionWhere): DirectorDirectsConnection!
+  lastName: String!
+}
+
+type DirectorDirectsConnection {
+  edges: [DirectorDirectsRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input DirectorDirectsConnectionSort {
+  node: MovieSort
+}
+
+input DirectorDirectsConnectionWhere {
+  AND: [DirectorDirectsConnectionWhere!]
+  NOT: DirectorDirectsConnectionWhere
+  OR: [DirectorDirectsConnectionWhere!]
+  node: MovieWhere
+}
+
+type DirectorDirectsRelationship {
+  cursor: String!
+  node: Movie!
+}
+
+type DirectorEdge {
+  cursor: String!
+  node: Director!
+}
+
+input DirectorOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more DirectorSort objects to sort Directors by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [DirectorSort!]
+}
+
+"""
+Fields to sort Directors by. The order in which sorts are applied is not guaranteed when specifying many fields in one DirectorSort object.
+"""
+input DirectorSort {
+  lastName: SortDirection
+}
+
+input DirectorWhere {
+  AND: [DirectorWhere!]
+  NOT: DirectorWhere
+  OR: [DirectorWhere!]
+  """
+  Return Directors where all of the related DirectorDirectsConnections match this filter
+  """
+  directsConnection_ALL: DirectorDirectsConnectionWhere
+  """
+  Return Directors where none of the related DirectorDirectsConnections match this filter
+  """
+  directsConnection_NONE: DirectorDirectsConnectionWhere
+  """
+  Return Directors where one of the related DirectorDirectsConnections match this filter
+  """
+  directsConnection_SINGLE: DirectorDirectsConnectionWhere
+  """
+  Return Directors where some of the related DirectorDirectsConnections match this filter
+  """
+  directsConnection_SOME: DirectorDirectsConnectionWhere
+  """Return Directors where all of the related Movies match this filter"""
+  directs_ALL: MovieWhere
+  """Return Directors where none of the related Movies match this filter"""
+  directs_NONE: MovieWhere
+  """Return Directors where one of the related Movies match this filter"""
+  directs_SINGLE: MovieWhere
+  """Return Directors where some of the related Movies match this filter"""
+  directs_SOME: MovieWhere
+  lastName: String
+  lastName_CONTAINS: String
+  lastName_ENDS_WITH: String
+  lastName_IN: [String!]
+  lastName_STARTS_WITH: String
+}
+
+type DirectorsConnection {
+  edges: [DirectorEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+type Movie {
+  directedBy(directed: Boolean = true, options: DirectorOptions, where: DirectorWhere): Director
+  directedByConnection(after: String, directed: Boolean = true, first: Int, sort: [MovieDirectedByConnectionSort!], where: MovieDirectedByConnectionWhere): MovieDirectedByConnection!
+  id: ID
+  viewers: Int!
+}
+
+type MovieDirectedByConnection {
+  edges: [MovieDirectedByRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input MovieDirectedByConnectionSort {
+  node: DirectorSort
+}
+
+input MovieDirectedByConnectionWhere {
+  AND: [MovieDirectedByConnectionWhere!]
+  NOT: MovieDirectedByConnectionWhere
+  OR: [MovieDirectedByConnectionWhere!]
+  node: DirectorWhere
+}
+
+type MovieDirectedByRelationship {
+  cursor: String!
+  node: Director!
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MovieSort!]
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
+"""
+input MovieSort {
+  id: SortDirection
+  viewers: SortDirection
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  directedBy: DirectorWhere
+  directedByConnection: MovieDirectedByConnectionWhere
+  directedByConnection_NOT: MovieDirectedByConnectionWhere
+  directedBy_NOT: DirectorWhere
+  id: ID
+  id_CONTAINS: ID
+  id_ENDS_WITH: ID
+  id_IN: [ID]
+  id_STARTS_WITH: ID
+  viewers: Int
+  viewers_GT: Int
+  viewers_GTE: Int
+  viewers_IN: [Int!]
+  viewers_LT: Int
+  viewers_LTE: Int
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+type Query {
+  directors(options: DirectorOptions, where: DirectorWhere): [Director!]!
+  directorsConnection(after: String, first: Int, sort: [DirectorSort], where: DirectorWhere): DirectorsConnection!
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
+
+== Should be supported in interfaces
+
+.Schema
+[source,graphql,schema=true]
+----
+interface Production {
+  viewers: Int!
+}
+
+type Movie implements Production {
+  id: ID
+  viewers: Int!
+  workers: [Person!]! @relationship(type: "WORKED_IN", direction: IN)
+}
+
+type Person {
+  name: String!
+  worksInProduction: [Production!]! @relationship(type: "WORKED_IN", direction: OUT)
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+type Movie implements Production {
+  id: ID
+  viewers: Int!
+  workers(directed: Boolean = true, options: PersonOptions, where: PersonWhere): [Person!]!
+  workersConnection(after: String, directed: Boolean = true, first: Int, sort: [MovieWorkersConnectionSort!], where: MovieWorkersConnectionWhere): MovieWorkersConnection!
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MovieSort!]
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
+"""
+input MovieSort {
+  id: SortDirection
+  viewers: SortDirection
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  id: ID
+  id_CONTAINS: ID
+  id_ENDS_WITH: ID
+  id_IN: [ID]
+  id_STARTS_WITH: ID
+  viewers: Int
+  viewers_GT: Int
+  viewers_GTE: Int
+  viewers_IN: [Int!]
+  viewers_LT: Int
+  viewers_LTE: Int
+  """
+  Return Movies where all of the related MovieWorkersConnections match this filter
+  """
+  workersConnection_ALL: MovieWorkersConnectionWhere
+  """
+  Return Movies where none of the related MovieWorkersConnections match this filter
+  """
+  workersConnection_NONE: MovieWorkersConnectionWhere
+  """
+  Return Movies where one of the related MovieWorkersConnections match this filter
+  """
+  workersConnection_SINGLE: MovieWorkersConnectionWhere
+  """
+  Return Movies where some of the related MovieWorkersConnections match this filter
+  """
+  workersConnection_SOME: MovieWorkersConnectionWhere
+  """Return Movies where all of the related People match this filter"""
+  workers_ALL: PersonWhere
+  """Return Movies where none of the related People match this filter"""
+  workers_NONE: PersonWhere
+  """Return Movies where one of the related People match this filter"""
+  workers_SINGLE: PersonWhere
+  """Return Movies where some of the related People match this filter"""
+  workers_SOME: PersonWhere
+}
+
+type MovieWorkersConnection {
+  edges: [MovieWorkersRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input MovieWorkersConnectionSort {
+  node: PersonSort
+}
+
+input MovieWorkersConnectionWhere {
+  AND: [MovieWorkersConnectionWhere!]
+  NOT: MovieWorkersConnectionWhere
+  OR: [MovieWorkersConnectionWhere!]
+  node: PersonWhere
+}
+
+type MovieWorkersRelationship {
+  cursor: String!
+  node: Person!
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+type PeopleConnection {
+  edges: [PersonEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+type Person {
+  name: String!
+  worksInProduction(directed: Boolean = true, options: ProductionOptions, where: ProductionWhere): [Production!]!
+  worksInProductionConnection(after: String, directed: Boolean = true, first: Int, sort: [PersonWorksInProductionConnectionSort!], where: PersonWorksInProductionConnectionWhere): PersonWorksInProductionConnection!
+}
+
+type PersonEdge {
+  cursor: String!
+  node: Person!
+}
+
+input PersonOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more PersonSort objects to sort People by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [PersonSort!]
+}
+
+"""
+Fields to sort People by. The order in which sorts are applied is not guaranteed when specifying many fields in one PersonSort object.
+"""
+input PersonSort {
+  name: SortDirection
+}
+
+input PersonWhere {
+  AND: [PersonWhere!]
+  NOT: PersonWhere
+  OR: [PersonWhere!]
+  name: String
+  name_CONTAINS: String
+  name_ENDS_WITH: String
+  name_IN: [String!]
+  name_STARTS_WITH: String
+  """
+  Return People where all of the related PersonWorksInProductionConnections match this filter
+  """
+  worksInProductionConnection_ALL: PersonWorksInProductionConnectionWhere
+  """
+  Return People where none of the related PersonWorksInProductionConnections match this filter
+  """
+  worksInProductionConnection_NONE: PersonWorksInProductionConnectionWhere
+  """
+  Return People where one of the related PersonWorksInProductionConnections match this filter
+  """
+  worksInProductionConnection_SINGLE: PersonWorksInProductionConnectionWhere
+  """
+  Return People where some of the related PersonWorksInProductionConnections match this filter
+  """
+  worksInProductionConnection_SOME: PersonWorksInProductionConnectionWhere
+  """Return People where all of the related Productions match this filter"""
+  worksInProduction_ALL: ProductionWhere
+  """Return People where none of the related Productions match this filter"""
+  worksInProduction_NONE: ProductionWhere
+  """Return People where one of the related Productions match this filter"""
+  worksInProduction_SINGLE: ProductionWhere
+  """Return People where some of the related Productions match this filter"""
+  worksInProduction_SOME: ProductionWhere
+}
+
+type PersonWorksInProductionConnection {
+  edges: [PersonWorksInProductionRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input PersonWorksInProductionConnectionSort {
+  node: ProductionSort
+}
+
+input PersonWorksInProductionConnectionWhere {
+  AND: [PersonWorksInProductionConnectionWhere!]
+  NOT: PersonWorksInProductionConnectionWhere
+  OR: [PersonWorksInProductionConnectionWhere!]
+  node: ProductionWhere
+}
+
+type PersonWorksInProductionRelationship {
+  cursor: String!
+  node: Production!
+}
+
+interface Production {
+  viewers: Int!
+}
+
+type ProductionEdge {
+  cursor: String!
+  node: Production!
+}
+
+enum ProductionImplementation {
+  Movie
+}
+
+input ProductionOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more ProductionSort objects to sort Productions by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [ProductionSort]
+}
+
+"""
+Fields to sort Productions by. The order in which sorts are applied is not guaranteed when specifying many fields in one ProductionSort object.
+"""
+input ProductionSort {
+  viewers: SortDirection
+}
+
+input ProductionWhere {
+  AND: [ProductionWhere!]
+  NOT: ProductionWhere
+  OR: [ProductionWhere!]
+  typename_IN: [ProductionImplementation!]
+  viewers: Int
+  viewers_GT: Int
+  viewers_GTE: Int
+  viewers_IN: [Int!]
+  viewers_LT: Int
+  viewers_LTE: Int
+}
+
+type ProductionsConnection {
+  edges: [ProductionEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+type Query {
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+  people(options: PersonOptions, where: PersonWhere): [Person!]!
+  peopleConnection(after: String, first: Int, sort: [PersonSort], where: PersonWhere): PeopleConnection!
+  productions(options: ProductionOptions, where: ProductionWhere): [Production!]!
+  productionsConnection(after: String, first: Int, sort: [ProductionSort], where: ProductionWhere): ProductionsConnection!
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
+
+== Should be supported in Relationship properties
+
+.Schema
+[source,graphql,schema=true]
+----
+type Person {
+  name: String!
+  actedInMovies: [Movie!]! @relationship(type: "ACTED_IN", properties: "ActedIn", direction: OUT)
+}
+
+type Movie {
+  title: String!
+  actors: [Person!]! @relationship(type: "ACTED_IN", properties: "ActedIn", direction: IN)
+}
+
+type ActedIn @relationshipProperties {
+  roles: [String!]
+  pay: Float
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+"""
+The edge properties for the following fields:
+* Person.actedInMovies
+* Movie.actors
+"""
+type ActedIn {
+  pay: Float
+  roles: [String!]
+}
+
+input ActedInSort {
+  pay: SortDirection
+  roles: SortDirection
+}
+
+input ActedInWhere {
+  AND: [ActedInWhere!]
+  NOT: ActedInWhere
+  OR: [ActedInWhere!]
+  pay: Float
+  pay_GT: Float
+  pay_GTE: Float
+  pay_IN: [Float]
+  pay_LT: Float
+  pay_LTE: Float
+  roles: [String!]
+  roles_INCLUDES: String
+}
+
+type Movie {
+  actors(directed: Boolean = true, options: PersonOptions, where: PersonWhere): [Person!]!
+  actorsConnection(after: String, directed: Boolean = true, first: Int, sort: [MovieActorsConnectionSort!], where: MovieActorsConnectionWhere): MovieActorsConnection!
+  title: String!
+}
+
+type MovieActorsConnection {
+  edges: [MovieActorsRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input MovieActorsConnectionSort {
+  edge: ActedInSort
+  node: PersonSort
+}
+
+input MovieActorsConnectionWhere {
+  AND: [MovieActorsConnectionWhere!]
+  NOT: MovieActorsConnectionWhere
+  OR: [MovieActorsConnectionWhere!]
+  edge: ActedInWhere
+  node: PersonWhere
+}
+
+type MovieActorsRelationship {
+  cursor: String!
+  node: Person!
+  properties: ActedIn!
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MovieSort!]
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
+"""
+input MovieSort {
+  title: SortDirection
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  """
+  Return Movies where all of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_ALL: MovieActorsConnectionWhere
+  """
+  Return Movies where none of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_NONE: MovieActorsConnectionWhere
+  """
+  Return Movies where one of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SINGLE: MovieActorsConnectionWhere
+  """
+  Return Movies where some of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SOME: MovieActorsConnectionWhere
+  """Return Movies where all of the related People match this filter"""
+  actors_ALL: PersonWhere
+  """Return Movies where none of the related People match this filter"""
+  actors_NONE: PersonWhere
+  """Return Movies where one of the related People match this filter"""
+  actors_SINGLE: PersonWhere
+  """Return Movies where some of the related People match this filter"""
+  actors_SOME: PersonWhere
+  title: String
+  title_CONTAINS: String
+  title_ENDS_WITH: String
+  title_IN: [String!]
+  title_STARTS_WITH: String
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+type PeopleConnection {
+  edges: [PersonEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+type Person {
+  actedInMovies(directed: Boolean = true, options: MovieOptions, where: MovieWhere): [Movie!]!
+  actedInMoviesConnection(after: String, directed: Boolean = true, first: Int, sort: [PersonActedInMoviesConnectionSort!], where: PersonActedInMoviesConnectionWhere): PersonActedInMoviesConnection!
+  name: String!
+}
+
+type PersonActedInMoviesConnection {
+  edges: [PersonActedInMoviesRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input PersonActedInMoviesConnectionSort {
+  edge: ActedInSort
+  node: MovieSort
+}
+
+input PersonActedInMoviesConnectionWhere {
+  AND: [PersonActedInMoviesConnectionWhere!]
+  NOT: PersonActedInMoviesConnectionWhere
+  OR: [PersonActedInMoviesConnectionWhere!]
+  edge: ActedInWhere
+  node: MovieWhere
+}
+
+type PersonActedInMoviesRelationship {
+  cursor: String!
+  node: Movie!
+  properties: ActedIn!
+}
+
+type PersonEdge {
+  cursor: String!
+  node: Person!
+}
+
+input PersonOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more PersonSort objects to sort People by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [PersonSort!]
+}
+
+"""
+Fields to sort People by. The order in which sorts are applied is not guaranteed when specifying many fields in one PersonSort object.
+"""
+input PersonSort {
+  name: SortDirection
+}
+
+input PersonWhere {
+  AND: [PersonWhere!]
+  NOT: PersonWhere
+  OR: [PersonWhere!]
+  """
+  Return People where all of the related PersonActedInMoviesConnections match this filter
+  """
+  actedInMoviesConnection_ALL: PersonActedInMoviesConnectionWhere
+  """
+  Return People where none of the related PersonActedInMoviesConnections match this filter
+  """
+  actedInMoviesConnection_NONE: PersonActedInMoviesConnectionWhere
+  """
+  Return People where one of the related PersonActedInMoviesConnections match this filter
+  """
+  actedInMoviesConnection_SINGLE: PersonActedInMoviesConnectionWhere
+  """
+  Return People where some of the related PersonActedInMoviesConnections match this filter
+  """
+  actedInMoviesConnection_SOME: PersonActedInMoviesConnectionWhere
+  """Return People where all of the related Movies match this filter"""
+  actedInMovies_ALL: MovieWhere
+  """Return People where none of the related Movies match this filter"""
+  actedInMovies_NONE: MovieWhere
+  """Return People where one of the related Movies match this filter"""
+  actedInMovies_SINGLE: MovieWhere
+  """Return People where some of the related Movies match this filter"""
+  actedInMovies_SOME: MovieWhere
+  name: String
+  name_CONTAINS: String
+  name_ENDS_WITH: String
+  name_IN: [String!]
+  name_STARTS_WITH: String
+}
+
+type Query {
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+  people(options: PersonOptions, where: PersonWhere): [Person!]!
+  peopleConnection(after: String, first: Int, sort: [PersonSort], where: PersonWhere): PeopleConnection!
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
diff --git a/core/src/test/resources/tck-test-files/schema/v2/nested-aggregation-on-type.adoc b/core/src/test/resources/tck-test-files/schema/v2/nested-aggregation-on-type.adoc
index 2163bfae..114ee945 100644
--- a/core/src/test/resources/tck-test-files/schema/v2/nested-aggregation-on-type.adoc
+++ b/core/src/test/resources/tck-test-files/schema/v2/nested-aggregation-on-type.adoc
@@ -25,7 +25,7 @@ type Actor {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -214,6 +214,3 @@ input MovieWhere {
 }
 
 ----
-
-'''
-
diff --git a/core/src/test/resources/tck-test-files/schema/v2/nested-aggregation-on-type.js.adoc b/core/src/test/resources/tck-test-files/schema/v2/nested-aggregation-on-type.js.adoc
new file mode 100644
index 00000000..41985694
--- /dev/null
+++ b/core/src/test/resources/tck-test-files/schema/v2/nested-aggregation-on-type.js.adoc
@@ -0,0 +1,232 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= nested aggregation on interface
+
+== should generate the correct schema
+
+.Schema
+[source,graphql,schema=true]
+----
+type Movie {
+  title: String!
+  cost: Float!
+  runtime: Int!
+}
+
+type ActedIn @relationshipProperties {
+  screenTime: Int!
+}
+
+type Actor {
+  name: String!
+  actedIn: [Movie!]! @relationship(type: "ACTED_IN", direction: OUT, properties: "ActedIn")
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+"""
+The edge properties for the following fields:
+* Actor.actedIn
+"""
+type ActedIn {
+  screenTime: Int!
+}
+
+input ActedInSort {
+  screenTime: SortDirection
+}
+
+input ActedInWhere {
+  AND: [ActedInWhere!]
+  NOT: ActedInWhere
+  OR: [ActedInWhere!]
+  screenTime: Int
+  screenTime_GT: Int
+  screenTime_GTE: Int
+  screenTime_IN: [Int!]
+  screenTime_LT: Int
+  screenTime_LTE: Int
+}
+
+type Actor {
+  actedIn(directed: Boolean = true, options: MovieOptions, where: MovieWhere): [Movie!]!
+  actedInConnection(after: String, directed: Boolean = true, first: Int, sort: [ActorActedInConnectionSort!], where: ActorActedInConnectionWhere): ActorActedInConnection!
+  name: String!
+}
+
+type ActorActedInConnection {
+  edges: [ActorActedInRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input ActorActedInConnectionSort {
+  edge: ActedInSort
+  node: MovieSort
+}
+
+input ActorActedInConnectionWhere {
+  AND: [ActorActedInConnectionWhere!]
+  NOT: ActorActedInConnectionWhere
+  OR: [ActorActedInConnectionWhere!]
+  edge: ActedInWhere
+  node: MovieWhere
+}
+
+type ActorActedInRelationship {
+  cursor: String!
+  node: Movie!
+  properties: ActedIn!
+}
+
+type ActorEdge {
+  cursor: String!
+  node: Actor!
+}
+
+input ActorOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more ActorSort objects to sort Actors by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [ActorSort!]
+}
+
+"""
+Fields to sort Actors by. The order in which sorts are applied is not guaranteed when specifying many fields in one ActorSort object.
+"""
+input ActorSort {
+  name: SortDirection
+}
+
+input ActorWhere {
+  AND: [ActorWhere!]
+  NOT: ActorWhere
+  OR: [ActorWhere!]
+  """
+  Return Actors where all of the related ActorActedInConnections match this filter
+  """
+  actedInConnection_ALL: ActorActedInConnectionWhere
+  """
+  Return Actors where none of the related ActorActedInConnections match this filter
+  """
+  actedInConnection_NONE: ActorActedInConnectionWhere
+  """
+  Return Actors where one of the related ActorActedInConnections match this filter
+  """
+  actedInConnection_SINGLE: ActorActedInConnectionWhere
+  """
+  Return Actors where some of the related ActorActedInConnections match this filter
+  """
+  actedInConnection_SOME: ActorActedInConnectionWhere
+  """Return Actors where all of the related Movies match this filter"""
+  actedIn_ALL: MovieWhere
+  """Return Actors where none of the related Movies match this filter"""
+  actedIn_NONE: MovieWhere
+  """Return Actors where one of the related Movies match this filter"""
+  actedIn_SINGLE: MovieWhere
+  """Return Actors where some of the related Movies match this filter"""
+  actedIn_SOME: MovieWhere
+  name: String
+  name_CONTAINS: String
+  name_ENDS_WITH: String
+  name_IN: [String!]
+  name_STARTS_WITH: String
+}
+
+type ActorsConnection {
+  edges: [ActorEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+type Movie {
+  cost: Float!
+  runtime: Int!
+  title: String!
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MovieSort!]
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
+"""
+input MovieSort {
+  cost: SortDirection
+  runtime: SortDirection
+  title: SortDirection
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  cost: Float
+  cost_GT: Float
+  cost_GTE: Float
+  cost_IN: [Float!]
+  cost_LT: Float
+  cost_LTE: Float
+  runtime: Int
+  runtime_GT: Int
+  runtime_GTE: Int
+  runtime_IN: [Int!]
+  runtime_LT: Int
+  runtime_LTE: Int
+  title: String
+  title_CONTAINS: String
+  title_ENDS_WITH: String
+  title_IN: [String!]
+  title_STARTS_WITH: String
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+type Query {
+  actors(options: ActorOptions, where: ActorWhere): [Actor!]!
+  actorsConnection(after: String, first: Int, sort: [ActorSort], where: ActorWhere): ActorsConnection!
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
diff --git a/core/src/test/resources/tck-test-files/schema/v2/null.adoc b/core/src/test/resources/tck-test-files/schema/v2/null.adoc
index 01c8a577..61f8e851 100644
--- a/core/src/test/resources/tck-test-files/schema/v2/null.adoc
+++ b/core/src/test/resources/tck-test-files/schema/v2/null.adoc
@@ -26,7 +26,7 @@ type Movie {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -209,6 +209,3 @@ input PointInput {
 }
 
 ----
-
-'''
-
diff --git a/core/src/test/resources/tck-test-files/schema/v2/null.js.adoc b/core/src/test/resources/tck-test-files/schema/v2/null.js.adoc
new file mode 100644
index 00000000..586daa5e
--- /dev/null
+++ b/core/src/test/resources/tck-test-files/schema/v2/null.js.adoc
@@ -0,0 +1,219 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= Null
+
+== Simple
+
+.Schema
+[source,graphql,schema=true]
+----
+type Movie {
+  id: ID!
+  ids: [ID!]!
+  name: String!
+  names: [String!]!
+  actorCount: Int!
+  actorCounts: [Int!]!
+  averageRating: Float!
+  averageRatings: [Float!]!
+  isActives: [Boolean!]!
+  filmedAt: Point!
+  filmedAts: [Point!]!
+  createdAt: DateTime!
+  createdAts: [DateTime!]!
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+"""A date and time, represented as an ISO-8601 string"""
+scalar DateTime
+
+type Movie {
+  actorCount: Int!
+  actorCounts: [Int!]!
+  averageRating: Float!
+  averageRatings: [Float!]!
+  createdAt: DateTime!
+  createdAts: [DateTime!]!
+  filmedAt: Point!
+  filmedAts: [Point!]!
+  id: ID!
+  ids: [ID!]!
+  isActives: [Boolean!]!
+  name: String!
+  names: [String!]!
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MovieSort!]
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
+"""
+input MovieSort {
+  actorCount: SortDirection
+  averageRating: SortDirection
+  createdAt: SortDirection
+  filmedAt: SortDirection
+  id: SortDirection
+  name: SortDirection
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  actorCount: Int
+  actorCount_GT: Int
+  actorCount_GTE: Int
+  actorCount_IN: [Int!]
+  actorCount_LT: Int
+  actorCount_LTE: Int
+  actorCounts: [Int!]
+  actorCounts_INCLUDES: Int
+  averageRating: Float
+  averageRating_GT: Float
+  averageRating_GTE: Float
+  averageRating_IN: [Float!]
+  averageRating_LT: Float
+  averageRating_LTE: Float
+  averageRatings: [Float!]
+  averageRatings_INCLUDES: Float
+  createdAt: DateTime
+  createdAt_GT: DateTime
+  createdAt_GTE: DateTime
+  createdAt_IN: [DateTime!]
+  createdAt_LT: DateTime
+  createdAt_LTE: DateTime
+  createdAts: [DateTime!]
+  createdAts_INCLUDES: DateTime
+  filmedAt: PointInput
+  filmedAt_DISTANCE: PointDistance
+  filmedAt_GT: PointDistance
+  filmedAt_GTE: PointDistance
+  filmedAt_IN: [PointInput!]
+  filmedAt_LT: PointDistance
+  filmedAt_LTE: PointDistance
+  filmedAts: [PointInput!]
+  filmedAts_INCLUDES: PointInput
+  id: ID
+  id_CONTAINS: ID
+  id_ENDS_WITH: ID
+  id_IN: [ID!]
+  id_STARTS_WITH: ID
+  ids: [ID!]
+  ids_INCLUDES: ID
+  isActives: [Boolean!]
+  name: String
+  name_CONTAINS: String
+  name_ENDS_WITH: String
+  name_IN: [String!]
+  name_STARTS_WITH: String
+  names: [String!]
+  names_INCLUDES: String
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+"""A point in a coordinate system."""
+type Point {
+  """
+  The coordinate reference systems (CRS)
+  -------------------------------------
+  possible values:
+  * `wgs-84`: A 2D geographic point in the WGS 84 CRS is specified by: longitude and latitude
+  * `wgs-84-3d`: A 3D geographic point in the WGS 84 CRS is specified by longitude, latitude and height
+  """
+  crs: String!
+  """
+  The third element of the Coordinate for geographic CRS, meters above the ellipsoid defined by the datum (WGS-84)
+  """
+  height: Float
+  """
+  The second element of the Coordinate for geographic CRS, degrees North of the equator
+  Range -90.0 to 90.0
+  """
+  latitude: Float!
+  """
+  The first element of the Coordinate for geographic CRS, degrees East of the prime meridian
+  Range -180.0 to 180.0
+  """
+  longitude: Float!
+  """
+  The internal Neo4j ID for the CRS
+  One of:
+  * `4326`: represents CRS `wgs-84`
+  * `4979`: represents CRS `wgs-84-3d`
+  """
+  srid: Int!
+}
+
+"""Input type for a point with a distance"""
+input PointDistance {
+  """The distance in metres to be used when comparing two points"""
+  distance: Float!
+  point: PointInput!
+}
+
+"""Input type for a point"""
+input PointInput {
+  """
+  The third element of the Coordinate for geographic CRS, meters above the ellipsoid defined by the datum (WGS-84)
+  """
+  height: Float
+  """
+  The second element of the Coordinate for geographic CRS, degrees North of the equator
+  Range -90.0 to 90.0
+  """
+  latitude: Float!
+  """
+  The first element of the Coordinate for geographic CRS, degrees East of the prime meridian
+  Range -180.0 to 180.0
+  """
+  longitude: Float!
+}
+
+type Query {
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
diff --git a/core/src/test/resources/tck-test-files/schema/v2/pluralize-consistency.adoc b/core/src/test/resources/tck-test-files/schema/v2/pluralize-consistency.adoc
index a638645f..c10bc7dd 100644
--- a/core/src/test/resources/tck-test-files/schema/v2/pluralize-consistency.adoc
+++ b/core/src/test/resources/tck-test-files/schema/v2/pluralize-consistency.adoc
@@ -19,7 +19,7 @@ type super_friend {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -165,6 +165,3 @@ input super_userWhere {
 }
 
 ----
-
-'''
-
diff --git a/core/src/test/resources/tck-test-files/schema/v2/pluralize-consistency.js.adoc b/core/src/test/resources/tck-test-files/schema/v2/pluralize-consistency.js.adoc
new file mode 100644
index 00000000..34aa134d
--- /dev/null
+++ b/core/src/test/resources/tck-test-files/schema/v2/pluralize-consistency.js.adoc
@@ -0,0 +1,191 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= Pluralize consistency
+
+== Schema with underscore types
+
+.Schema
+[source,graphql,schema=true]
+----
+type super_user {
+  name: String!
+  my_friend: [super_friend!]! @relationship(type: "FRIEND", direction: OUT)
+}
+
+type super_friend {
+  name: String!
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+type Query {
+  superFriends(options: super_friendOptions, where: super_friendWhere): [super_friend!]!
+  superFriendsConnection(after: String, first: Int, sort: [super_friendSort], where: super_friendWhere): SuperFriendsConnection!
+  superUsers(options: super_userOptions, where: super_userWhere): [super_user!]!
+  superUsersConnection(after: String, first: Int, sort: [super_userSort], where: super_userWhere): SuperUsersConnection!
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+
+type SuperFriendsConnection {
+  edges: [super_friendEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+type SuperUsersConnection {
+  edges: [super_userEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+type super_friend {
+  name: String!
+}
+
+type super_friendEdge {
+  cursor: String!
+  node: super_friend!
+}
+
+input super_friendOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more super_friendSort objects to sort SuperFriends by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [super_friendSort!]
+}
+
+"""
+Fields to sort SuperFriends by. The order in which sorts are applied is not guaranteed when specifying many fields in one super_friendSort object.
+"""
+input super_friendSort {
+  name: SortDirection
+}
+
+input super_friendWhere {
+  AND: [super_friendWhere!]
+  NOT: super_friendWhere
+  OR: [super_friendWhere!]
+  name: String
+  name_CONTAINS: String
+  name_ENDS_WITH: String
+  name_IN: [String!]
+  name_STARTS_WITH: String
+}
+
+type super_user {
+  my_friend(directed: Boolean = true, options: super_friendOptions, where: super_friendWhere): [super_friend!]!
+  my_friendConnection(after: String, directed: Boolean = true, first: Int, sort: [super_userMy_friendConnectionSort!], where: super_userMy_friendConnectionWhere): super_userMy_friendConnection!
+  name: String!
+}
+
+type super_userEdge {
+  cursor: String!
+  node: super_user!
+}
+
+type super_userMy_friendConnection {
+  edges: [super_userMy_friendRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input super_userMy_friendConnectionSort {
+  node: super_friendSort
+}
+
+input super_userMy_friendConnectionWhere {
+  AND: [super_userMy_friendConnectionWhere!]
+  NOT: super_userMy_friendConnectionWhere
+  OR: [super_userMy_friendConnectionWhere!]
+  node: super_friendWhere
+}
+
+type super_userMy_friendRelationship {
+  cursor: String!
+  node: super_friend!
+}
+
+input super_userOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more super_userSort objects to sort SuperUsers by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [super_userSort!]
+}
+
+"""
+Fields to sort SuperUsers by. The order in which sorts are applied is not guaranteed when specifying many fields in one super_userSort object.
+"""
+input super_userSort {
+  name: SortDirection
+}
+
+input super_userWhere {
+  AND: [super_userWhere!]
+  NOT: super_userWhere
+  OR: [super_userWhere!]
+  """
+  Return super_users where all of the related super_userMy_friendConnections match this filter
+  """
+  my_friendConnection_ALL: super_userMy_friendConnectionWhere
+  """
+  Return super_users where none of the related super_userMy_friendConnections match this filter
+  """
+  my_friendConnection_NONE: super_userMy_friendConnectionWhere
+  """
+  Return super_users where one of the related super_userMy_friendConnections match this filter
+  """
+  my_friendConnection_SINGLE: super_userMy_friendConnectionWhere
+  """
+  Return super_users where some of the related super_userMy_friendConnections match this filter
+  """
+  my_friendConnection_SOME: super_userMy_friendConnectionWhere
+  """
+  Return super_users where all of the related super_friends match this filter
+  """
+  my_friend_ALL: super_friendWhere
+  """
+  Return super_users where none of the related super_friends match this filter
+  """
+  my_friend_NONE: super_friendWhere
+  """
+  Return super_users where one of the related super_friends match this filter
+  """
+  my_friend_SINGLE: super_friendWhere
+  """
+  Return super_users where some of the related super_friends match this filter
+  """
+  my_friend_SOME: super_friendWhere
+  name: String
+  name_CONTAINS: String
+  name_ENDS_WITH: String
+  name_IN: [String!]
+  name_STARTS_WITH: String
+}
+----
diff --git a/core/src/test/resources/tck-test-files/schema/v2/query-direction.adoc b/core/src/test/resources/tck-test-files/schema/v2/query-direction.adoc
index c7d36117..22101d73 100644
--- a/core/src/test/resources/tck-test-files/schema/v2/query-direction.adoc
+++ b/core/src/test/resources/tck-test-files/schema/v2/query-direction.adoc
@@ -15,7 +15,7 @@ type User {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -122,8 +122,6 @@ input UserWhere {
 
 ----
 
-'''
-
 == DIRECTED_ONLY
 
 .Schema
@@ -136,7 +134,7 @@ type User {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -243,8 +241,6 @@ input UserWhere {
 
 ----
 
-'''
-
 == UNDIRECTED_ONLY
 
 .Schema
@@ -257,7 +253,7 @@ type User {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -363,6 +359,3 @@ input UserWhere {
 }
 
 ----
-
-'''
-
diff --git a/core/src/test/resources/tck-test-files/schema/v2/query-direction.js.adoc b/core/src/test/resources/tck-test-files/schema/v2/query-direction.js.adoc
new file mode 100644
index 00000000..74a5a1b8
--- /dev/null
+++ b/core/src/test/resources/tck-test-files/schema/v2/query-direction.js.adoc
@@ -0,0 +1,395 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= Query Direction
+
+== DEFAULT_UNDIRECTED
+
+.Schema
+[source,graphql,schema=true]
+----
+type User {
+  name: String!
+  friends: [User!]! @relationship(type: "FRIENDS_WITH", direction: OUT, queryDirection: DEFAULT_UNDIRECTED)
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+type Query {
+  users(options: UserOptions, where: UserWhere): [User!]!
+  usersConnection(after: String, first: Int, sort: [UserSort], where: UserWhere): UsersConnection!
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+
+type User {
+  friends(directed: Boolean = false, options: UserOptions, where: UserWhere): [User!]!
+  friendsConnection(after: String, directed: Boolean = false, first: Int, sort: [UserFriendsConnectionSort!], where: UserFriendsConnectionWhere): UserFriendsConnection!
+  name: String!
+}
+
+type UserEdge {
+  cursor: String!
+  node: User!
+}
+
+type UserFriendsConnection {
+  edges: [UserFriendsRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input UserFriendsConnectionSort {
+  node: UserSort
+}
+
+input UserFriendsConnectionWhere {
+  AND: [UserFriendsConnectionWhere!]
+  NOT: UserFriendsConnectionWhere
+  OR: [UserFriendsConnectionWhere!]
+  node: UserWhere
+}
+
+type UserFriendsRelationship {
+  cursor: String!
+  node: User!
+}
+
+input UserOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more UserSort objects to sort Users by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [UserSort!]
+}
+
+"""
+Fields to sort Users by. The order in which sorts are applied is not guaranteed when specifying many fields in one UserSort object.
+"""
+input UserSort {
+  name: SortDirection
+}
+
+input UserWhere {
+  AND: [UserWhere!]
+  NOT: UserWhere
+  OR: [UserWhere!]
+  """
+  Return Users where all of the related UserFriendsConnections match this filter
+  """
+  friendsConnection_ALL: UserFriendsConnectionWhere
+  """
+  Return Users where none of the related UserFriendsConnections match this filter
+  """
+  friendsConnection_NONE: UserFriendsConnectionWhere
+  """
+  Return Users where one of the related UserFriendsConnections match this filter
+  """
+  friendsConnection_SINGLE: UserFriendsConnectionWhere
+  """
+  Return Users where some of the related UserFriendsConnections match this filter
+  """
+  friendsConnection_SOME: UserFriendsConnectionWhere
+  """Return Users where all of the related Users match this filter"""
+  friends_ALL: UserWhere
+  """Return Users where none of the related Users match this filter"""
+  friends_NONE: UserWhere
+  """Return Users where one of the related Users match this filter"""
+  friends_SINGLE: UserWhere
+  """Return Users where some of the related Users match this filter"""
+  friends_SOME: UserWhere
+  name: String
+  name_CONTAINS: String
+  name_ENDS_WITH: String
+  name_IN: [String!]
+  name_STARTS_WITH: String
+}
+
+type UsersConnection {
+  edges: [UserEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+----
+
+== DIRECTED_ONLY
+
+.Schema
+[source,graphql,schema=true]
+----
+type User {
+  name: String!
+  friends: [User!]! @relationship(type: "FRIENDS_WITH", direction: OUT, queryDirection: DIRECTED_ONLY)
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+type Query {
+  users(options: UserOptions, where: UserWhere): [User!]!
+  usersConnection(after: String, first: Int, sort: [UserSort], where: UserWhere): UsersConnection!
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+
+type User {
+  friends(options: UserOptions, where: UserWhere): [User!]!
+  friendsConnection(after: String, first: Int, sort: [UserFriendsConnectionSort!], where: UserFriendsConnectionWhere): UserFriendsConnection!
+  name: String!
+}
+
+type UserEdge {
+  cursor: String!
+  node: User!
+}
+
+type UserFriendsConnection {
+  edges: [UserFriendsRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input UserFriendsConnectionSort {
+  node: UserSort
+}
+
+input UserFriendsConnectionWhere {
+  AND: [UserFriendsConnectionWhere!]
+  NOT: UserFriendsConnectionWhere
+  OR: [UserFriendsConnectionWhere!]
+  node: UserWhere
+}
+
+type UserFriendsRelationship {
+  cursor: String!
+  node: User!
+}
+
+input UserOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more UserSort objects to sort Users by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [UserSort!]
+}
+
+"""
+Fields to sort Users by. The order in which sorts are applied is not guaranteed when specifying many fields in one UserSort object.
+"""
+input UserSort {
+  name: SortDirection
+}
+
+input UserWhere {
+  AND: [UserWhere!]
+  NOT: UserWhere
+  OR: [UserWhere!]
+  """
+  Return Users where all of the related UserFriendsConnections match this filter
+  """
+  friendsConnection_ALL: UserFriendsConnectionWhere
+  """
+  Return Users where none of the related UserFriendsConnections match this filter
+  """
+  friendsConnection_NONE: UserFriendsConnectionWhere
+  """
+  Return Users where one of the related UserFriendsConnections match this filter
+  """
+  friendsConnection_SINGLE: UserFriendsConnectionWhere
+  """
+  Return Users where some of the related UserFriendsConnections match this filter
+  """
+  friendsConnection_SOME: UserFriendsConnectionWhere
+  """Return Users where all of the related Users match this filter"""
+  friends_ALL: UserWhere
+  """Return Users where none of the related Users match this filter"""
+  friends_NONE: UserWhere
+  """Return Users where one of the related Users match this filter"""
+  friends_SINGLE: UserWhere
+  """Return Users where some of the related Users match this filter"""
+  friends_SOME: UserWhere
+  name: String
+  name_CONTAINS: String
+  name_ENDS_WITH: String
+  name_IN: [String!]
+  name_STARTS_WITH: String
+}
+
+type UsersConnection {
+  edges: [UserEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+----
+
+== UNDIRECTED_ONLY
+
+.Schema
+[source,graphql,schema=true]
+----
+type User {
+  name: String!
+  friends: [User!]! @relationship(type: "FRIENDS_WITH", direction: OUT, queryDirection: UNDIRECTED_ONLY)
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+type Query {
+  users(options: UserOptions, where: UserWhere): [User!]!
+  usersConnection(after: String, first: Int, sort: [UserSort], where: UserWhere): UsersConnection!
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+
+type User {
+  friends(options: UserOptions, where: UserWhere): [User!]!
+  friendsConnection(after: String, first: Int, sort: [UserFriendsConnectionSort!], where: UserFriendsConnectionWhere): UserFriendsConnection!
+  name: String!
+}
+
+type UserEdge {
+  cursor: String!
+  node: User!
+}
+
+type UserFriendsConnection {
+  edges: [UserFriendsRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input UserFriendsConnectionSort {
+  node: UserSort
+}
+
+input UserFriendsConnectionWhere {
+  AND: [UserFriendsConnectionWhere!]
+  NOT: UserFriendsConnectionWhere
+  OR: [UserFriendsConnectionWhere!]
+  node: UserWhere
+}
+
+type UserFriendsRelationship {
+  cursor: String!
+  node: User!
+}
+
+input UserOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more UserSort objects to sort Users by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [UserSort!]
+}
+
+"""
+Fields to sort Users by. The order in which sorts are applied is not guaranteed when specifying many fields in one UserSort object.
+"""
+input UserSort {
+  name: SortDirection
+}
+
+input UserWhere {
+  AND: [UserWhere!]
+  NOT: UserWhere
+  OR: [UserWhere!]
+  """
+  Return Users where all of the related UserFriendsConnections match this filter
+  """
+  friendsConnection_ALL: UserFriendsConnectionWhere
+  """
+  Return Users where none of the related UserFriendsConnections match this filter
+  """
+  friendsConnection_NONE: UserFriendsConnectionWhere
+  """
+  Return Users where one of the related UserFriendsConnections match this filter
+  """
+  friendsConnection_SINGLE: UserFriendsConnectionWhere
+  """
+  Return Users where some of the related UserFriendsConnections match this filter
+  """
+  friendsConnection_SOME: UserFriendsConnectionWhere
+  """Return Users where all of the related Users match this filter"""
+  friends_ALL: UserWhere
+  """Return Users where none of the related Users match this filter"""
+  friends_NONE: UserWhere
+  """Return Users where one of the related Users match this filter"""
+  friends_SINGLE: UserWhere
+  """Return Users where some of the related Users match this filter"""
+  friends_SOME: UserWhere
+  name: String
+  name_CONTAINS: String
+  name_ENDS_WITH: String
+  name_IN: [String!]
+  name_STARTS_WITH: String
+}
+
+type UsersConnection {
+  edges: [UserEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+----
diff --git a/core/src/test/resources/tck-test-files/schema/v2/remove-deprecated/aggregations.adoc b/core/src/test/resources/tck-test-files/schema/v2/remove-deprecated/aggregations.adoc
index cebc5e7e..d8dd5127 100644
--- a/core/src/test/resources/tck-test-files/schema/v2/remove-deprecated/aggregations.adoc
+++ b/core/src/test/resources/tck-test-files/schema/v2/remove-deprecated/aggregations.adoc
@@ -24,7 +24,7 @@ type Movie {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -187,8 +187,6 @@ input MovieWhere {
 
 ----
 
-'''
-
 == Where Level Aggregations
 
 .Schema
@@ -227,7 +225,7 @@ type Likes @relationshipProperties {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -559,6 +557,3 @@ input UserWhere {
 }
 
 ----
-
-'''
-
diff --git a/core/src/test/resources/tck-test-files/schema/v2/remove-deprecated/aggregations.js.adoc b/core/src/test/resources/tck-test-files/schema/v2/remove-deprecated/aggregations.js.adoc
new file mode 100644
index 00000000..88e959bc
--- /dev/null
+++ b/core/src/test/resources/tck-test-files/schema/v2/remove-deprecated/aggregations.js.adoc
@@ -0,0 +1,586 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= Remove deprecated fields for aggregations
+
+== Top Level Aggregations
+
+.Schema
+[source,graphql,schema=true]
+----
+type Movie {
+  id: ID
+  isbn: String!
+  title: String
+  createdAt: DateTime
+  someTime: Time
+  someLocalTime: LocalTime
+  someLocalDateTime: LocalDateTime
+  imdbRating: Float
+  someInt: Int
+  someBigInt: BigInt
+  screenTime: Duration
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+"""
+A BigInt value up to 64 bits in size, which can be a number or a string if used inline, or a string only if used as a variable. Always returned as a string.
+"""
+scalar BigInt
+
+"""A date and time, represented as an ISO-8601 string"""
+scalar DateTime
+
+"""A duration, represented as an ISO 8601 duration string"""
+scalar Duration
+
+"""A local datetime, represented as 'YYYY-MM-DDTHH:MM:SS'"""
+scalar LocalDateTime
+
+"""
+A local time, represented as a time string without timezone information
+"""
+scalar LocalTime
+
+type Movie {
+  createdAt: DateTime
+  id: ID
+  imdbRating: Float
+  isbn: String!
+  screenTime: Duration
+  someBigInt: BigInt
+  someInt: Int
+  someLocalDateTime: LocalDateTime
+  someLocalTime: LocalTime
+  someTime: Time
+  title: String
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MovieSort!]
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
+"""
+input MovieSort {
+  createdAt: SortDirection
+  id: SortDirection
+  imdbRating: SortDirection
+  isbn: SortDirection
+  screenTime: SortDirection
+  someBigInt: SortDirection
+  someInt: SortDirection
+  someLocalDateTime: SortDirection
+  someLocalTime: SortDirection
+  someTime: SortDirection
+  title: SortDirection
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  createdAt: DateTime
+  createdAt_GT: DateTime
+  createdAt_GTE: DateTime
+  createdAt_IN: [DateTime]
+  createdAt_LT: DateTime
+  createdAt_LTE: DateTime
+  id: ID
+  id_CONTAINS: ID
+  id_ENDS_WITH: ID
+  id_IN: [ID]
+  id_STARTS_WITH: ID
+  imdbRating: Float
+  imdbRating_GT: Float
+  imdbRating_GTE: Float
+  imdbRating_IN: [Float]
+  imdbRating_LT: Float
+  imdbRating_LTE: Float
+  isbn: String
+  isbn_CONTAINS: String
+  isbn_ENDS_WITH: String
+  isbn_IN: [String!]
+  isbn_STARTS_WITH: String
+  screenTime: Duration
+  screenTime_GT: Duration
+  screenTime_GTE: Duration
+  screenTime_IN: [Duration]
+  screenTime_LT: Duration
+  screenTime_LTE: Duration
+  someBigInt: BigInt
+  someBigInt_GT: BigInt
+  someBigInt_GTE: BigInt
+  someBigInt_IN: [BigInt]
+  someBigInt_LT: BigInt
+  someBigInt_LTE: BigInt
+  someInt: Int
+  someInt_GT: Int
+  someInt_GTE: Int
+  someInt_IN: [Int]
+  someInt_LT: Int
+  someInt_LTE: Int
+  someLocalDateTime: LocalDateTime
+  someLocalDateTime_GT: LocalDateTime
+  someLocalDateTime_GTE: LocalDateTime
+  someLocalDateTime_IN: [LocalDateTime]
+  someLocalDateTime_LT: LocalDateTime
+  someLocalDateTime_LTE: LocalDateTime
+  someLocalTime: LocalTime
+  someLocalTime_GT: LocalTime
+  someLocalTime_GTE: LocalTime
+  someLocalTime_IN: [LocalTime]
+  someLocalTime_LT: LocalTime
+  someLocalTime_LTE: LocalTime
+  someTime: Time
+  someTime_GT: Time
+  someTime_GTE: Time
+  someTime_IN: [Time]
+  someTime_LT: Time
+  someTime_LTE: Time
+  title: String
+  title_CONTAINS: String
+  title_ENDS_WITH: String
+  title_IN: [String]
+  title_STARTS_WITH: String
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+type Query {
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+
+"""A time, represented as an RFC3339 time string"""
+scalar Time
+----
+
+== Where Level Aggregations
+
+.Schema
+[source,graphql,schema=true]
+----
+type User {
+  someId: ID
+  someString: String
+  someFloat: Float
+  someInt: Int
+  someBigInt: BigInt
+  someDateTime: DateTime
+  someLocalDateTime: LocalDateTime
+  someLocalTime: LocalTime
+  someTime: Time
+  someDuration: Duration
+}
+
+type Post {
+  title: String
+  likes: [User!]! @relationship(type: "LIKES", direction: IN, properties: "Likes")
+}
+
+type Likes @relationshipProperties {
+  someId: ID
+  someString: String
+  someFloat: Float
+  someInt: Int
+  someBigInt: BigInt
+  someDateTime: DateTime
+  someLocalDateTime: LocalDateTime
+  someLocalTime: LocalTime
+  someTime: Time
+  someDuration: Duration
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+"""
+A BigInt value up to 64 bits in size, which can be a number or a string if used inline, or a string only if used as a variable. Always returned as a string.
+"""
+scalar BigInt
+
+"""A date and time, represented as an ISO-8601 string"""
+scalar DateTime
+
+"""A duration, represented as an ISO 8601 duration string"""
+scalar Duration
+
+"""
+The edge properties for the following fields:
+* Post.likes
+"""
+type Likes {
+  someBigInt: BigInt
+  someDateTime: DateTime
+  someDuration: Duration
+  someFloat: Float
+  someId: ID
+  someInt: Int
+  someLocalDateTime: LocalDateTime
+  someLocalTime: LocalTime
+  someString: String
+  someTime: Time
+}
+
+input LikesSort {
+  someBigInt: SortDirection
+  someDateTime: SortDirection
+  someDuration: SortDirection
+  someFloat: SortDirection
+  someId: SortDirection
+  someInt: SortDirection
+  someLocalDateTime: SortDirection
+  someLocalTime: SortDirection
+  someString: SortDirection
+  someTime: SortDirection
+}
+
+input LikesWhere {
+  AND: [LikesWhere!]
+  NOT: LikesWhere
+  OR: [LikesWhere!]
+  someBigInt: BigInt
+  someBigInt_GT: BigInt
+  someBigInt_GTE: BigInt
+  someBigInt_IN: [BigInt]
+  someBigInt_LT: BigInt
+  someBigInt_LTE: BigInt
+  someDateTime: DateTime
+  someDateTime_GT: DateTime
+  someDateTime_GTE: DateTime
+  someDateTime_IN: [DateTime]
+  someDateTime_LT: DateTime
+  someDateTime_LTE: DateTime
+  someDuration: Duration
+  someDuration_GT: Duration
+  someDuration_GTE: Duration
+  someDuration_IN: [Duration]
+  someDuration_LT: Duration
+  someDuration_LTE: Duration
+  someFloat: Float
+  someFloat_GT: Float
+  someFloat_GTE: Float
+  someFloat_IN: [Float]
+  someFloat_LT: Float
+  someFloat_LTE: Float
+  someId: ID
+  someId_CONTAINS: ID
+  someId_ENDS_WITH: ID
+  someId_IN: [ID]
+  someId_STARTS_WITH: ID
+  someInt: Int
+  someInt_GT: Int
+  someInt_GTE: Int
+  someInt_IN: [Int]
+  someInt_LT: Int
+  someInt_LTE: Int
+  someLocalDateTime: LocalDateTime
+  someLocalDateTime_GT: LocalDateTime
+  someLocalDateTime_GTE: LocalDateTime
+  someLocalDateTime_IN: [LocalDateTime]
+  someLocalDateTime_LT: LocalDateTime
+  someLocalDateTime_LTE: LocalDateTime
+  someLocalTime: LocalTime
+  someLocalTime_GT: LocalTime
+  someLocalTime_GTE: LocalTime
+  someLocalTime_IN: [LocalTime]
+  someLocalTime_LT: LocalTime
+  someLocalTime_LTE: LocalTime
+  someString: String
+  someString_CONTAINS: String
+  someString_ENDS_WITH: String
+  someString_IN: [String]
+  someString_STARTS_WITH: String
+  someTime: Time
+  someTime_GT: Time
+  someTime_GTE: Time
+  someTime_IN: [Time]
+  someTime_LT: Time
+  someTime_LTE: Time
+}
+
+"""A local datetime, represented as 'YYYY-MM-DDTHH:MM:SS'"""
+scalar LocalDateTime
+
+"""
+A local time, represented as a time string without timezone information
+"""
+scalar LocalTime
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+type Post {
+  likes(directed: Boolean = true, options: UserOptions, where: UserWhere): [User!]!
+  likesConnection(after: String, directed: Boolean = true, first: Int, sort: [PostLikesConnectionSort!], where: PostLikesConnectionWhere): PostLikesConnection!
+  title: String
+}
+
+type PostEdge {
+  cursor: String!
+  node: Post!
+}
+
+type PostLikesConnection {
+  edges: [PostLikesRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input PostLikesConnectionSort {
+  edge: LikesSort
+  node: UserSort
+}
+
+input PostLikesConnectionWhere {
+  AND: [PostLikesConnectionWhere!]
+  NOT: PostLikesConnectionWhere
+  OR: [PostLikesConnectionWhere!]
+  edge: LikesWhere
+  node: UserWhere
+}
+
+type PostLikesRelationship {
+  cursor: String!
+  node: User!
+  properties: Likes!
+}
+
+input PostOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more PostSort objects to sort Posts by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [PostSort!]
+}
+
+"""
+Fields to sort Posts by. The order in which sorts are applied is not guaranteed when specifying many fields in one PostSort object.
+"""
+input PostSort {
+  title: SortDirection
+}
+
+input PostWhere {
+  AND: [PostWhere!]
+  NOT: PostWhere
+  OR: [PostWhere!]
+  """
+  Return Posts where all of the related PostLikesConnections match this filter
+  """
+  likesConnection_ALL: PostLikesConnectionWhere
+  """
+  Return Posts where none of the related PostLikesConnections match this filter
+  """
+  likesConnection_NONE: PostLikesConnectionWhere
+  """
+  Return Posts where one of the related PostLikesConnections match this filter
+  """
+  likesConnection_SINGLE: PostLikesConnectionWhere
+  """
+  Return Posts where some of the related PostLikesConnections match this filter
+  """
+  likesConnection_SOME: PostLikesConnectionWhere
+  """Return Posts where all of the related Users match this filter"""
+  likes_ALL: UserWhere
+  """Return Posts where none of the related Users match this filter"""
+  likes_NONE: UserWhere
+  """Return Posts where one of the related Users match this filter"""
+  likes_SINGLE: UserWhere
+  """Return Posts where some of the related Users match this filter"""
+  likes_SOME: UserWhere
+  title: String
+  title_CONTAINS: String
+  title_ENDS_WITH: String
+  title_IN: [String]
+  title_STARTS_WITH: String
+}
+
+type PostsConnection {
+  edges: [PostEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+type Query {
+  posts(options: PostOptions, where: PostWhere): [Post!]!
+  postsConnection(after: String, first: Int, sort: [PostSort], where: PostWhere): PostsConnection!
+  users(options: UserOptions, where: UserWhere): [User!]!
+  usersConnection(after: String, first: Int, sort: [UserSort], where: UserWhere): UsersConnection!
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+
+"""A time, represented as an RFC3339 time string"""
+scalar Time
+
+type User {
+  someBigInt: BigInt
+  someDateTime: DateTime
+  someDuration: Duration
+  someFloat: Float
+  someId: ID
+  someInt: Int
+  someLocalDateTime: LocalDateTime
+  someLocalTime: LocalTime
+  someString: String
+  someTime: Time
+}
+
+type UserEdge {
+  cursor: String!
+  node: User!
+}
+
+input UserOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more UserSort objects to sort Users by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [UserSort!]
+}
+
+"""
+Fields to sort Users by. The order in which sorts are applied is not guaranteed when specifying many fields in one UserSort object.
+"""
+input UserSort {
+  someBigInt: SortDirection
+  someDateTime: SortDirection
+  someDuration: SortDirection
+  someFloat: SortDirection
+  someId: SortDirection
+  someInt: SortDirection
+  someLocalDateTime: SortDirection
+  someLocalTime: SortDirection
+  someString: SortDirection
+  someTime: SortDirection
+}
+
+input UserWhere {
+  AND: [UserWhere!]
+  NOT: UserWhere
+  OR: [UserWhere!]
+  someBigInt: BigInt
+  someBigInt_GT: BigInt
+  someBigInt_GTE: BigInt
+  someBigInt_IN: [BigInt]
+  someBigInt_LT: BigInt
+  someBigInt_LTE: BigInt
+  someDateTime: DateTime
+  someDateTime_GT: DateTime
+  someDateTime_GTE: DateTime
+  someDateTime_IN: [DateTime]
+  someDateTime_LT: DateTime
+  someDateTime_LTE: DateTime
+  someDuration: Duration
+  someDuration_GT: Duration
+  someDuration_GTE: Duration
+  someDuration_IN: [Duration]
+  someDuration_LT: Duration
+  someDuration_LTE: Duration
+  someFloat: Float
+  someFloat_GT: Float
+  someFloat_GTE: Float
+  someFloat_IN: [Float]
+  someFloat_LT: Float
+  someFloat_LTE: Float
+  someId: ID
+  someId_CONTAINS: ID
+  someId_ENDS_WITH: ID
+  someId_IN: [ID]
+  someId_STARTS_WITH: ID
+  someInt: Int
+  someInt_GT: Int
+  someInt_GTE: Int
+  someInt_IN: [Int]
+  someInt_LT: Int
+  someInt_LTE: Int
+  someLocalDateTime: LocalDateTime
+  someLocalDateTime_GT: LocalDateTime
+  someLocalDateTime_GTE: LocalDateTime
+  someLocalDateTime_IN: [LocalDateTime]
+  someLocalDateTime_LT: LocalDateTime
+  someLocalDateTime_LTE: LocalDateTime
+  someLocalTime: LocalTime
+  someLocalTime_GT: LocalTime
+  someLocalTime_GTE: LocalTime
+  someLocalTime_IN: [LocalTime]
+  someLocalTime_LT: LocalTime
+  someLocalTime_LTE: LocalTime
+  someString: String
+  someString_CONTAINS: String
+  someString_ENDS_WITH: String
+  someString_IN: [String]
+  someString_STARTS_WITH: String
+  someTime: Time
+  someTime_GT: Time
+  someTime_GTE: Time
+  someTime_IN: [Time]
+  someTime_LT: Time
+  someTime_LTE: Time
+}
+
+type UsersConnection {
+  edges: [UserEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+----
diff --git a/core/src/test/resources/tck-test-files/schema/v2/remove-deprecated/array-methods.adoc b/core/src/test/resources/tck-test-files/schema/v2/remove-deprecated/array-methods.adoc
index 5e496779..7021e621 100644
--- a/core/src/test/resources/tck-test-files/schema/v2/remove-deprecated/array-methods.adoc
+++ b/core/src/test/resources/tck-test-files/schema/v2/remove-deprecated/array-methods.adoc
@@ -26,7 +26,7 @@ type ActedIn @relationshipProperties {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -250,6 +250,3 @@ input MovieWhere {
 }
 
 ----
-
-'''
-
diff --git a/core/src/test/resources/tck-test-files/schema/v2/remove-deprecated/array-methods.js.adoc b/core/src/test/resources/tck-test-files/schema/v2/remove-deprecated/array-methods.js.adoc
new file mode 100644
index 00000000..0073560d
--- /dev/null
+++ b/core/src/test/resources/tck-test-files/schema/v2/remove-deprecated/array-methods.js.adoc
@@ -0,0 +1,276 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= Arrays Methods
+
+== Array of Float and Array of Actor relationships
+
+.Schema
+[source,graphql,schema=true]
+----
+type Actor {
+  name: String
+  actedIn: [Movie!]! @relationship(type: "ACTED_IN", properties: "ActedIn", direction: OUT)
+}
+
+type Movie {
+  id: ID!
+  ratings: [Float!]!
+  actors: [Actor!]! @relationship(type: "ACTED_IN", properties: "ActedIn", direction: IN)
+  averageRating: Float!
+}
+
+type ActedIn @relationshipProperties {
+  pay: [Float]
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+"""
+The edge properties for the following fields:
+* Actor.actedIn
+* Movie.actors
+"""
+type ActedIn {
+  pay: [Float]
+}
+
+input ActedInSort {
+  pay: SortDirection
+}
+
+input ActedInWhere {
+  AND: [ActedInWhere!]
+  NOT: ActedInWhere
+  OR: [ActedInWhere!]
+  pay: [Float]
+  pay_INCLUDES: Float
+}
+
+type Actor {
+  actedIn(directed: Boolean = true, options: MovieOptions, where: MovieWhere): [Movie!]!
+  actedInConnection(after: String, directed: Boolean = true, first: Int, sort: [ActorActedInConnectionSort!], where: ActorActedInConnectionWhere): ActorActedInConnection!
+  name: String
+}
+
+type ActorActedInConnection {
+  edges: [ActorActedInRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input ActorActedInConnectionSort {
+  edge: ActedInSort
+  node: MovieSort
+}
+
+input ActorActedInConnectionWhere {
+  AND: [ActorActedInConnectionWhere!]
+  NOT: ActorActedInConnectionWhere
+  OR: [ActorActedInConnectionWhere!]
+  edge: ActedInWhere
+  node: MovieWhere
+}
+
+type ActorActedInRelationship {
+  cursor: String!
+  node: Movie!
+  properties: ActedIn!
+}
+
+type ActorEdge {
+  cursor: String!
+  node: Actor!
+}
+
+input ActorOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more ActorSort objects to sort Actors by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [ActorSort!]
+}
+
+"""
+Fields to sort Actors by. The order in which sorts are applied is not guaranteed when specifying many fields in one ActorSort object.
+"""
+input ActorSort {
+  name: SortDirection
+}
+
+input ActorWhere {
+  AND: [ActorWhere!]
+  NOT: ActorWhere
+  OR: [ActorWhere!]
+  """
+  Return Actors where all of the related ActorActedInConnections match this filter
+  """
+  actedInConnection_ALL: ActorActedInConnectionWhere
+  """
+  Return Actors where none of the related ActorActedInConnections match this filter
+  """
+  actedInConnection_NONE: ActorActedInConnectionWhere
+  """
+  Return Actors where one of the related ActorActedInConnections match this filter
+  """
+  actedInConnection_SINGLE: ActorActedInConnectionWhere
+  """
+  Return Actors where some of the related ActorActedInConnections match this filter
+  """
+  actedInConnection_SOME: ActorActedInConnectionWhere
+  """Return Actors where all of the related Movies match this filter"""
+  actedIn_ALL: MovieWhere
+  """Return Actors where none of the related Movies match this filter"""
+  actedIn_NONE: MovieWhere
+  """Return Actors where one of the related Movies match this filter"""
+  actedIn_SINGLE: MovieWhere
+  """Return Actors where some of the related Movies match this filter"""
+  actedIn_SOME: MovieWhere
+  name: String
+  name_CONTAINS: String
+  name_ENDS_WITH: String
+  name_IN: [String]
+  name_STARTS_WITH: String
+}
+
+type ActorsConnection {
+  edges: [ActorEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+type Movie {
+  actors(directed: Boolean = true, options: ActorOptions, where: ActorWhere): [Actor!]!
+  actorsConnection(after: String, directed: Boolean = true, first: Int, sort: [MovieActorsConnectionSort!], where: MovieActorsConnectionWhere): MovieActorsConnection!
+  averageRating: Float!
+  id: ID!
+  ratings: [Float!]!
+}
+
+type MovieActorsConnection {
+  edges: [MovieActorsRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input MovieActorsConnectionSort {
+  edge: ActedInSort
+  node: ActorSort
+}
+
+input MovieActorsConnectionWhere {
+  AND: [MovieActorsConnectionWhere!]
+  NOT: MovieActorsConnectionWhere
+  OR: [MovieActorsConnectionWhere!]
+  edge: ActedInWhere
+  node: ActorWhere
+}
+
+type MovieActorsRelationship {
+  cursor: String!
+  node: Actor!
+  properties: ActedIn!
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MovieSort!]
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
+"""
+input MovieSort {
+  averageRating: SortDirection
+  id: SortDirection
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  """
+  Return Movies where all of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_ALL: MovieActorsConnectionWhere
+  """
+  Return Movies where none of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_NONE: MovieActorsConnectionWhere
+  """
+  Return Movies where one of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SINGLE: MovieActorsConnectionWhere
+  """
+  Return Movies where some of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SOME: MovieActorsConnectionWhere
+  """Return Movies where all of the related Actors match this filter"""
+  actors_ALL: ActorWhere
+  """Return Movies where none of the related Actors match this filter"""
+  actors_NONE: ActorWhere
+  """Return Movies where one of the related Actors match this filter"""
+  actors_SINGLE: ActorWhere
+  """Return Movies where some of the related Actors match this filter"""
+  actors_SOME: ActorWhere
+  averageRating: Float
+  averageRating_GT: Float
+  averageRating_GTE: Float
+  averageRating_IN: [Float!]
+  averageRating_LT: Float
+  averageRating_LTE: Float
+  id: ID
+  id_CONTAINS: ID
+  id_ENDS_WITH: ID
+  id_IN: [ID!]
+  id_STARTS_WITH: ID
+  ratings: [Float!]
+  ratings_INCLUDES: Float
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+type Query {
+  actors(options: ActorOptions, where: ActorWhere): [Actor!]!
+  actorsConnection(after: String, first: Int, sort: [ActorSort], where: ActorWhere): ActorsConnection!
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
diff --git a/core/src/test/resources/tck-test-files/schema/v2/remove-deprecated/comments.adoc b/core/src/test/resources/tck-test-files/schema/v2/remove-deprecated/comments.adoc
index 50ec009b..bd8001ee 100644
--- a/core/src/test/resources/tck-test-files/schema/v2/remove-deprecated/comments.adoc
+++ b/core/src/test/resources/tck-test-files/schema/v2/remove-deprecated/comments.adoc
@@ -27,7 +27,7 @@ type Movie {
   averageRating: Float
   """
   Is the movie active?
-  
+
   This is measured based on annual profit.
   """
   isActive: Boolean
@@ -37,7 +37,7 @@ type Movie {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -149,8 +149,6 @@ input MovieWhere {
 
 ----
 
-'''
-
 == Relationship
 
 === Simple
@@ -170,7 +168,7 @@ type Movie {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -318,8 +316,6 @@ input MovieWhere {
 
 ----
 
-'''
-
 === Interface
 
 .Schema
@@ -351,7 +347,7 @@ type Actor {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -628,8 +624,6 @@ input SeriesWhere {
 
 ----
 
-'''
-
 === Unions
 
 .Schema
@@ -649,7 +643,7 @@ type Movie {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -818,6 +812,3 @@ input SearchWhere {
 }
 
 ----
-
-'''
-
diff --git a/core/src/test/resources/tck-test-files/schema/v2/remove-deprecated/comments.js.adoc b/core/src/test/resources/tck-test-files/schema/v2/remove-deprecated/comments.js.adoc
new file mode 100644
index 00000000..7b088b12
--- /dev/null
+++ b/core/src/test/resources/tck-test-files/schema/v2/remove-deprecated/comments.js.adoc
@@ -0,0 +1,871 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= Comments
+
+== Simple
+
+.Schema
+[source,graphql,schema=true]
+----
+"A custom scalar."
+scalar CustomScalar
+
+"An enumeration of movie genres."
+enum Genre {
+  ACTION
+  DRAMA
+  ROMANCE
+}
+
+"""A type describing a movie."""
+type Movie {
+  id: ID
+  "The number of actors who acted in the movie."
+  actorCount: Int
+  """The average rating for the movie."""
+  averageRating: Float
+  """
+  Is the movie active?
+  
+  This is measured based on annual profit.
+  """
+  isActive: Boolean
+  genre: Genre
+  customScalar: CustomScalar
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+"""A custom scalar."""
+scalar CustomScalar
+
+"""An enumeration of movie genres."""
+enum Genre {
+  ACTION
+  DRAMA
+  ROMANCE
+}
+
+"""A type describing a movie."""
+type Movie {
+  """The number of actors who acted in the movie."""
+  actorCount: Int
+  """The average rating for the movie."""
+  averageRating: Float
+  customScalar: CustomScalar
+  genre: Genre
+  id: ID
+  """
+  Is the movie active?
+  
+  This is measured based on annual profit.
+  """
+  isActive: Boolean
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MovieSort!]
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
+"""
+input MovieSort {
+  actorCount: SortDirection
+  averageRating: SortDirection
+  customScalar: SortDirection
+  genre: SortDirection
+  id: SortDirection
+  isActive: SortDirection
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  actorCount: Int
+  actorCount_GT: Int
+  actorCount_GTE: Int
+  actorCount_IN: [Int]
+  actorCount_LT: Int
+  actorCount_LTE: Int
+  averageRating: Float
+  averageRating_GT: Float
+  averageRating_GTE: Float
+  averageRating_IN: [Float]
+  averageRating_LT: Float
+  averageRating_LTE: Float
+  customScalar: CustomScalar
+  customScalar_IN: [CustomScalar]
+  genre: Genre
+  genre_IN: [Genre]
+  id: ID
+  id_CONTAINS: ID
+  id_ENDS_WITH: ID
+  id_IN: [ID]
+  id_STARTS_WITH: ID
+  isActive: Boolean
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+type Query {
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
+
+== Relationship
+
+=== Simple
+
+.Schema
+[source,graphql,schema=true]
+----
+type Actor {
+  name: String
+}
+
+type Movie {
+  id: ID
+  "Actors in Movie"
+  actors: [Actor!]! @relationship(type: "ACTED_IN", direction: IN)
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+type Actor {
+  name: String
+}
+
+type ActorEdge {
+  cursor: String!
+  node: Actor!
+}
+
+input ActorOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more ActorSort objects to sort Actors by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [ActorSort!]
+}
+
+"""
+Fields to sort Actors by. The order in which sorts are applied is not guaranteed when specifying many fields in one ActorSort object.
+"""
+input ActorSort {
+  name: SortDirection
+}
+
+input ActorWhere {
+  AND: [ActorWhere!]
+  NOT: ActorWhere
+  OR: [ActorWhere!]
+  name: String
+  name_CONTAINS: String
+  name_ENDS_WITH: String
+  name_IN: [String]
+  name_STARTS_WITH: String
+}
+
+type ActorsConnection {
+  edges: [ActorEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+type Movie {
+  """Actors in Movie"""
+  actors(directed: Boolean = true, options: ActorOptions, where: ActorWhere): [Actor!]!
+  actorsConnection(after: String, directed: Boolean = true, first: Int, sort: [MovieActorsConnectionSort!], where: MovieActorsConnectionWhere): MovieActorsConnection!
+  id: ID
+}
+
+type MovieActorsConnection {
+  edges: [MovieActorsRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input MovieActorsConnectionSort {
+  node: ActorSort
+}
+
+input MovieActorsConnectionWhere {
+  AND: [MovieActorsConnectionWhere!]
+  NOT: MovieActorsConnectionWhere
+  OR: [MovieActorsConnectionWhere!]
+  node: ActorWhere
+}
+
+type MovieActorsRelationship {
+  cursor: String!
+  node: Actor!
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MovieSort!]
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
+"""
+input MovieSort {
+  id: SortDirection
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  """
+  Return Movies where all of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_ALL: MovieActorsConnectionWhere
+  """
+  Return Movies where none of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_NONE: MovieActorsConnectionWhere
+  """
+  Return Movies where one of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SINGLE: MovieActorsConnectionWhere
+  """
+  Return Movies where some of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SOME: MovieActorsConnectionWhere
+  """Return Movies where all of the related Actors match this filter"""
+  actors_ALL: ActorWhere
+  """Return Movies where none of the related Actors match this filter"""
+  actors_NONE: ActorWhere
+  """Return Movies where one of the related Actors match this filter"""
+  actors_SINGLE: ActorWhere
+  """Return Movies where some of the related Actors match this filter"""
+  actors_SOME: ActorWhere
+  id: ID
+  id_CONTAINS: ID
+  id_ENDS_WITH: ID
+  id_IN: [ID]
+  id_STARTS_WITH: ID
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+type Query {
+  actors(options: ActorOptions, where: ActorWhere): [Actor!]!
+  actorsConnection(after: String, first: Int, sort: [ActorSort], where: ActorWhere): ActorsConnection!
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
+
+=== Interface
+
+.Schema
+[source,graphql,schema=true]
+----
+interface Production {
+  title: String!
+}
+
+type Movie implements Production {
+  title: String!
+  runtime: Int!
+}
+
+type Series implements Production {
+  title: String!
+  episodes: Int!
+}
+
+type ActedIn @relationshipProperties {
+  screenTime: Int!
+}
+
+type Actor {
+  name: String!
+  "Acted in Production"
+  actedIn: [Production!]! @relationship(type: "ACTED_IN", direction: OUT, properties: "ActedIn")
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+"""
+The edge properties for the following fields:
+* Actor.actedIn
+"""
+type ActedIn {
+  screenTime: Int!
+}
+
+input ActedInSort {
+  screenTime: SortDirection
+}
+
+input ActedInWhere {
+  AND: [ActedInWhere!]
+  NOT: ActedInWhere
+  OR: [ActedInWhere!]
+  screenTime: Int
+  screenTime_GT: Int
+  screenTime_GTE: Int
+  screenTime_IN: [Int!]
+  screenTime_LT: Int
+  screenTime_LTE: Int
+}
+
+type Actor {
+  """Acted in Production"""
+  actedIn(directed: Boolean = true, options: ProductionOptions, where: ProductionWhere): [Production!]!
+  actedInConnection(after: String, directed: Boolean = true, first: Int, sort: [ActorActedInConnectionSort!], where: ActorActedInConnectionWhere): ActorActedInConnection!
+  name: String!
+}
+
+type ActorActedInConnection {
+  edges: [ActorActedInRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input ActorActedInConnectionSort {
+  edge: ActedInSort
+  node: ProductionSort
+}
+
+input ActorActedInConnectionWhere {
+  AND: [ActorActedInConnectionWhere!]
+  NOT: ActorActedInConnectionWhere
+  OR: [ActorActedInConnectionWhere!]
+  edge: ActedInWhere
+  node: ProductionWhere
+}
+
+type ActorActedInRelationship {
+  cursor: String!
+  node: Production!
+  properties: ActedIn!
+}
+
+type ActorEdge {
+  cursor: String!
+  node: Actor!
+}
+
+input ActorOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more ActorSort objects to sort Actors by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [ActorSort!]
+}
+
+"""
+Fields to sort Actors by. The order in which sorts are applied is not guaranteed when specifying many fields in one ActorSort object.
+"""
+input ActorSort {
+  name: SortDirection
+}
+
+input ActorWhere {
+  AND: [ActorWhere!]
+  NOT: ActorWhere
+  OR: [ActorWhere!]
+  """
+  Return Actors where all of the related ActorActedInConnections match this filter
+  """
+  actedInConnection_ALL: ActorActedInConnectionWhere
+  """
+  Return Actors where none of the related ActorActedInConnections match this filter
+  """
+  actedInConnection_NONE: ActorActedInConnectionWhere
+  """
+  Return Actors where one of the related ActorActedInConnections match this filter
+  """
+  actedInConnection_SINGLE: ActorActedInConnectionWhere
+  """
+  Return Actors where some of the related ActorActedInConnections match this filter
+  """
+  actedInConnection_SOME: ActorActedInConnectionWhere
+  """Return Actors where all of the related Productions match this filter"""
+  actedIn_ALL: ProductionWhere
+  """Return Actors where none of the related Productions match this filter"""
+  actedIn_NONE: ProductionWhere
+  """Return Actors where one of the related Productions match this filter"""
+  actedIn_SINGLE: ProductionWhere
+  """Return Actors where some of the related Productions match this filter"""
+  actedIn_SOME: ProductionWhere
+  name: String
+  name_CONTAINS: String
+  name_ENDS_WITH: String
+  name_IN: [String!]
+  name_STARTS_WITH: String
+}
+
+type ActorsConnection {
+  edges: [ActorEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+type Movie implements Production {
+  runtime: Int!
+  title: String!
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MovieSort!]
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
+"""
+input MovieSort {
+  runtime: SortDirection
+  title: SortDirection
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  runtime: Int
+  runtime_GT: Int
+  runtime_GTE: Int
+  runtime_IN: [Int!]
+  runtime_LT: Int
+  runtime_LTE: Int
+  title: String
+  title_CONTAINS: String
+  title_ENDS_WITH: String
+  title_IN: [String!]
+  title_STARTS_WITH: String
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+interface Production {
+  title: String!
+}
+
+type ProductionEdge {
+  cursor: String!
+  node: Production!
+}
+
+enum ProductionImplementation {
+  Movie
+  Series
+}
+
+input ProductionOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more ProductionSort objects to sort Productions by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [ProductionSort]
+}
+
+"""
+Fields to sort Productions by. The order in which sorts are applied is not guaranteed when specifying many fields in one ProductionSort object.
+"""
+input ProductionSort {
+  title: SortDirection
+}
+
+input ProductionWhere {
+  AND: [ProductionWhere!]
+  NOT: ProductionWhere
+  OR: [ProductionWhere!]
+  title: String
+  title_CONTAINS: String
+  title_ENDS_WITH: String
+  title_IN: [String!]
+  title_STARTS_WITH: String
+  typename_IN: [ProductionImplementation!]
+}
+
+type ProductionsConnection {
+  edges: [ProductionEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+type Query {
+  actors(options: ActorOptions, where: ActorWhere): [Actor!]!
+  actorsConnection(after: String, first: Int, sort: [ActorSort], where: ActorWhere): ActorsConnection!
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+  productions(options: ProductionOptions, where: ProductionWhere): [Production!]!
+  productionsConnection(after: String, first: Int, sort: [ProductionSort], where: ProductionWhere): ProductionsConnection!
+  series(options: SeriesOptions, where: SeriesWhere): [Series!]!
+  seriesConnection(after: String, first: Int, sort: [SeriesSort], where: SeriesWhere): SeriesConnection!
+}
+
+type Series implements Production {
+  episodes: Int!
+  title: String!
+}
+
+type SeriesConnection {
+  edges: [SeriesEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+type SeriesEdge {
+  cursor: String!
+  node: Series!
+}
+
+input SeriesOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more SeriesSort objects to sort Series by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [SeriesSort!]
+}
+
+"""
+Fields to sort Series by. The order in which sorts are applied is not guaranteed when specifying many fields in one SeriesSort object.
+"""
+input SeriesSort {
+  episodes: SortDirection
+  title: SortDirection
+}
+
+input SeriesWhere {
+  AND: [SeriesWhere!]
+  NOT: SeriesWhere
+  OR: [SeriesWhere!]
+  episodes: Int
+  episodes_GT: Int
+  episodes_GTE: Int
+  episodes_IN: [Int!]
+  episodes_LT: Int
+  episodes_LTE: Int
+  title: String
+  title_CONTAINS: String
+  title_ENDS_WITH: String
+  title_IN: [String!]
+  title_STARTS_WITH: String
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
+
+=== Unions
+
+.Schema
+[source,graphql,schema=true]
+----
+union Search = Movie | Genre
+
+type Genre {
+  id: ID
+}
+
+type Movie {
+  id: ID
+  search: [Search!]! @relationship(type: "SEARCH", direction: OUT)
+  searchNoDirective: Search
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+type Genre {
+  id: ID
+}
+
+type GenreEdge {
+  cursor: String!
+  node: Genre!
+}
+
+input GenreOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more GenreSort objects to sort Genres by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [GenreSort!]
+}
+
+"""
+Fields to sort Genres by. The order in which sorts are applied is not guaranteed when specifying many fields in one GenreSort object.
+"""
+input GenreSort {
+  id: SortDirection
+}
+
+input GenreWhere {
+  AND: [GenreWhere!]
+  NOT: GenreWhere
+  OR: [GenreWhere!]
+  id: ID
+  id_CONTAINS: ID
+  id_ENDS_WITH: ID
+  id_IN: [ID]
+  id_STARTS_WITH: ID
+}
+
+type GenresConnection {
+  edges: [GenreEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+type Movie {
+  id: ID
+  search(directed: Boolean = true, options: QueryOptions, where: SearchWhere): [Search!]!
+  searchConnection(after: String, directed: Boolean = true, first: Int, where: MovieSearchConnectionWhere): MovieSearchConnection!
+  searchNoDirective: Search
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MovieSort!]
+}
+
+type MovieSearchConnection {
+  edges: [MovieSearchRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input MovieSearchConnectionWhere {
+  Genre: MovieSearchGenreConnectionWhere
+  Movie: MovieSearchMovieConnectionWhere
+}
+
+input MovieSearchGenreConnectionWhere {
+  AND: [MovieSearchGenreConnectionWhere!]
+  NOT: MovieSearchGenreConnectionWhere
+  OR: [MovieSearchGenreConnectionWhere!]
+  node: GenreWhere
+}
+
+input MovieSearchMovieConnectionWhere {
+  AND: [MovieSearchMovieConnectionWhere!]
+  NOT: MovieSearchMovieConnectionWhere
+  OR: [MovieSearchMovieConnectionWhere!]
+  node: MovieWhere
+}
+
+type MovieSearchRelationship {
+  cursor: String!
+  node: Search!
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
+"""
+input MovieSort {
+  id: SortDirection
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  id: ID
+  id_CONTAINS: ID
+  id_ENDS_WITH: ID
+  id_IN: [ID]
+  id_STARTS_WITH: ID
+  """
+  Return Movies where all of the related MovieSearchConnections match this filter
+  """
+  searchConnection_ALL: MovieSearchConnectionWhere
+  """
+  Return Movies where none of the related MovieSearchConnections match this filter
+  """
+  searchConnection_NONE: MovieSearchConnectionWhere
+  """
+  Return Movies where one of the related MovieSearchConnections match this filter
+  """
+  searchConnection_SINGLE: MovieSearchConnectionWhere
+  """
+  Return Movies where some of the related MovieSearchConnections match this filter
+  """
+  searchConnection_SOME: MovieSearchConnectionWhere
+  """Return Movies where all of the related Searches match this filter"""
+  search_ALL: SearchWhere
+  """Return Movies where none of the related Searches match this filter"""
+  search_NONE: SearchWhere
+  """Return Movies where one of the related Searches match this filter"""
+  search_SINGLE: SearchWhere
+  """Return Movies where some of the related Searches match this filter"""
+  search_SOME: SearchWhere
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+type Query {
+  genres(options: GenreOptions, where: GenreWhere): [Genre!]!
+  genresConnection(after: String, first: Int, sort: [GenreSort], where: GenreWhere): GenresConnection!
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+  searches(options: QueryOptions, where: SearchWhere): [Search!]!
+}
+
+"""Input type for options that can be specified on a query operation."""
+input QueryOptions {
+  limit: Int
+  offset: Int
+}
+
+union Search = Genre | Movie
+
+input SearchWhere {
+  Genre: GenreWhere
+  Movie: MovieWhere
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
diff --git a/core/src/test/resources/tck-test-files/schema/v2/scalar.adoc b/core/src/test/resources/tck-test-files/schema/v2/scalar.adoc
index 1e25bb1e..2926100b 100644
--- a/core/src/test/resources/tck-test-files/schema/v2/scalar.adoc
+++ b/core/src/test/resources/tck-test-files/schema/v2/scalar.adoc
@@ -19,7 +19,7 @@ type Movie {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -97,6 +97,3 @@ input MovieWhere {
 }
 
 ----
-
-'''
-
diff --git a/core/src/test/resources/tck-test-files/schema/v2/scalar.js.adoc b/core/src/test/resources/tck-test-files/schema/v2/scalar.js.adoc
new file mode 100644
index 00000000..323a817b
--- /dev/null
+++ b/core/src/test/resources/tck-test-files/schema/v2/scalar.js.adoc
@@ -0,0 +1,103 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= Scalar
+
+== Scalars
+
+.Schema
+[source,graphql,schema=true]
+----
+scalar CustomScalar
+
+type Movie {
+  id: ID
+  myCustomArrayScalar: [CustomScalar!]
+  myCustomScalar: CustomScalar
+  myRequiredCustomArrayScalar: [CustomScalar!]!
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+scalar CustomScalar
+
+type Movie {
+  id: ID
+  myCustomArrayScalar: [CustomScalar!]
+  myCustomScalar: CustomScalar
+  myRequiredCustomArrayScalar: [CustomScalar!]!
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MovieSort!]
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
+"""
+input MovieSort {
+  id: SortDirection
+  myCustomScalar: SortDirection
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  id: ID
+  id_CONTAINS: ID
+  id_ENDS_WITH: ID
+  id_IN: [ID]
+  id_STARTS_WITH: ID
+  myCustomArrayScalar: [CustomScalar!]
+  myCustomArrayScalar_INCLUDES: CustomScalar
+  myCustomScalar: CustomScalar
+  myCustomScalar_IN: [CustomScalar]
+  myRequiredCustomArrayScalar: [CustomScalar!]
+  myRequiredCustomArrayScalar_INCLUDES: CustomScalar
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+type Query {
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
diff --git a/core/src/test/resources/tck-test-files/schema/v2/simple.adoc b/core/src/test/resources/tck-test-files/schema/v2/simple.adoc
index 715d3f86..6875b8b7 100644
--- a/core/src/test/resources/tck-test-files/schema/v2/simple.adoc
+++ b/core/src/test/resources/tck-test-files/schema/v2/simple.adoc
@@ -17,7 +17,7 @@ type Movie {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -102,6 +102,3 @@ input MovieWhere {
 }
 
 ----
-
-'''
-
diff --git a/core/src/test/resources/tck-test-files/schema/v2/simple.js.adoc b/core/src/test/resources/tck-test-files/schema/v2/simple.js.adoc
new file mode 100644
index 00000000..f52ae13f
--- /dev/null
+++ b/core/src/test/resources/tck-test-files/schema/v2/simple.js.adoc
@@ -0,0 +1,108 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= Simple
+
+== Simple
+
+.Schema
+[source,graphql,schema=true]
+----
+type Movie {
+  id: ID
+  actorCount: Int
+  averageRating: Float
+  isActive: Boolean
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+type Movie {
+  actorCount: Int
+  averageRating: Float
+  id: ID
+  isActive: Boolean
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MovieSort!]
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
+"""
+input MovieSort {
+  actorCount: SortDirection
+  averageRating: SortDirection
+  id: SortDirection
+  isActive: SortDirection
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  actorCount: Int
+  actorCount_GT: Int
+  actorCount_GTE: Int
+  actorCount_IN: [Int]
+  actorCount_LT: Int
+  actorCount_LTE: Int
+  averageRating: Float
+  averageRating_GT: Float
+  averageRating_GTE: Float
+  averageRating_IN: [Float]
+  averageRating_LT: Float
+  averageRating_LTE: Float
+  id: ID
+  id_CONTAINS: ID
+  id_ENDS_WITH: ID
+  id_IN: [ID]
+  id_STARTS_WITH: ID
+  isActive: Boolean
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+type Query {
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
diff --git a/core/src/test/resources/tck-test-files/schema/v2/string-comparators.adoc b/core/src/test/resources/tck-test-files/schema/v2/string-comparators.adoc
index c78e0ffd..11a77378 100644
--- a/core/src/test/resources/tck-test-files/schema/v2/string-comparators.adoc
+++ b/core/src/test/resources/tck-test-files/schema/v2/string-comparators.adoc
@@ -17,13 +17,13 @@ type Movie {
 [source,json,schema-config=true]
 ----
 {
-  "features": {
-    "filters": {
-      "String": {
-        "LT": true,
-        "GT": true,
-        "GTE": true,
-        "LTE": true
+  "features" : {
+    "filters" : {
+      "String" : {
+        "LT" : true,
+        "GT" : true,
+        "GTE" : true,
+        "LTE" : true
       }
     }
   }
@@ -31,7 +31,7 @@ type Movie {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -102,8 +102,6 @@ input MovieWhere {
 
 ----
 
-'''
-
 == String comparators should not be present if not explicitly defined in the configuration
 
 .Schema
@@ -115,7 +113,7 @@ type Movie {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -182,8 +180,6 @@ input MovieWhere {
 
 ----
 
-'''
-
 == If String comparators are partially defined, then only the defined ones should be present
 
 .Schema
@@ -198,12 +194,12 @@ type Movie {
 [source,json,schema-config=true]
 ----
 {
-  "features": {
-    "filters": {
-      "String": {
-        "LT": true,
-        "GT": true,
-        "LTE": false
+  "features" : {
+    "filters" : {
+      "String" : {
+        "LT" : true,
+        "GT" : true,
+        "LTE" : false
       }
     }
   }
@@ -211,7 +207,7 @@ type Movie {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -280,8 +276,6 @@ input MovieWhere {
 
 ----
 
-'''
-
 == string comparator relationship and relationship properties
 
 .Schema
@@ -306,13 +300,13 @@ type Actor {
 [source,json,schema-config=true]
 ----
 {
-  "features": {
-    "filters": {
-      "String": {
-        "LT": true,
-        "GT": true,
-        "LTE": true,
-        "GTE": true
+  "features" : {
+    "filters" : {
+      "String" : {
+        "LT" : true,
+        "GT" : true,
+        "LTE" : true,
+        "GTE" : true
       }
     }
   }
@@ -320,7 +314,7 @@ type Actor {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -548,6 +542,3 @@ input MovieWhere {
 }
 
 ----
-
-'''
-
diff --git a/core/src/test/resources/tck-test-files/schema/v2/string-comparators.js.adoc b/core/src/test/resources/tck-test-files/schema/v2/string-comparators.js.adoc
new file mode 100644
index 00000000..5f2c2810
--- /dev/null
+++ b/core/src/test/resources/tck-test-files/schema/v2/string-comparators.js.adoc
@@ -0,0 +1,577 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= String Comparators
+
+== String comparators should be present if explicitly defined in the configuration
+
+.Schema
+[source,graphql,schema=true]
+----
+type Movie {
+  title: String
+}
+----
+
+.Configuration
+[source,json,schema-config=true]
+----
+{
+  "features": {
+    "filters": {
+      "String": {
+        "LT": true,
+        "GT": true,
+        "GTE": true,
+        "LTE": true
+      }
+    }
+  }
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+type Movie {
+  title: String
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MovieSort!]
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
+"""
+input MovieSort {
+  title: SortDirection
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  title: String
+  title_CONTAINS: String
+  title_ENDS_WITH: String
+  title_GT: String
+  title_GTE: String
+  title_IN: [String]
+  title_LT: String
+  title_LTE: String
+  title_STARTS_WITH: String
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+type Query {
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
+
+== String comparators should not be present if not explicitly defined in the configuration
+
+.Schema
+[source,graphql,schema=true]
+----
+type Movie {
+  title: String
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+type Movie {
+  title: String
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MovieSort!]
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
+"""
+input MovieSort {
+  title: SortDirection
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  title: String
+  title_CONTAINS: String
+  title_ENDS_WITH: String
+  title_IN: [String]
+  title_STARTS_WITH: String
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+type Query {
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
+
+== If String comparators are partially defined, then only the defined ones should be present
+
+.Schema
+[source,graphql,schema=true]
+----
+type Movie {
+  title: String
+}
+----
+
+.Configuration
+[source,json,schema-config=true]
+----
+{
+  "features": {
+    "filters": {
+      "String": {
+        "LT": true,
+        "GT": true,
+        "LTE": false
+      }
+    }
+  }
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+type Movie {
+  title: String
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MovieSort!]
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
+"""
+input MovieSort {
+  title: SortDirection
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  title: String
+  title_CONTAINS: String
+  title_ENDS_WITH: String
+  title_GT: String
+  title_IN: [String]
+  title_LT: String
+  title_STARTS_WITH: String
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+type Query {
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
+
+== string comparator relationship and relationship properties
+
+.Schema
+[source,graphql,schema=true]
+----
+type Movie {
+  title: String
+  actors: [Actor!]! @relationship(type: "ACTED_IN", direction: IN, properties: "ActedIn")
+}
+
+type ActedIn @relationshipProperties {
+  screenTime: String
+}
+
+type Actor {
+  name: String
+  actedIn: [Movie!]! @relationship(type: "ACTED_IN", direction: OUT, properties: "ActedIn")
+}
+----
+
+.Configuration
+[source,json,schema-config=true]
+----
+{
+  "features": {
+    "filters": {
+      "String": {
+        "LT": true,
+        "GT": true,
+        "LTE": true,
+        "GTE": true
+      }
+    }
+  }
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+"""
+The edge properties for the following fields:
+* Movie.actors
+* Actor.actedIn
+"""
+type ActedIn {
+  screenTime: String
+}
+
+input ActedInSort {
+  screenTime: SortDirection
+}
+
+input ActedInWhere {
+  AND: [ActedInWhere!]
+  NOT: ActedInWhere
+  OR: [ActedInWhere!]
+  screenTime: String
+  screenTime_CONTAINS: String
+  screenTime_ENDS_WITH: String
+  screenTime_GT: String
+  screenTime_GTE: String
+  screenTime_IN: [String]
+  screenTime_LT: String
+  screenTime_LTE: String
+  screenTime_STARTS_WITH: String
+}
+
+type Actor {
+  actedIn(directed: Boolean = true, options: MovieOptions, where: MovieWhere): [Movie!]!
+  actedInConnection(after: String, directed: Boolean = true, first: Int, sort: [ActorActedInConnectionSort!], where: ActorActedInConnectionWhere): ActorActedInConnection!
+  name: String
+}
+
+type ActorActedInConnection {
+  edges: [ActorActedInRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input ActorActedInConnectionSort {
+  edge: ActedInSort
+  node: MovieSort
+}
+
+input ActorActedInConnectionWhere {
+  AND: [ActorActedInConnectionWhere!]
+  NOT: ActorActedInConnectionWhere
+  OR: [ActorActedInConnectionWhere!]
+  edge: ActedInWhere
+  node: MovieWhere
+}
+
+type ActorActedInRelationship {
+  cursor: String!
+  node: Movie!
+  properties: ActedIn!
+}
+
+type ActorEdge {
+  cursor: String!
+  node: Actor!
+}
+
+input ActorOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more ActorSort objects to sort Actors by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [ActorSort!]
+}
+
+"""
+Fields to sort Actors by. The order in which sorts are applied is not guaranteed when specifying many fields in one ActorSort object.
+"""
+input ActorSort {
+  name: SortDirection
+}
+
+input ActorWhere {
+  AND: [ActorWhere!]
+  NOT: ActorWhere
+  OR: [ActorWhere!]
+  """
+  Return Actors where all of the related ActorActedInConnections match this filter
+  """
+  actedInConnection_ALL: ActorActedInConnectionWhere
+  """
+  Return Actors where none of the related ActorActedInConnections match this filter
+  """
+  actedInConnection_NONE: ActorActedInConnectionWhere
+  """
+  Return Actors where one of the related ActorActedInConnections match this filter
+  """
+  actedInConnection_SINGLE: ActorActedInConnectionWhere
+  """
+  Return Actors where some of the related ActorActedInConnections match this filter
+  """
+  actedInConnection_SOME: ActorActedInConnectionWhere
+  """Return Actors where all of the related Movies match this filter"""
+  actedIn_ALL: MovieWhere
+  """Return Actors where none of the related Movies match this filter"""
+  actedIn_NONE: MovieWhere
+  """Return Actors where one of the related Movies match this filter"""
+  actedIn_SINGLE: MovieWhere
+  """Return Actors where some of the related Movies match this filter"""
+  actedIn_SOME: MovieWhere
+  name: String
+  name_CONTAINS: String
+  name_ENDS_WITH: String
+  name_GT: String
+  name_GTE: String
+  name_IN: [String]
+  name_LT: String
+  name_LTE: String
+  name_STARTS_WITH: String
+}
+
+type ActorsConnection {
+  edges: [ActorEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+type Movie {
+  actors(directed: Boolean = true, options: ActorOptions, where: ActorWhere): [Actor!]!
+  actorsConnection(after: String, directed: Boolean = true, first: Int, sort: [MovieActorsConnectionSort!], where: MovieActorsConnectionWhere): MovieActorsConnection!
+  title: String
+}
+
+type MovieActorsConnection {
+  edges: [MovieActorsRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input MovieActorsConnectionSort {
+  edge: ActedInSort
+  node: ActorSort
+}
+
+input MovieActorsConnectionWhere {
+  AND: [MovieActorsConnectionWhere!]
+  NOT: MovieActorsConnectionWhere
+  OR: [MovieActorsConnectionWhere!]
+  edge: ActedInWhere
+  node: ActorWhere
+}
+
+type MovieActorsRelationship {
+  cursor: String!
+  node: Actor!
+  properties: ActedIn!
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MovieSort!]
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
+"""
+input MovieSort {
+  title: SortDirection
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  """
+  Return Movies where all of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_ALL: MovieActorsConnectionWhere
+  """
+  Return Movies where none of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_NONE: MovieActorsConnectionWhere
+  """
+  Return Movies where one of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SINGLE: MovieActorsConnectionWhere
+  """
+  Return Movies where some of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SOME: MovieActorsConnectionWhere
+  """Return Movies where all of the related Actors match this filter"""
+  actors_ALL: ActorWhere
+  """Return Movies where none of the related Actors match this filter"""
+  actors_NONE: ActorWhere
+  """Return Movies where one of the related Actors match this filter"""
+  actors_SINGLE: ActorWhere
+  """Return Movies where some of the related Actors match this filter"""
+  actors_SOME: ActorWhere
+  title: String
+  title_CONTAINS: String
+  title_ENDS_WITH: String
+  title_GT: String
+  title_GTE: String
+  title_IN: [String]
+  title_LT: String
+  title_LTE: String
+  title_STARTS_WITH: String
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+type Query {
+  actors(options: ActorOptions, where: ActorWhere): [Actor!]!
+  actorsConnection(after: String, first: Int, sort: [ActorSort], where: ActorWhere): ActorsConnection!
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
diff --git a/core/src/test/resources/tck-test-files/schema/v2/subscriptions.adoc b/core/src/test/resources/tck-test-files/schema/v2/subscriptions.adoc
index 2b74111a..cf05bdfe 100644
--- a/core/src/test/resources/tck-test-files/schema/v2/subscriptions.adoc
+++ b/core/src/test/resources/tck-test-files/schema/v2/subscriptions.adoc
@@ -22,7 +22,7 @@ type Actor {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -188,8 +188,6 @@ input MovieWhere {
 
 ----
 
-'''
-
 == Empty EventPayload type
 
 .Schema
@@ -209,7 +207,7 @@ type Actor {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -398,8 +396,6 @@ input MovieWhere {
 
 ----
 
-'''
-
 == Empty EventPayload type on Union type
 
 .Schema
@@ -425,7 +421,7 @@ type Person {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -707,8 +703,6 @@ input StarWhere {
 
 ----
 
-'''
-
 == Empty EventPayload type, but @relationshipProperty exists
 
 .Schema
@@ -732,7 +726,7 @@ type Actor {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -950,6 +944,3 @@ input MovieWhere {
 }
 
 ----
-
-'''
-
diff --git a/core/src/test/resources/tck-test-files/schema/v2/subscriptions.js.adoc b/core/src/test/resources/tck-test-files/schema/v2/subscriptions.js.adoc
new file mode 100644
index 00000000..67086a4d
--- /dev/null
+++ b/core/src/test/resources/tck-test-files/schema/v2/subscriptions.js.adoc
@@ -0,0 +1,1027 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= Subscriptions
+
+== Subscriptions
+
+.Schema
+[source,graphql,schema=true]
+----
+type Movie {
+  id: ID
+  actorCount: Int
+  averageRating: Float
+  isActive: Boolean
+  actors: [Actor!]! @relationship(type: "ACTED_IN", direction: IN)
+}
+
+type Actor {
+  name: String!
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+type Actor {
+  name: String!
+}
+
+type ActorEdge {
+  cursor: String!
+  node: Actor!
+}
+
+input ActorOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more ActorSort objects to sort Actors by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [ActorSort!]
+}
+
+"""
+Fields to sort Actors by. The order in which sorts are applied is not guaranteed when specifying many fields in one ActorSort object.
+"""
+input ActorSort {
+  name: SortDirection
+}
+
+input ActorWhere {
+  AND: [ActorWhere!]
+  NOT: ActorWhere
+  OR: [ActorWhere!]
+  name: String
+  name_CONTAINS: String
+  name_ENDS_WITH: String
+  name_IN: [String!]
+  name_STARTS_WITH: String
+}
+
+type ActorsConnection {
+  edges: [ActorEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+type Movie {
+  actorCount: Int
+  actors(directed: Boolean = true, options: ActorOptions, where: ActorWhere): [Actor!]!
+  actorsConnection(after: String, directed: Boolean = true, first: Int, sort: [MovieActorsConnectionSort!], where: MovieActorsConnectionWhere): MovieActorsConnection!
+  averageRating: Float
+  id: ID
+  isActive: Boolean
+}
+
+type MovieActorsConnection {
+  edges: [MovieActorsRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input MovieActorsConnectionSort {
+  node: ActorSort
+}
+
+input MovieActorsConnectionWhere {
+  AND: [MovieActorsConnectionWhere!]
+  NOT: MovieActorsConnectionWhere
+  OR: [MovieActorsConnectionWhere!]
+  node: ActorWhere
+}
+
+type MovieActorsRelationship {
+  cursor: String!
+  node: Actor!
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MovieSort!]
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
+"""
+input MovieSort {
+  actorCount: SortDirection
+  averageRating: SortDirection
+  id: SortDirection
+  isActive: SortDirection
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  actorCount: Int
+  actorCount_GT: Int
+  actorCount_GTE: Int
+  actorCount_IN: [Int]
+  actorCount_LT: Int
+  actorCount_LTE: Int
+  """
+  Return Movies where all of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_ALL: MovieActorsConnectionWhere
+  """
+  Return Movies where none of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_NONE: MovieActorsConnectionWhere
+  """
+  Return Movies where one of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SINGLE: MovieActorsConnectionWhere
+  """
+  Return Movies where some of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SOME: MovieActorsConnectionWhere
+  """Return Movies where all of the related Actors match this filter"""
+  actors_ALL: ActorWhere
+  """Return Movies where none of the related Actors match this filter"""
+  actors_NONE: ActorWhere
+  """Return Movies where one of the related Actors match this filter"""
+  actors_SINGLE: ActorWhere
+  """Return Movies where some of the related Actors match this filter"""
+  actors_SOME: ActorWhere
+  averageRating: Float
+  averageRating_GT: Float
+  averageRating_GTE: Float
+  averageRating_IN: [Float]
+  averageRating_LT: Float
+  averageRating_LTE: Float
+  id: ID
+  id_CONTAINS: ID
+  id_ENDS_WITH: ID
+  id_IN: [ID]
+  id_STARTS_WITH: ID
+  isActive: Boolean
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+type Query {
+  actors(options: ActorOptions, where: ActorWhere): [Actor!]!
+  actorsConnection(after: String, first: Int, sort: [ActorSort], where: ActorWhere): ActorsConnection!
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
+
+== Empty EventPayload type
+
+.Schema
+[source,graphql,schema=true]
+----
+type Movie {
+  id: ID
+  actorCount: Int
+  averageRating: Float
+  isActive: Boolean
+  actors: [Actor!]! @relationship(type: "ACTED_IN", direction: IN)
+}
+
+type Actor {
+  movies: [Movie!]! @relationship(type: "ACTED_IN", direction: OUT)
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+type Actor {
+  movies(directed: Boolean = true, options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, directed: Boolean = true, first: Int, sort: [ActorMoviesConnectionSort!], where: ActorMoviesConnectionWhere): ActorMoviesConnection!
+}
+
+type ActorEdge {
+  cursor: String!
+  node: Actor!
+}
+
+type ActorMoviesConnection {
+  edges: [ActorMoviesRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input ActorMoviesConnectionSort {
+  node: MovieSort
+}
+
+input ActorMoviesConnectionWhere {
+  AND: [ActorMoviesConnectionWhere!]
+  NOT: ActorMoviesConnectionWhere
+  OR: [ActorMoviesConnectionWhere!]
+  node: MovieWhere
+}
+
+type ActorMoviesRelationship {
+  cursor: String!
+  node: Movie!
+}
+
+input ActorOptions {
+  limit: Int
+  offset: Int
+}
+
+input ActorWhere {
+  AND: [ActorWhere!]
+  NOT: ActorWhere
+  OR: [ActorWhere!]
+  """
+  Return Actors where all of the related ActorMoviesConnections match this filter
+  """
+  moviesConnection_ALL: ActorMoviesConnectionWhere
+  """
+  Return Actors where none of the related ActorMoviesConnections match this filter
+  """
+  moviesConnection_NONE: ActorMoviesConnectionWhere
+  """
+  Return Actors where one of the related ActorMoviesConnections match this filter
+  """
+  moviesConnection_SINGLE: ActorMoviesConnectionWhere
+  """
+  Return Actors where some of the related ActorMoviesConnections match this filter
+  """
+  moviesConnection_SOME: ActorMoviesConnectionWhere
+  """Return Actors where all of the related Movies match this filter"""
+  movies_ALL: MovieWhere
+  """Return Actors where none of the related Movies match this filter"""
+  movies_NONE: MovieWhere
+  """Return Actors where one of the related Movies match this filter"""
+  movies_SINGLE: MovieWhere
+  """Return Actors where some of the related Movies match this filter"""
+  movies_SOME: MovieWhere
+}
+
+type ActorsConnection {
+  edges: [ActorEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+type Movie {
+  actorCount: Int
+  actors(directed: Boolean = true, options: ActorOptions, where: ActorWhere): [Actor!]!
+  actorsConnection(after: String, directed: Boolean = true, first: Int, where: MovieActorsConnectionWhere): MovieActorsConnection!
+  averageRating: Float
+  id: ID
+  isActive: Boolean
+}
+
+type MovieActorsConnection {
+  edges: [MovieActorsRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input MovieActorsConnectionWhere {
+  AND: [MovieActorsConnectionWhere!]
+  NOT: MovieActorsConnectionWhere
+  OR: [MovieActorsConnectionWhere!]
+  node: ActorWhere
+}
+
+type MovieActorsRelationship {
+  cursor: String!
+  node: Actor!
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MovieSort!]
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
+"""
+input MovieSort {
+  actorCount: SortDirection
+  averageRating: SortDirection
+  id: SortDirection
+  isActive: SortDirection
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  actorCount: Int
+  actorCount_GT: Int
+  actorCount_GTE: Int
+  actorCount_IN: [Int]
+  actorCount_LT: Int
+  actorCount_LTE: Int
+  """
+  Return Movies where all of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_ALL: MovieActorsConnectionWhere
+  """
+  Return Movies where none of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_NONE: MovieActorsConnectionWhere
+  """
+  Return Movies where one of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SINGLE: MovieActorsConnectionWhere
+  """
+  Return Movies where some of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SOME: MovieActorsConnectionWhere
+  """Return Movies where all of the related Actors match this filter"""
+  actors_ALL: ActorWhere
+  """Return Movies where none of the related Actors match this filter"""
+  actors_NONE: ActorWhere
+  """Return Movies where one of the related Actors match this filter"""
+  actors_SINGLE: ActorWhere
+  """Return Movies where some of the related Actors match this filter"""
+  actors_SOME: ActorWhere
+  averageRating: Float
+  averageRating_GT: Float
+  averageRating_GTE: Float
+  averageRating_IN: [Float]
+  averageRating_LT: Float
+  averageRating_LTE: Float
+  id: ID
+  id_CONTAINS: ID
+  id_ENDS_WITH: ID
+  id_IN: [ID]
+  id_STARTS_WITH: ID
+  isActive: Boolean
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+type Query {
+  actors(options: ActorOptions, where: ActorWhere): [Actor!]!
+  actorsConnection(after: String, first: Int, where: ActorWhere): ActorsConnection!
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
+
+== Empty EventPayload type on Union type
+
+.Schema
+[source,graphql,schema=true]
+----
+type Movie {
+  id: ID
+  actorCount: Int
+  averageRating: Float
+  isActive: Boolean
+  actors: [Actor!]! @relationship(type: "ACTED_IN", direction: IN)
+}
+
+union Actor = Star | Person
+
+type Star {
+  movies: [Movie!]! @relationship(type: "ACTED_IN", direction: OUT)
+}
+
+type Person {
+  movies: [Movie!]! @relationship(type: "ACTED_IN", direction: OUT)
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+union Actor = Person | Star
+
+input ActorWhere {
+  Person: PersonWhere
+  Star: StarWhere
+}
+
+type Movie {
+  actorCount: Int
+  actors(directed: Boolean = true, options: QueryOptions, where: ActorWhere): [Actor!]!
+  actorsConnection(after: String, directed: Boolean = true, first: Int, where: MovieActorsConnectionWhere): MovieActorsConnection!
+  averageRating: Float
+  id: ID
+  isActive: Boolean
+}
+
+type MovieActorsConnection {
+  edges: [MovieActorsRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input MovieActorsConnectionWhere {
+  Person: MovieActorsPersonConnectionWhere
+  Star: MovieActorsStarConnectionWhere
+}
+
+input MovieActorsPersonConnectionWhere {
+  AND: [MovieActorsPersonConnectionWhere!]
+  NOT: MovieActorsPersonConnectionWhere
+  OR: [MovieActorsPersonConnectionWhere!]
+  node: PersonWhere
+}
+
+type MovieActorsRelationship {
+  cursor: String!
+  node: Actor!
+}
+
+input MovieActorsStarConnectionWhere {
+  AND: [MovieActorsStarConnectionWhere!]
+  NOT: MovieActorsStarConnectionWhere
+  OR: [MovieActorsStarConnectionWhere!]
+  node: StarWhere
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MovieSort!]
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
+"""
+input MovieSort {
+  actorCount: SortDirection
+  averageRating: SortDirection
+  id: SortDirection
+  isActive: SortDirection
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  actorCount: Int
+  actorCount_GT: Int
+  actorCount_GTE: Int
+  actorCount_IN: [Int]
+  actorCount_LT: Int
+  actorCount_LTE: Int
+  """
+  Return Movies where all of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_ALL: MovieActorsConnectionWhere
+  """
+  Return Movies where none of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_NONE: MovieActorsConnectionWhere
+  """
+  Return Movies where one of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SINGLE: MovieActorsConnectionWhere
+  """
+  Return Movies where some of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SOME: MovieActorsConnectionWhere
+  """Return Movies where all of the related Actors match this filter"""
+  actors_ALL: ActorWhere
+  """Return Movies where none of the related Actors match this filter"""
+  actors_NONE: ActorWhere
+  """Return Movies where one of the related Actors match this filter"""
+  actors_SINGLE: ActorWhere
+  """Return Movies where some of the related Actors match this filter"""
+  actors_SOME: ActorWhere
+  averageRating: Float
+  averageRating_GT: Float
+  averageRating_GTE: Float
+  averageRating_IN: [Float]
+  averageRating_LT: Float
+  averageRating_LTE: Float
+  id: ID
+  id_CONTAINS: ID
+  id_ENDS_WITH: ID
+  id_IN: [ID]
+  id_STARTS_WITH: ID
+  isActive: Boolean
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+type PeopleConnection {
+  edges: [PersonEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+type Person {
+  movies(directed: Boolean = true, options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, directed: Boolean = true, first: Int, sort: [PersonMoviesConnectionSort!], where: PersonMoviesConnectionWhere): PersonMoviesConnection!
+}
+
+type PersonEdge {
+  cursor: String!
+  node: Person!
+}
+
+type PersonMoviesConnection {
+  edges: [PersonMoviesRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input PersonMoviesConnectionSort {
+  node: MovieSort
+}
+
+input PersonMoviesConnectionWhere {
+  AND: [PersonMoviesConnectionWhere!]
+  NOT: PersonMoviesConnectionWhere
+  OR: [PersonMoviesConnectionWhere!]
+  node: MovieWhere
+}
+
+type PersonMoviesRelationship {
+  cursor: String!
+  node: Movie!
+}
+
+input PersonOptions {
+  limit: Int
+  offset: Int
+}
+
+input PersonWhere {
+  AND: [PersonWhere!]
+  NOT: PersonWhere
+  OR: [PersonWhere!]
+  """
+  Return People where all of the related PersonMoviesConnections match this filter
+  """
+  moviesConnection_ALL: PersonMoviesConnectionWhere
+  """
+  Return People where none of the related PersonMoviesConnections match this filter
+  """
+  moviesConnection_NONE: PersonMoviesConnectionWhere
+  """
+  Return People where one of the related PersonMoviesConnections match this filter
+  """
+  moviesConnection_SINGLE: PersonMoviesConnectionWhere
+  """
+  Return People where some of the related PersonMoviesConnections match this filter
+  """
+  moviesConnection_SOME: PersonMoviesConnectionWhere
+  """Return People where all of the related Movies match this filter"""
+  movies_ALL: MovieWhere
+  """Return People where none of the related Movies match this filter"""
+  movies_NONE: MovieWhere
+  """Return People where one of the related Movies match this filter"""
+  movies_SINGLE: MovieWhere
+  """Return People where some of the related Movies match this filter"""
+  movies_SOME: MovieWhere
+}
+
+type Query {
+  actors(options: QueryOptions, where: ActorWhere): [Actor!]!
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+  people(options: PersonOptions, where: PersonWhere): [Person!]!
+  peopleConnection(after: String, first: Int, where: PersonWhere): PeopleConnection!
+  stars(options: StarOptions, where: StarWhere): [Star!]!
+  starsConnection(after: String, first: Int, where: StarWhere): StarsConnection!
+}
+
+"""Input type for options that can be specified on a query operation."""
+input QueryOptions {
+  limit: Int
+  offset: Int
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+
+type Star {
+  movies(directed: Boolean = true, options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, directed: Boolean = true, first: Int, sort: [StarMoviesConnectionSort!], where: StarMoviesConnectionWhere): StarMoviesConnection!
+}
+
+type StarEdge {
+  cursor: String!
+  node: Star!
+}
+
+type StarMoviesConnection {
+  edges: [StarMoviesRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input StarMoviesConnectionSort {
+  node: MovieSort
+}
+
+input StarMoviesConnectionWhere {
+  AND: [StarMoviesConnectionWhere!]
+  NOT: StarMoviesConnectionWhere
+  OR: [StarMoviesConnectionWhere!]
+  node: MovieWhere
+}
+
+type StarMoviesRelationship {
+  cursor: String!
+  node: Movie!
+}
+
+input StarOptions {
+  limit: Int
+  offset: Int
+}
+
+input StarWhere {
+  AND: [StarWhere!]
+  NOT: StarWhere
+  OR: [StarWhere!]
+  """
+  Return Stars where all of the related StarMoviesConnections match this filter
+  """
+  moviesConnection_ALL: StarMoviesConnectionWhere
+  """
+  Return Stars where none of the related StarMoviesConnections match this filter
+  """
+  moviesConnection_NONE: StarMoviesConnectionWhere
+  """
+  Return Stars where one of the related StarMoviesConnections match this filter
+  """
+  moviesConnection_SINGLE: StarMoviesConnectionWhere
+  """
+  Return Stars where some of the related StarMoviesConnections match this filter
+  """
+  moviesConnection_SOME: StarMoviesConnectionWhere
+  """Return Stars where all of the related Movies match this filter"""
+  movies_ALL: MovieWhere
+  """Return Stars where none of the related Movies match this filter"""
+  movies_NONE: MovieWhere
+  """Return Stars where one of the related Movies match this filter"""
+  movies_SINGLE: MovieWhere
+  """Return Stars where some of the related Movies match this filter"""
+  movies_SOME: MovieWhere
+}
+
+type StarsConnection {
+  edges: [StarEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+----
+
+== Empty EventPayload type, but @relationshipProperty exists
+
+.Schema
+[source,graphql,schema=true]
+----
+type Movie {
+  id: ID
+  actorCount: Int
+  averageRating: Float
+  isActive: Boolean
+  actors: [Actor!]! @relationship(type: "ACTED_IN", properties: "ActedIn", direction: IN)
+}
+
+type ActedIn @relationshipProperties {
+  screenTime: Int!
+}
+
+type Actor {
+  movies: [Movie!]! @relationship(type: "ACTED_IN", direction: OUT)
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+"""
+The edge properties for the following fields:
+* Movie.actors
+"""
+type ActedIn {
+  screenTime: Int!
+}
+
+input ActedInSort {
+  screenTime: SortDirection
+}
+
+input ActedInWhere {
+  AND: [ActedInWhere!]
+  NOT: ActedInWhere
+  OR: [ActedInWhere!]
+  screenTime: Int
+  screenTime_GT: Int
+  screenTime_GTE: Int
+  screenTime_IN: [Int!]
+  screenTime_LT: Int
+  screenTime_LTE: Int
+}
+
+type Actor {
+  movies(directed: Boolean = true, options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, directed: Boolean = true, first: Int, sort: [ActorMoviesConnectionSort!], where: ActorMoviesConnectionWhere): ActorMoviesConnection!
+}
+
+type ActorEdge {
+  cursor: String!
+  node: Actor!
+}
+
+type ActorMoviesConnection {
+  edges: [ActorMoviesRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input ActorMoviesConnectionSort {
+  node: MovieSort
+}
+
+input ActorMoviesConnectionWhere {
+  AND: [ActorMoviesConnectionWhere!]
+  NOT: ActorMoviesConnectionWhere
+  OR: [ActorMoviesConnectionWhere!]
+  node: MovieWhere
+}
+
+type ActorMoviesRelationship {
+  cursor: String!
+  node: Movie!
+}
+
+input ActorOptions {
+  limit: Int
+  offset: Int
+}
+
+input ActorWhere {
+  AND: [ActorWhere!]
+  NOT: ActorWhere
+  OR: [ActorWhere!]
+  """
+  Return Actors where all of the related ActorMoviesConnections match this filter
+  """
+  moviesConnection_ALL: ActorMoviesConnectionWhere
+  """
+  Return Actors where none of the related ActorMoviesConnections match this filter
+  """
+  moviesConnection_NONE: ActorMoviesConnectionWhere
+  """
+  Return Actors where one of the related ActorMoviesConnections match this filter
+  """
+  moviesConnection_SINGLE: ActorMoviesConnectionWhere
+  """
+  Return Actors where some of the related ActorMoviesConnections match this filter
+  """
+  moviesConnection_SOME: ActorMoviesConnectionWhere
+  """Return Actors where all of the related Movies match this filter"""
+  movies_ALL: MovieWhere
+  """Return Actors where none of the related Movies match this filter"""
+  movies_NONE: MovieWhere
+  """Return Actors where one of the related Movies match this filter"""
+  movies_SINGLE: MovieWhere
+  """Return Actors where some of the related Movies match this filter"""
+  movies_SOME: MovieWhere
+}
+
+type ActorsConnection {
+  edges: [ActorEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+type Movie {
+  actorCount: Int
+  actors(directed: Boolean = true, options: ActorOptions, where: ActorWhere): [Actor!]!
+  actorsConnection(after: String, directed: Boolean = true, first: Int, sort: [MovieActorsConnectionSort!], where: MovieActorsConnectionWhere): MovieActorsConnection!
+  averageRating: Float
+  id: ID
+  isActive: Boolean
+}
+
+type MovieActorsConnection {
+  edges: [MovieActorsRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input MovieActorsConnectionSort {
+  edge: ActedInSort
+}
+
+input MovieActorsConnectionWhere {
+  AND: [MovieActorsConnectionWhere!]
+  NOT: MovieActorsConnectionWhere
+  OR: [MovieActorsConnectionWhere!]
+  edge: ActedInWhere
+  node: ActorWhere
+}
+
+type MovieActorsRelationship {
+  cursor: String!
+  node: Actor!
+  properties: ActedIn!
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MovieSort!]
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
+"""
+input MovieSort {
+  actorCount: SortDirection
+  averageRating: SortDirection
+  id: SortDirection
+  isActive: SortDirection
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  actorCount: Int
+  actorCount_GT: Int
+  actorCount_GTE: Int
+  actorCount_IN: [Int]
+  actorCount_LT: Int
+  actorCount_LTE: Int
+  """
+  Return Movies where all of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_ALL: MovieActorsConnectionWhere
+  """
+  Return Movies where none of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_NONE: MovieActorsConnectionWhere
+  """
+  Return Movies where one of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SINGLE: MovieActorsConnectionWhere
+  """
+  Return Movies where some of the related MovieActorsConnections match this filter
+  """
+  actorsConnection_SOME: MovieActorsConnectionWhere
+  """Return Movies where all of the related Actors match this filter"""
+  actors_ALL: ActorWhere
+  """Return Movies where none of the related Actors match this filter"""
+  actors_NONE: ActorWhere
+  """Return Movies where one of the related Actors match this filter"""
+  actors_SINGLE: ActorWhere
+  """Return Movies where some of the related Actors match this filter"""
+  actors_SOME: ActorWhere
+  averageRating: Float
+  averageRating_GT: Float
+  averageRating_GTE: Float
+  averageRating_IN: [Float]
+  averageRating_LT: Float
+  averageRating_LTE: Float
+  id: ID
+  id_CONTAINS: ID
+  id_ENDS_WITH: ID
+  id_IN: [ID]
+  id_STARTS_WITH: ID
+  isActive: Boolean
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+type Query {
+  actors(options: ActorOptions, where: ActorWhere): [Actor!]!
+  actorsConnection(after: String, first: Int, where: ActorWhere): ActorsConnection!
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
diff --git a/core/src/test/resources/tck-test-files/schema/v2/types/bigint.adoc b/core/src/test/resources/tck-test-files/schema/v2/types/bigint.adoc
index d5c9661f..e4835054 100644
--- a/core/src/test/resources/tck-test-files/schema/v2/types/bigint.adoc
+++ b/core/src/test/resources/tck-test-files/schema/v2/types/bigint.adoc
@@ -15,7 +15,7 @@ type File {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -92,6 +92,3 @@ input FileWhere {
 }
 
 ----
-
-'''
-
diff --git a/core/src/test/resources/tck-test-files/schema/v2/types/bigint.js.adoc b/core/src/test/resources/tck-test-files/schema/v2/types/bigint.js.adoc
new file mode 100644
index 00000000..d2cd891f
--- /dev/null
+++ b/core/src/test/resources/tck-test-files/schema/v2/types/bigint.js.adoc
@@ -0,0 +1,100 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= Bigint
+
+== BigInt
+
+.Schema
+[source,graphql,schema=true]
+----
+type File {
+  name: String!
+  size: BigInt!
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+"""
+A BigInt value up to 64 bits in size, which can be a number or a string if used inline, or a string only if used as a variable. Always returned as a string.
+"""
+scalar BigInt
+
+type File {
+  name: String!
+  size: BigInt!
+}
+
+type FileEdge {
+  cursor: String!
+  node: File!
+}
+
+input FileOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more FileSort objects to sort Files by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [FileSort!]
+}
+
+"""
+Fields to sort Files by. The order in which sorts are applied is not guaranteed when specifying many fields in one FileSort object.
+"""
+input FileSort {
+  name: SortDirection
+  size: SortDirection
+}
+
+input FileWhere {
+  AND: [FileWhere!]
+  NOT: FileWhere
+  OR: [FileWhere!]
+  name: String
+  name_CONTAINS: String
+  name_ENDS_WITH: String
+  name_IN: [String!]
+  name_STARTS_WITH: String
+  size: BigInt
+  size_GT: BigInt
+  size_GTE: BigInt
+  size_IN: [BigInt!]
+  size_LT: BigInt
+  size_LTE: BigInt
+}
+
+type FilesConnection {
+  edges: [FileEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+type Query {
+  files(options: FileOptions, where: FileWhere): [File!]!
+  filesConnection(after: String, first: Int, sort: [FileSort], where: FileWhere): FilesConnection!
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
diff --git a/core/src/test/resources/tck-test-files/schema/v2/types/date.adoc b/core/src/test/resources/tck-test-files/schema/v2/types/date.adoc
index 4f7d1c01..2ecaaeba 100644
--- a/core/src/test/resources/tck-test-files/schema/v2/types/date.adoc
+++ b/core/src/test/resources/tck-test-files/schema/v2/types/date.adoc
@@ -15,7 +15,7 @@ type Movie {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -92,6 +92,3 @@ input MovieWhere {
 }
 
 ----
-
-'''
-
diff --git a/core/src/test/resources/tck-test-files/schema/v2/types/date.js.adoc b/core/src/test/resources/tck-test-files/schema/v2/types/date.js.adoc
new file mode 100644
index 00000000..d0ab318b
--- /dev/null
+++ b/core/src/test/resources/tck-test-files/schema/v2/types/date.js.adoc
@@ -0,0 +1,98 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= Date
+
+== Date
+
+.Schema
+[source,graphql,schema=true]
+----
+type Movie {
+  id: ID
+  date: Date
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+"""A date, represented as a 'yyyy-mm-dd' string"""
+scalar Date
+
+type Movie {
+  date: Date
+  id: ID
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MovieSort!]
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
+"""
+input MovieSort {
+  date: SortDirection
+  id: SortDirection
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  date: Date
+  date_GT: Date
+  date_GTE: Date
+  date_IN: [Date]
+  date_LT: Date
+  date_LTE: Date
+  id: ID
+  id_CONTAINS: ID
+  id_ENDS_WITH: ID
+  id_IN: [ID]
+  id_STARTS_WITH: ID
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+type Query {
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
diff --git a/core/src/test/resources/tck-test-files/schema/v2/types/datetime.adoc b/core/src/test/resources/tck-test-files/schema/v2/types/datetime.adoc
index 60c29c78..7d604216 100644
--- a/core/src/test/resources/tck-test-files/schema/v2/types/datetime.adoc
+++ b/core/src/test/resources/tck-test-files/schema/v2/types/datetime.adoc
@@ -15,7 +15,7 @@ type Movie {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -92,6 +92,3 @@ input MovieWhere {
 }
 
 ----
-
-'''
-
diff --git a/core/src/test/resources/tck-test-files/schema/v2/types/datetime.js.adoc b/core/src/test/resources/tck-test-files/schema/v2/types/datetime.js.adoc
new file mode 100644
index 00000000..7cad41d4
--- /dev/null
+++ b/core/src/test/resources/tck-test-files/schema/v2/types/datetime.js.adoc
@@ -0,0 +1,98 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= Datetime
+
+== DateTime
+
+.Schema
+[source,graphql,schema=true]
+----
+type Movie {
+  id: ID
+  datetime: DateTime
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+"""A date and time, represented as an ISO-8601 string"""
+scalar DateTime
+
+type Movie {
+  datetime: DateTime
+  id: ID
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MovieSort!]
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
+"""
+input MovieSort {
+  datetime: SortDirection
+  id: SortDirection
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  datetime: DateTime
+  datetime_GT: DateTime
+  datetime_GTE: DateTime
+  datetime_IN: [DateTime]
+  datetime_LT: DateTime
+  datetime_LTE: DateTime
+  id: ID
+  id_CONTAINS: ID
+  id_ENDS_WITH: ID
+  id_IN: [ID]
+  id_STARTS_WITH: ID
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+type Query {
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
diff --git a/core/src/test/resources/tck-test-files/schema/v2/types/duration.adoc b/core/src/test/resources/tck-test-files/schema/v2/types/duration.adoc
index 15810f73..956a47cd 100644
--- a/core/src/test/resources/tck-test-files/schema/v2/types/duration.adoc
+++ b/core/src/test/resources/tck-test-files/schema/v2/types/duration.adoc
@@ -15,7 +15,7 @@ type Movie {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -92,6 +92,3 @@ input MovieWhere {
 }
 
 ----
-
-'''
-
diff --git a/core/src/test/resources/tck-test-files/schema/v2/types/duration.js.adoc b/core/src/test/resources/tck-test-files/schema/v2/types/duration.js.adoc
new file mode 100644
index 00000000..acd39a06
--- /dev/null
+++ b/core/src/test/resources/tck-test-files/schema/v2/types/duration.js.adoc
@@ -0,0 +1,98 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= Duration
+
+== Duration
+
+.Schema
+[source,graphql,schema=true]
+----
+type Movie {
+  id: ID
+  duration: Duration
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+"""A duration, represented as an ISO 8601 duration string"""
+scalar Duration
+
+type Movie {
+  duration: Duration
+  id: ID
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MovieSort!]
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
+"""
+input MovieSort {
+  duration: SortDirection
+  id: SortDirection
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  duration: Duration
+  duration_GT: Duration
+  duration_GTE: Duration
+  duration_IN: [Duration]
+  duration_LT: Duration
+  duration_LTE: Duration
+  id: ID
+  id_CONTAINS: ID
+  id_ENDS_WITH: ID
+  id_IN: [ID]
+  id_STARTS_WITH: ID
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+type Query {
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
diff --git a/core/src/test/resources/tck-test-files/schema/v2/types/localdatetime.adoc b/core/src/test/resources/tck-test-files/schema/v2/types/localdatetime.adoc
index 53a327da..75e66c9b 100644
--- a/core/src/test/resources/tck-test-files/schema/v2/types/localdatetime.adoc
+++ b/core/src/test/resources/tck-test-files/schema/v2/types/localdatetime.adoc
@@ -15,7 +15,7 @@ type Movie {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -92,6 +92,3 @@ input MovieWhere {
 }
 
 ----
-
-'''
-
diff --git a/core/src/test/resources/tck-test-files/schema/v2/types/localdatetime.js.adoc b/core/src/test/resources/tck-test-files/schema/v2/types/localdatetime.js.adoc
new file mode 100644
index 00000000..3168c941
--- /dev/null
+++ b/core/src/test/resources/tck-test-files/schema/v2/types/localdatetime.js.adoc
@@ -0,0 +1,98 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= Localdatetime
+
+== LocalDateTime
+
+.Schema
+[source,graphql,schema=true]
+----
+type Movie {
+  id: ID
+  localDT: LocalDateTime
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+"""A local datetime, represented as 'YYYY-MM-DDTHH:MM:SS'"""
+scalar LocalDateTime
+
+type Movie {
+  id: ID
+  localDT: LocalDateTime
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MovieSort!]
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
+"""
+input MovieSort {
+  id: SortDirection
+  localDT: SortDirection
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  id: ID
+  id_CONTAINS: ID
+  id_ENDS_WITH: ID
+  id_IN: [ID]
+  id_STARTS_WITH: ID
+  localDT: LocalDateTime
+  localDT_GT: LocalDateTime
+  localDT_GTE: LocalDateTime
+  localDT_IN: [LocalDateTime]
+  localDT_LT: LocalDateTime
+  localDT_LTE: LocalDateTime
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+type Query {
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
diff --git a/core/src/test/resources/tck-test-files/schema/v2/types/localtime.adoc b/core/src/test/resources/tck-test-files/schema/v2/types/localtime.adoc
index 12d3d212..a69c7514 100644
--- a/core/src/test/resources/tck-test-files/schema/v2/types/localtime.adoc
+++ b/core/src/test/resources/tck-test-files/schema/v2/types/localtime.adoc
@@ -15,7 +15,7 @@ type Movie {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -92,6 +92,3 @@ input MovieWhere {
 }
 
 ----
-
-'''
-
diff --git a/core/src/test/resources/tck-test-files/schema/v2/types/localtime.js.adoc b/core/src/test/resources/tck-test-files/schema/v2/types/localtime.js.adoc
new file mode 100644
index 00000000..eb1a0e76
--- /dev/null
+++ b/core/src/test/resources/tck-test-files/schema/v2/types/localtime.js.adoc
@@ -0,0 +1,100 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= Localtime
+
+== LocalTime
+
+.Schema
+[source,graphql,schema=true]
+----
+type Movie {
+  id: ID
+  time: LocalTime
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+"""
+A local time, represented as a time string without timezone information
+"""
+scalar LocalTime
+
+type Movie {
+  id: ID
+  time: LocalTime
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MovieSort!]
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
+"""
+input MovieSort {
+  id: SortDirection
+  time: SortDirection
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  id: ID
+  id_CONTAINS: ID
+  id_ENDS_WITH: ID
+  id_IN: [ID]
+  id_STARTS_WITH: ID
+  time: LocalTime
+  time_GT: LocalTime
+  time_GTE: LocalTime
+  time_IN: [LocalTime]
+  time_LT: LocalTime
+  time_LTE: LocalTime
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+type Query {
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
diff --git a/core/src/test/resources/tck-test-files/schema/v2/types/point.adoc b/core/src/test/resources/tck-test-files/schema/v2/types/point.adoc
index 077d9c5e..02c5a247 100644
--- a/core/src/test/resources/tck-test-files/schema/v2/types/point.adoc
+++ b/core/src/test/resources/tck-test-files/schema/v2/types/point.adoc
@@ -14,7 +14,7 @@ type Movie {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -137,8 +137,6 @@ input PointInput {
 
 ----
 
-'''
-
 == CartesianPoint
 
 .Schema
@@ -150,7 +148,7 @@ type Machine {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -254,8 +252,6 @@ input MachineWhere {
 
 ----
 
-'''
-
 == Points
 
 .Schema
@@ -267,7 +263,7 @@ type Movie {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -363,8 +359,6 @@ input PointInput {
 
 ----
 
-'''
-
 == CartesianPoints
 
 .Schema
@@ -376,7 +370,7 @@ type Machine {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -453,6 +447,3 @@ input MachineWhere {
 }
 
 ----
-
-'''
-
diff --git a/core/src/test/resources/tck-test-files/schema/v2/types/point.js.adoc b/core/src/test/resources/tck-test-files/schema/v2/types/point.js.adoc
new file mode 100644
index 00000000..b9f67690
--- /dev/null
+++ b/core/src/test/resources/tck-test-files/schema/v2/types/point.js.adoc
@@ -0,0 +1,466 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= Point
+
+== Point
+
+.Schema
+[source,graphql,schema=true]
+----
+type Movie {
+  filmedAt: Point!
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+type Movie {
+  filmedAt: Point!
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MovieSort!]
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
+"""
+input MovieSort {
+  filmedAt: SortDirection
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  filmedAt: PointInput
+  filmedAt_DISTANCE: PointDistance
+  filmedAt_GT: PointDistance
+  filmedAt_GTE: PointDistance
+  filmedAt_IN: [PointInput!]
+  filmedAt_LT: PointDistance
+  filmedAt_LTE: PointDistance
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+"""A point in a coordinate system."""
+type Point {
+  """
+  The coordinate reference systems (CRS)
+  -------------------------------------
+  possible values:
+  * `wgs-84`: A 2D geographic point in the WGS 84 CRS is specified by: longitude and latitude
+  * `wgs-84-3d`: A 3D geographic point in the WGS 84 CRS is specified by longitude, latitude and height
+  """
+  crs: String!
+  """
+  The third element of the Coordinate for geographic CRS, meters above the ellipsoid defined by the datum (WGS-84)
+  """
+  height: Float
+  """
+  The second element of the Coordinate for geographic CRS, degrees North of the equator
+  Range -90.0 to 90.0
+  """
+  latitude: Float!
+  """
+  The first element of the Coordinate for geographic CRS, degrees East of the prime meridian
+  Range -180.0 to 180.0
+  """
+  longitude: Float!
+  """
+  The internal Neo4j ID for the CRS
+  One of:
+  * `4326`: represents CRS `wgs-84`
+  * `4979`: represents CRS `wgs-84-3d`
+  """
+  srid: Int!
+}
+
+"""Input type for a point with a distance"""
+input PointDistance {
+  """The distance in metres to be used when comparing two points"""
+  distance: Float!
+  point: PointInput!
+}
+
+"""Input type for a point"""
+input PointInput {
+  """
+  The third element of the Coordinate for geographic CRS, meters above the ellipsoid defined by the datum (WGS-84)
+  """
+  height: Float
+  """
+  The second element of the Coordinate for geographic CRS, degrees North of the equator
+  Range -90.0 to 90.0
+  """
+  latitude: Float!
+  """
+  The first element of the Coordinate for geographic CRS, degrees East of the prime meridian
+  Range -180.0 to 180.0
+  """
+  longitude: Float!
+}
+
+type Query {
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
+
+== CartesianPoint
+
+.Schema
+[source,graphql,schema=true]
+----
+type Machine {
+  partLocation: CartesianPoint!
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+"""
+A point in a two- or three-dimensional Cartesian coordinate system or in a three-dimensional cylindrical coordinate system.
+"""
+type CartesianPoint {
+  """
+  The coordinate reference systems (CRS)
+  -------------------------------------
+  possible values:
+  * `cartesian`: A 2D point in the Cartesian CRS is specified with a map containing x and y coordinate values
+  * `cartesian-3d`: A 3D point in the Cartesian CRS is specified with a map containing x, y and z coordinate values
+  """
+  crs: String!
+  """
+  The internal Neo4j ID for the CRS
+  One of:
+  * `7203`: represents CRS `cartesian`
+  * `9157`: represents CRS `cartesian-3d`
+  """
+  srid: Int!
+  x: Float!
+  y: Float!
+  z: Float
+}
+
+"""Input type for a cartesian point with a distance"""
+input CartesianPointDistance {
+  distance: Float!
+  point: CartesianPointInput!
+}
+
+"""Input type for a cartesian point"""
+input CartesianPointInput {
+  x: Float!
+  y: Float!
+  z: Float
+}
+
+type Machine {
+  partLocation: CartesianPoint!
+}
+
+type MachineEdge {
+  cursor: String!
+  node: Machine!
+}
+
+input MachineOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MachineSort objects to sort Machines by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MachineSort!]
+}
+
+"""
+Fields to sort Machines by. The order in which sorts are applied is not guaranteed when specifying many fields in one MachineSort object.
+"""
+input MachineSort {
+  partLocation: SortDirection
+}
+
+input MachineWhere {
+  AND: [MachineWhere!]
+  NOT: MachineWhere
+  OR: [MachineWhere!]
+  partLocation: CartesianPointInput
+  partLocation_DISTANCE: CartesianPointDistance
+  partLocation_GT: CartesianPointDistance
+  partLocation_GTE: CartesianPointDistance
+  partLocation_IN: [CartesianPointInput!]
+  partLocation_LT: CartesianPointDistance
+  partLocation_LTE: CartesianPointDistance
+}
+
+type MachinesConnection {
+  edges: [MachineEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+type Query {
+  machines(options: MachineOptions, where: MachineWhere): [Machine!]!
+  machinesConnection(after: String, first: Int, sort: [MachineSort], where: MachineWhere): MachinesConnection!
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
+
+== Points
+
+.Schema
+[source,graphql,schema=true]
+----
+type Movie {
+  filmedAt: [Point!]!
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+type Movie {
+  filmedAt: [Point!]!
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  filmedAt: [PointInput!]
+  filmedAt_INCLUDES: PointInput
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+"""A point in a coordinate system."""
+type Point {
+  """
+  The coordinate reference systems (CRS)
+  -------------------------------------
+  possible values:
+  * `wgs-84`: A 2D geographic point in the WGS 84 CRS is specified by: longitude and latitude
+  * `wgs-84-3d`: A 3D geographic point in the WGS 84 CRS is specified by longitude, latitude and height
+  """
+  crs: String!
+  """
+  The third element of the Coordinate for geographic CRS, meters above the ellipsoid defined by the datum (WGS-84)
+  """
+  height: Float
+  """
+  The second element of the Coordinate for geographic CRS, degrees North of the equator
+  Range -90.0 to 90.0
+  """
+  latitude: Float!
+  """
+  The first element of the Coordinate for geographic CRS, degrees East of the prime meridian
+  Range -180.0 to 180.0
+  """
+  longitude: Float!
+  """
+  The internal Neo4j ID for the CRS
+  One of:
+  * `4326`: represents CRS `wgs-84`
+  * `4979`: represents CRS `wgs-84-3d`
+  """
+  srid: Int!
+}
+
+"""Input type for a point"""
+input PointInput {
+  """
+  The third element of the Coordinate for geographic CRS, meters above the ellipsoid defined by the datum (WGS-84)
+  """
+  height: Float
+  """
+  The second element of the Coordinate for geographic CRS, degrees North of the equator
+  Range -90.0 to 90.0
+  """
+  latitude: Float!
+  """
+  The first element of the Coordinate for geographic CRS, degrees East of the prime meridian
+  Range -180.0 to 180.0
+  """
+  longitude: Float!
+}
+
+type Query {
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, where: MovieWhere): MoviesConnection!
+}
+----
+
+== CartesianPoints
+
+.Schema
+[source,graphql,schema=true]
+----
+type Machine {
+  partLocations: [CartesianPoint!]!
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+"""
+A point in a two- or three-dimensional Cartesian coordinate system or in a three-dimensional cylindrical coordinate system.
+"""
+type CartesianPoint {
+  """
+  The coordinate reference systems (CRS)
+  -------------------------------------
+  possible values:
+  * `cartesian`: A 2D point in the Cartesian CRS is specified with a map containing x and y coordinate values
+  * `cartesian-3d`: A 3D point in the Cartesian CRS is specified with a map containing x, y and z coordinate values
+  """
+  crs: String!
+  """
+  The internal Neo4j ID for the CRS
+  One of:
+  * `7203`: represents CRS `cartesian`
+  * `9157`: represents CRS `cartesian-3d`
+  """
+  srid: Int!
+  x: Float!
+  y: Float!
+  z: Float
+}
+
+"""Input type for a cartesian point"""
+input CartesianPointInput {
+  x: Float!
+  y: Float!
+  z: Float
+}
+
+type Machine {
+  partLocations: [CartesianPoint!]!
+}
+
+type MachineEdge {
+  cursor: String!
+  node: Machine!
+}
+
+input MachineOptions {
+  limit: Int
+  offset: Int
+}
+
+input MachineWhere {
+  AND: [MachineWhere!]
+  NOT: MachineWhere
+  OR: [MachineWhere!]
+  partLocations: [CartesianPointInput!]
+  partLocations_INCLUDES: CartesianPointInput
+}
+
+type MachinesConnection {
+  edges: [MachineEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+type Query {
+  machines(options: MachineOptions, where: MachineWhere): [Machine!]!
+  machinesConnection(after: String, first: Int, where: MachineWhere): MachinesConnection!
+}
+----
diff --git a/core/src/test/resources/tck-test-files/schema/v2/types/time.adoc b/core/src/test/resources/tck-test-files/schema/v2/types/time.adoc
index 20bc01d5..55b1c926 100644
--- a/core/src/test/resources/tck-test-files/schema/v2/types/time.adoc
+++ b/core/src/test/resources/tck-test-files/schema/v2/types/time.adoc
@@ -15,7 +15,7 @@ type Movie {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -92,6 +92,3 @@ input MovieWhere {
 }
 
 ----
-
-'''
-
diff --git a/core/src/test/resources/tck-test-files/schema/v2/types/time.js.adoc b/core/src/test/resources/tck-test-files/schema/v2/types/time.js.adoc
new file mode 100644
index 00000000..a55a0740
--- /dev/null
+++ b/core/src/test/resources/tck-test-files/schema/v2/types/time.js.adoc
@@ -0,0 +1,98 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= Time
+
+== Time
+
+.Schema
+[source,graphql,schema=true]
+----
+type Movie {
+  id: ID
+  time: Time
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+type Movie {
+  id: ID
+  time: Time
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MovieSort!]
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
+"""
+input MovieSort {
+  id: SortDirection
+  time: SortDirection
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  id: ID
+  id_CONTAINS: ID
+  id_ENDS_WITH: ID
+  id_IN: [ID]
+  id_STARTS_WITH: ID
+  time: Time
+  time_GT: Time
+  time_GTE: Time
+  time_IN: [Time]
+  time_LT: Time
+  time_LTE: Time
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+type Query {
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+
+"""A time, represented as an RFC3339 time string"""
+scalar Time
+----
diff --git a/core/src/test/resources/tck-test-files/schema/v2/unions.adoc b/core/src/test/resources/tck-test-files/schema/v2/unions.adoc
index 2213668f..8f5149b6 100644
--- a/core/src/test/resources/tck-test-files/schema/v2/unions.adoc
+++ b/core/src/test/resources/tck-test-files/schema/v2/unions.adoc
@@ -22,7 +22,7 @@ type Movie {
 ----
 
 .Augmented Schema
-[source,graphql]
+[source,graphql,augmented=true]
 ----
 schema {
   query: Query
@@ -191,6 +191,3 @@ input SearchWhere {
 }
 
 ----
-
-'''
-
diff --git a/core/src/test/resources/tck-test-files/schema/v2/unions.js.adoc b/core/src/test/resources/tck-test-files/schema/v2/unions.js.adoc
new file mode 100644
index 00000000..c9ea5ce4
--- /dev/null
+++ b/core/src/test/resources/tck-test-files/schema/v2/unions.js.adoc
@@ -0,0 +1,209 @@
+// This file was generated by the Test-Case extractor of neo4j-graphql
+:toc:
+:toclevels: 42
+
+= Unions
+
+== Unions
+
+.Schema
+[source,graphql,schema=true]
+----
+union Search = Movie | Genre
+
+type Genre {
+  id: ID
+}
+
+type Movie {
+  id: ID
+  search: [Search!]! @relationship(type: "SEARCH", direction: OUT)
+  searchNoDirective: Search
+}
+----
+
+.Augmented Schema
+[source,graphql,augmented=true]
+----
+schema {
+  query: Query
+}
+
+type Genre {
+  id: ID
+}
+
+type GenreEdge {
+  cursor: String!
+  node: Genre!
+}
+
+input GenreOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more GenreSort objects to sort Genres by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [GenreSort!]
+}
+
+"""
+Fields to sort Genres by. The order in which sorts are applied is not guaranteed when specifying many fields in one GenreSort object.
+"""
+input GenreSort {
+  id: SortDirection
+}
+
+input GenreWhere {
+  AND: [GenreWhere!]
+  NOT: GenreWhere
+  OR: [GenreWhere!]
+  id: ID
+  id_CONTAINS: ID
+  id_ENDS_WITH: ID
+  id_IN: [ID]
+  id_STARTS_WITH: ID
+}
+
+type GenresConnection {
+  edges: [GenreEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+type Movie {
+  id: ID
+  search(directed: Boolean = true, options: QueryOptions, where: SearchWhere): [Search!]!
+  searchConnection(after: String, directed: Boolean = true, first: Int, where: MovieSearchConnectionWhere): MovieSearchConnection!
+  searchNoDirective: Search
+}
+
+type MovieEdge {
+  cursor: String!
+  node: Movie!
+}
+
+input MovieOptions {
+  limit: Int
+  offset: Int
+  """
+  Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array.
+  """
+  sort: [MovieSort!]
+}
+
+type MovieSearchConnection {
+  edges: [MovieSearchRelationship!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+input MovieSearchConnectionWhere {
+  Genre: MovieSearchGenreConnectionWhere
+  Movie: MovieSearchMovieConnectionWhere
+}
+
+input MovieSearchGenreConnectionWhere {
+  AND: [MovieSearchGenreConnectionWhere!]
+  NOT: MovieSearchGenreConnectionWhere
+  OR: [MovieSearchGenreConnectionWhere!]
+  node: GenreWhere
+}
+
+input MovieSearchMovieConnectionWhere {
+  AND: [MovieSearchMovieConnectionWhere!]
+  NOT: MovieSearchMovieConnectionWhere
+  OR: [MovieSearchMovieConnectionWhere!]
+  node: MovieWhere
+}
+
+type MovieSearchRelationship {
+  cursor: String!
+  node: Search!
+}
+
+"""
+Fields to sort Movies by. The order in which sorts are applied is not guaranteed when specifying many fields in one MovieSort object.
+"""
+input MovieSort {
+  id: SortDirection
+}
+
+input MovieWhere {
+  AND: [MovieWhere!]
+  NOT: MovieWhere
+  OR: [MovieWhere!]
+  id: ID
+  id_CONTAINS: ID
+  id_ENDS_WITH: ID
+  id_IN: [ID]
+  id_STARTS_WITH: ID
+  """
+  Return Movies where all of the related MovieSearchConnections match this filter
+  """
+  searchConnection_ALL: MovieSearchConnectionWhere
+  """
+  Return Movies where none of the related MovieSearchConnections match this filter
+  """
+  searchConnection_NONE: MovieSearchConnectionWhere
+  """
+  Return Movies where one of the related MovieSearchConnections match this filter
+  """
+  searchConnection_SINGLE: MovieSearchConnectionWhere
+  """
+  Return Movies where some of the related MovieSearchConnections match this filter
+  """
+  searchConnection_SOME: MovieSearchConnectionWhere
+  """Return Movies where all of the related Searches match this filter"""
+  search_ALL: SearchWhere
+  """Return Movies where none of the related Searches match this filter"""
+  search_NONE: SearchWhere
+  """Return Movies where one of the related Searches match this filter"""
+  search_SINGLE: SearchWhere
+  """Return Movies where some of the related Searches match this filter"""
+  search_SOME: SearchWhere
+}
+
+type MoviesConnection {
+  edges: [MovieEdge!]!
+  pageInfo: PageInfo!
+  totalCount: Int!
+}
+
+"""Pagination information (Relay)"""
+type PageInfo {
+  endCursor: String
+  hasNextPage: Boolean!
+  hasPreviousPage: Boolean!
+  startCursor: String
+}
+
+type Query {
+  genres(options: GenreOptions, where: GenreWhere): [Genre!]!
+  genresConnection(after: String, first: Int, sort: [GenreSort], where: GenreWhere): GenresConnection!
+  movies(options: MovieOptions, where: MovieWhere): [Movie!]!
+  moviesConnection(after: String, first: Int, sort: [MovieSort], where: MovieWhere): MoviesConnection!
+  searches(options: QueryOptions, where: SearchWhere): [Search!]!
+}
+
+"""Input type for options that can be specified on a query operation."""
+input QueryOptions {
+  limit: Int
+  offset: Int
+}
+
+union Search = Genre | Movie
+
+input SearchWhere {
+  Genre: GenreWhere
+  Movie: MovieWhere
+}
+
+"""An enum for sorting in either ascending or descending order."""
+enum SortDirection {
+  """Sort by field values in ascending order."""
+  ASC
+  """Sort by field values in descending order."""
+  DESC
+}
+----
diff --git a/core/src/test/resources/translator-tests-custom-scalars.adoc b/core/src/test/resources/translator-tests-custom-scalars.adoc
index d1b7c97b..85b0918b 100644
--- a/core/src/test/resources/translator-tests-custom-scalars.adoc
+++ b/core/src/test/resources/translator-tests-custom-scalars.adoc
@@ -20,7 +20,7 @@ type Movie {
 === Create
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 mutation {
   createMovie(title:"Forrest Gump", released: 1994) {
@@ -58,7 +58,7 @@ RETURN createMovie {
 === Update
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 mutation {
   updateMovie(_id: 1, released: 1995) {
@@ -97,7 +97,7 @@ RETURN updateMovie {
 === Merge
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 mutation {
   mergeMovie(_id: 1, released: 1995) {
@@ -136,7 +136,7 @@ RETURN mergeMovie {
 === Merge null
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 mutation {
   updateMovie(_id: 1, released: null) {
@@ -175,7 +175,7 @@ RETURN updateMovie {
 === Find
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movie(released: 1994) {
@@ -209,7 +209,7 @@ RETURN movie {
 === Filter
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   movie(filter:{released_gte: 1994}) {
diff --git a/core/src/test/resources/translator-tests1.adoc b/core/src/test/resources/translator-tests1.adoc
index f6d3ca88..8eedb50c 100644
--- a/core/src/test/resources/translator-tests1.adoc
+++ b/core/src/test/resources/translator-tests1.adoc
@@ -59,7 +59,7 @@ type Query {
 === order by query single
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
  { person:person(orderBy:[name_asc]) { age } }
 ----
@@ -84,7 +84,7 @@ RETURN person {
 === rich relationship
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 { person { name born { date to { name } } } }
 ----
@@ -120,7 +120,7 @@ RETURN person {
 === nested query multi
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 { person { name age livedIn { name } } }
 ----
@@ -154,7 +154,7 @@ RETURN person {
 === inline fragment
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
  query { person { ... on Person { name } } }
 ----
@@ -179,7 +179,7 @@ RETURN person {
 === simple query offset
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
  { person:person(offset:3) { age } }
 ----
@@ -206,7 +206,7 @@ RETURN person {
 === query offset as variable
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query getPersons($offset: Int){
   person(offset: $offset) {
@@ -245,7 +245,7 @@ RETURN person {
 === nested query
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 { person { name age livesIn { name } } }
 ----
@@ -279,7 +279,7 @@ RETURN person {
 === simple query
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 { person { name age } }
 ----
@@ -305,7 +305,7 @@ RETURN person {
 === named fragment
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
  query { person { ...name } } fragment name on Person { name }
 ----
@@ -330,7 +330,7 @@ RETURN person {
 === rich relationship custom field names
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 { person { name died { date where { name } } } }
 ----
@@ -366,7 +366,7 @@ RETURN person {
 === rich relationship 2nd hop
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 { person { name born { date to { name founded { name } } } } }
 ----
@@ -410,7 +410,7 @@ RETURN person {
 === rich relationship 3 rd hop
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 { person { name born { date to { name founded { name born { date to { name } } } } } } }
 ----
@@ -465,7 +465,7 @@ RETURN person {
 === nested query parameter
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 { person { name age livedIn(name:"Berlin") { name } } }
 ----
@@ -502,7 +502,7 @@ RETURN person {
 === order by query two
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
  { person:person(orderBy:[age_desc, name_asc]) { age } }
 ----
@@ -527,7 +527,7 @@ RETURN person {
 === order by with underscore
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
  { location(orderBy:[sort_Arg_desc]) { name } }
 ----
@@ -552,7 +552,7 @@ RETURN location {
 === named fragment multi field
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
   fragment details on Person { name, age } query { person { ...details } }
 ----
@@ -578,7 +578,7 @@ RETURN person {
 === simple query alias
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
  { foo:person {
      n:name
@@ -606,7 +606,7 @@ RETURN foo {
 === simple query first
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
  { person:person(first:2) { age } }
 ----
@@ -633,7 +633,7 @@ RETURN person {
 === simple query where
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
  { person:personByName(name:"Joe") { age } }
 ----
@@ -661,7 +661,7 @@ RETURN person {
 === nested query slice offset
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 { person { livedIn(offset:3) { name } } }
 ----
@@ -696,7 +696,7 @@ RETURN person {
 === nested query slice first
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 { person { livedIn(first:2) { name } } }
 ----
@@ -731,7 +731,7 @@ RETURN person {
 === nested query 2 nd hop
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 { person { name age livesIn { name founded {name}} } }
 ----
@@ -773,7 +773,7 @@ RETURN person {
 === inline fragment multi fields
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query { person { ... on Person { name,age } } }
 ----
@@ -799,7 +799,7 @@ RETURN person {
 === simple query first offset
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
  { person:person(first:2,offset:3) { age } }
 ----
@@ -827,7 +827,7 @@ RETURN person {
 === nested query slice first offset
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 { person { livedIn(first:2,offset:3) { name } } }
 ----
@@ -863,7 +863,7 @@ RETURN person {
 === nested query slice first offset
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 { location { name __typename } }
 ----
@@ -891,7 +891,7 @@ RETURN location {
 === introspection
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   person {
@@ -935,7 +935,7 @@ RETURN person {
 === inline fragments on interfaces
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   location {
@@ -976,7 +976,7 @@ RETURN location {
 === fragments on interfaces
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query {
   location {
@@ -1020,7 +1020,7 @@ RETURN location {
 === query spatial types
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 query {
   person(location:{longitude: 1, latitude: 2 }){
@@ -1066,7 +1066,7 @@ RETURN person {
 === mutate spatial types
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 mutation{
   createPerson(name:"Test2", location:{x: 1, y: 2, z: 3, crs: "wgs-84-3d"}){
@@ -1127,7 +1127,7 @@ RETURN createPerson {
 ----
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {
   location {
diff --git a/core/src/test/resources/translator-tests2.adoc b/core/src/test/resources/translator-tests2.adoc
index 9d3bea61..631c0655 100644
--- a/core/src/test/resources/translator-tests2.adoc
+++ b/core/src/test/resources/translator-tests2.adoc
@@ -24,7 +24,7 @@ type Referral @relation (name:"REFERRED_BY", from:"user", to: "referredBy" ) {
 === relation with same types
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {user(name:"Jane") {
   name
diff --git a/core/src/test/resources/translator-tests3.adoc b/core/src/test/resources/translator-tests3.adoc
index bb68545a..88a3dbc4 100644
--- a/core/src/test/resources/translator-tests3.adoc
+++ b/core/src/test/resources/translator-tests3.adoc
@@ -37,7 +37,7 @@ CREATE
 === relation with same types changed direction
 
 .GraphQL-Query
-[source,graphql]
+[source,graphql,request=true]
 ----
 {user( filter: {name_in: ["Jane", "Thomas"]}) {
   name