diff --git a/tests/core/parse.rs b/tests/core/parse.rs
index 0ff0321b01..d20894b001 100644
--- a/tests/core/parse.rs
+++ b/tests/core/parse.rs
@@ -84,10 +84,11 @@ impl ExecutionSpec {
                             let split = expect.value.splitn(2, ':').collect::<Vec<&str>>();
                             match split[..] {
                                 [a, b] => {
-                                    check_identity =
-                                        a.contains("check_identity") && b.ends_with("true");
-                                    sdl_error = a.contains("expect_validation_error")
-                                        && b.ends_with("true");
+                                    check_identity = a.contains("identity") && b.ends_with("true");
+                                    sdl_error = a.contains("error") && b.ends_with("true");
+                                    if a.contains("skip") && b.ends_with("true") {
+                                        runner = Some(Annotation::Skip);
+                                    }
                                 }
                                 _ => {
                                     return Err(anyhow!(
@@ -100,31 +101,26 @@ impl ExecutionSpec {
                         }
                     } else if heading.depth == 5 {
                         // Parse annotation
-                        if runner.is_none() {
+                        return if runner.is_none() {
                             if let Some(Node::Text(text)) = heading.children.first() {
-                                runner = Some(match text.value.as_str() {
-                                    "skip" => Annotation::Skip,
-                                    _ => {
-                                        return Err(anyhow!(
-                                            "Unexpected runner annotation {:?} in {:?}",
-                                            text.value,
-                                            path,
-                                        ));
-                                    }
-                                });
+                                Err(anyhow!(
+                                    "Unexpected runner annotation {:?} in {:?}",
+                                    text.value,
+                                    path,
+                                ))
                             } else {
-                                return Err(anyhow!(
+                                Err(anyhow!(
                                     "Unexpected content of level 5 heading in {:?}: {:#?}",
                                     path,
                                     heading
-                                ));
+                                ))
                             }
                         } else {
-                            return Err(anyhow!(
+                            Err(anyhow!(
                                 "Unexpected double-declaration of runner annotation in {:?}",
                                 path
-                            ));
-                        }
+                            ))
+                        };
                     } else if heading.depth == 4 {
                     } else {
                         return Err(anyhow!(
diff --git a/tests/execution/add-field-many-list.md b/tests/execution/add-field-many-list.md
index 2efbae182d..fe4cda4274 100644
--- a/tests/execution/add-field-many-list.md
+++ b/tests/execution/add-field-many-list.md
@@ -1,5 +1,5 @@
 ---
-check_identity: true
+identity: true
 ---
 
 # add-field-many-list
diff --git a/tests/execution/add-field-many.md b/tests/execution/add-field-many.md
index 74bd20d41d..af1008ef4f 100644
--- a/tests/execution/add-field-many.md
+++ b/tests/execution/add-field-many.md
@@ -1,5 +1,5 @@
 ---
-check_identity: true
+identity: true
 ---
 
 # add-field-many
diff --git a/tests/execution/auth-protected-without-auth.md b/tests/execution/auth-protected-without-auth.md
index cfb0b7e244..3d6d46fc60 100644
--- a/tests/execution/auth-protected-without-auth.md
+++ b/tests/execution/auth-protected-without-auth.md
@@ -1,5 +1,5 @@
 ---
-expect_validation_error: true
+error: true
 ---
 
 # Using @protected operator without specifying server.auth config
diff --git a/tests/execution/auth.md b/tests/execution/auth.md
index 62c9664897..3dc2068978 100644
--- a/tests/execution/auth.md
+++ b/tests/execution/auth.md
@@ -1,5 +1,5 @@
 ---
-check_identity: true
+identity: true
 ---
 
 # auth
diff --git a/tests/execution/cors-invalid-expose-headers.md b/tests/execution/cors-invalid-expose-headers.md
index 9fdc54baca..f9ac0d2046 100644
--- a/tests/execution/cors-invalid-expose-headers.md
+++ b/tests/execution/cors-invalid-expose-headers.md
@@ -1,5 +1,5 @@
 ---
-expect_validation_error: true
+error: true
 ---
 
 # Cors invalid exposeHeaders
diff --git a/tests/execution/cors-invalid-headers.md b/tests/execution/cors-invalid-headers.md
index 08804215e1..bdbc37b55b 100644
--- a/tests/execution/cors-invalid-headers.md
+++ b/tests/execution/cors-invalid-headers.md
@@ -1,5 +1,5 @@
 ---
-expect_validation_error: true
+error: true
 ---
 
 # Cors invalid allowHeaders
diff --git a/tests/execution/cors-invalid-methods.md b/tests/execution/cors-invalid-methods.md
index 44549a4a72..c399b84acb 100644
--- a/tests/execution/cors-invalid-methods.md
+++ b/tests/execution/cors-invalid-methods.md
@@ -1,5 +1,5 @@
 ---
-expect_validation_error: true
+error: true
 ---
 
 # Cors invalid allowMethods
diff --git a/tests/execution/cors-invalid-origins.md b/tests/execution/cors-invalid-origins.md
index b391074079..1c6af30e80 100644
--- a/tests/execution/cors-invalid-origins.md
+++ b/tests/execution/cors-invalid-origins.md
@@ -1,5 +1,5 @@
 ---
-expect_validation_error: true
+error: true
 ---
 
 # Cors invalid allowOrigins
diff --git a/tests/execution/experimental-headers-error.md b/tests/execution/experimental-headers-error.md
index aa1f804075..32b9822cd4 100644
--- a/tests/execution/experimental-headers-error.md
+++ b/tests/execution/experimental-headers-error.md
@@ -1,5 +1,5 @@
 ---
-expect_validation_error: true
+error: true
 ---
 
 # test-experimental-headers-error
diff --git a/tests/execution/graphql-dataloader-batch-keys.md b/tests/execution/graphql-dataloader-batch-keys.md
index c0b065f99c..08a39eab4c 100644
--- a/tests/execution/graphql-dataloader-batch-keys.md
+++ b/tests/execution/graphql-dataloader-batch-keys.md
@@ -1,6 +1,8 @@
-# GraphQL datasource
+---
+skip: true
+---
 
-##### skip
+# GraphQL datasource
 
 [//]: # "nested @graphql directives currently not supported"
 [//]: # "This test had an assertion with a fail annotation that testconv cannot convert losslessly. If you need the original responses, you can find it in git history. For example, at commit https://github.com/tailcallhq/tailcall/tree/1c32ca9e8080ae3b17e9cf41078d028d3e0289da"
diff --git a/tests/execution/inline-many-list.md b/tests/execution/inline-many-list.md
index 67a140876a..74bc360110 100644
--- a/tests/execution/inline-many-list.md
+++ b/tests/execution/inline-many-list.md
@@ -1,5 +1,5 @@
 ---
-check_identity: true
+identity: true
 ---
 
 # inline-many-list
diff --git a/tests/execution/inline-many.md b/tests/execution/inline-many.md
index b3d2a7d92e..b5f0a3d44a 100644
--- a/tests/execution/inline-many.md
+++ b/tests/execution/inline-many.md
@@ -1,5 +1,5 @@
 ---
-check_identity: true
+identity: true
 ---
 
 # inline-many
diff --git a/tests/execution/input-type-protected-error.md b/tests/execution/input-type-protected-error.md
index fdcbb21c54..7d726a3588 100644
--- a/tests/execution/input-type-protected-error.md
+++ b/tests/execution/input-type-protected-error.md
@@ -1,5 +1,5 @@
 ---
-expect_validation_error: true
+error: true
 ---
 
 # input-type-protected-error
diff --git a/tests/execution/omit-many.md b/tests/execution/omit-many.md
index 0a76858fec..a9163c672d 100644
--- a/tests/execution/omit-many.md
+++ b/tests/execution/omit-many.md
@@ -1,5 +1,5 @@
 ---
-check_identity: true
+identity: true
 ---
 
 # omit-many
diff --git a/tests/execution/test-add-field-error.md b/tests/execution/test-add-field-error.md
index 0b7142551b..870a93c51c 100644
--- a/tests/execution/test-add-field-error.md
+++ b/tests/execution/test-add-field-error.md
@@ -1,5 +1,5 @@
 ---
-expect_validation_error: true
+error: true
 ---
 
 # test-add-field-error
diff --git a/tests/execution/test-add-field-list.md b/tests/execution/test-add-field-list.md
index 17e3a9b461..9a7f0b1874 100644
--- a/tests/execution/test-add-field-list.md
+++ b/tests/execution/test-add-field-list.md
@@ -1,5 +1,5 @@
 ---
-check_identity: true
+identity: true
 ---
 
 # test-add-field-list
diff --git a/tests/execution/test-add-field.md b/tests/execution/test-add-field.md
index d74e7af178..676f29a479 100644
--- a/tests/execution/test-add-field.md
+++ b/tests/execution/test-add-field.md
@@ -1,5 +1,5 @@
 ---
-check_identity: true
+identity: true
 ---
 
 # test-add-field
diff --git a/tests/execution/test-add-link-to-empty-config.md b/tests/execution/test-add-link-to-empty-config.md
index 4d935bd482..86ea9c1ed2 100644
--- a/tests/execution/test-add-link-to-empty-config.md
+++ b/tests/execution/test-add-link-to-empty-config.md
@@ -1,5 +1,5 @@
 ---
-check_identity: true
+identity: true
 ---
 
 # test-add-link-to-empty-config
diff --git a/tests/execution/test-all-blueprint-errors.md b/tests/execution/test-all-blueprint-errors.md
index a8035a826a..ecb4cea545 100644
--- a/tests/execution/test-all-blueprint-errors.md
+++ b/tests/execution/test-all-blueprint-errors.md
@@ -1,5 +1,5 @@
 ---
-expect_validation_error: true
+error: true
 ---
 
 # test-all-blueprint-errors
diff --git a/tests/execution/test-batch-operator-post.md b/tests/execution/test-batch-operator-post.md
index ea3caf8408..7191a8e15d 100644
--- a/tests/execution/test-batch-operator-post.md
+++ b/tests/execution/test-batch-operator-post.md
@@ -1,5 +1,5 @@
 ---
-expect_validation_error: true
+error: true
 ---
 
 # test-batch-operator-post
diff --git a/tests/execution/test-batching-group-by.md b/tests/execution/test-batching-group-by.md
index 64deab3b2a..993ebb624c 100644
--- a/tests/execution/test-batching-group-by.md
+++ b/tests/execution/test-batching-group-by.md
@@ -1,5 +1,5 @@
 ---
-check_identity: true
+identity: true
 ---
 
 # test-batching-group-by
diff --git a/tests/execution/test-cache.md b/tests/execution/test-cache.md
index 33c2b90c02..484a74e4cb 100644
--- a/tests/execution/test-cache.md
+++ b/tests/execution/test-cache.md
@@ -1,5 +1,5 @@
 ---
-check_identity: true
+identity: true
 ---
 
 # test-cache
diff --git a/tests/execution/test-call-operator-errors.md b/tests/execution/test-call-operator-errors.md
index bce233cdb6..ed7ccf91c1 100644
--- a/tests/execution/test-call-operator-errors.md
+++ b/tests/execution/test-call-operator-errors.md
@@ -1,5 +1,5 @@
 ---
-expect_validation_error: true
+error: true
 ---
 
 # test-call-operator
diff --git a/tests/execution/test-custom-scalar.md b/tests/execution/test-custom-scalar.md
index c9e3c954da..4d4ac316fb 100644
--- a/tests/execution/test-custom-scalar.md
+++ b/tests/execution/test-custom-scalar.md
@@ -1,5 +1,5 @@
 ---
-check_identity: true
+identity: true
 ---
 
 # test-custom-scalar
diff --git a/tests/execution/test-custom-types.md b/tests/execution/test-custom-types.md
index b1af08f697..76352489b9 100644
--- a/tests/execution/test-custom-types.md
+++ b/tests/execution/test-custom-types.md
@@ -1,5 +1,5 @@
 ---
-check_identity: true
+identity: true
 ---
 
 # test-custom-types
diff --git a/tests/execution/test-dbl-usage-many.md b/tests/execution/test-dbl-usage-many.md
index febc4cddbc..0917eb6325 100644
--- a/tests/execution/test-dbl-usage-many.md
+++ b/tests/execution/test-dbl-usage-many.md
@@ -1,5 +1,5 @@
 ---
-expect_validation_error: true
+error: true
 ---
 
 # test-dbl-usage-many
diff --git a/tests/execution/test-dbl-usage.md b/tests/execution/test-dbl-usage.md
index 44757aa281..d570e90442 100644
--- a/tests/execution/test-dbl-usage.md
+++ b/tests/execution/test-dbl-usage.md
@@ -1,5 +1,5 @@
 ---
-expect_validation_error: true
+error: true
 ---
 
 # test-dbl-usage
diff --git a/tests/execution/test-description-many.md b/tests/execution/test-description-many.md
index deefef1774..939bd05216 100644
--- a/tests/execution/test-description-many.md
+++ b/tests/execution/test-description-many.md
@@ -1,5 +1,5 @@
 ---
-check_identity: true
+identity: true
 ---
 
 # test-description-many
diff --git a/tests/execution/test-directives-undef-null-fields.md b/tests/execution/test-directives-undef-null-fields.md
index b4af313819..4197ab33fc 100644
--- a/tests/execution/test-directives-undef-null-fields.md
+++ b/tests/execution/test-directives-undef-null-fields.md
@@ -1,5 +1,5 @@
 ---
-expect_validation_error: true
+error: true
 ---
 
 # test-directives-undef-null-fields
diff --git a/tests/execution/test-duplicated-link.md b/tests/execution/test-duplicated-link.md
index 858db7a67b..07fd961fde 100644
--- a/tests/execution/test-duplicated-link.md
+++ b/tests/execution/test-duplicated-link.md
@@ -1,5 +1,5 @@
 ---
-expect_validation_error: true
+error: true
 ---
 
 # test-duplicated-link
diff --git a/tests/execution/test-empty-link.md b/tests/execution/test-empty-link.md
index ba78293dc3..35967b4da1 100644
--- a/tests/execution/test-empty-link.md
+++ b/tests/execution/test-empty-link.md
@@ -1,5 +1,5 @@
 ---
-expect_validation_error: true
+error: true
 ---
 
 # test-empty-link
diff --git a/tests/execution/test-enum-description.md b/tests/execution/test-enum-description.md
index 6011cc6ac0..d7bf473f93 100644
--- a/tests/execution/test-enum-description.md
+++ b/tests/execution/test-enum-description.md
@@ -1,5 +1,5 @@
 ---
-check_identity: true
+identity: true
 ---
 
 # test-enum-description
diff --git a/tests/execution/test-enum-empty.md b/tests/execution/test-enum-empty.md
index 7ead01394a..6e4744c34e 100644
--- a/tests/execution/test-enum-empty.md
+++ b/tests/execution/test-enum-empty.md
@@ -1,5 +1,5 @@
 ---
-expect_validation_error: true
+error: true
 ---
 
 # test-enum-empty
diff --git a/tests/execution/test-enum.md b/tests/execution/test-enum.md
index c47c8d3c73..3a6b596ac9 100644
--- a/tests/execution/test-enum.md
+++ b/tests/execution/test-enum.md
@@ -1,5 +1,5 @@
 ---
-check_identity: true
+identity: true
 ---
 
 # test-enum
diff --git a/tests/execution/test-expr-error.md b/tests/execution/test-expr-error.md
index e27e9d6d1d..9afb3dc1b0 100644
--- a/tests/execution/test-expr-error.md
+++ b/tests/execution/test-expr-error.md
@@ -1,5 +1,5 @@
 ---
-expect_validation_error: true
+error: true
 ---
 
 # test-expr-error
diff --git a/tests/execution/test-expr-with-add-field.md b/tests/execution/test-expr-with-add-field.md
index 26671a1b41..9937ae60d5 100644
--- a/tests/execution/test-expr-with-add-field.md
+++ b/tests/execution/test-expr-with-add-field.md
@@ -1,5 +1,5 @@
 ---
-expect_validation_error: true
+error: true
 ---
 
 # test-expr-with-add-field
diff --git a/tests/execution/test-expr-with-inline.md b/tests/execution/test-expr-with-inline.md
index 1d6e0ea11e..205ce4362f 100644
--- a/tests/execution/test-expr-with-inline.md
+++ b/tests/execution/test-expr-with-inline.md
@@ -1,5 +1,5 @@
 ---
-expect_validation_error: true
+error: true
 ---
 
 # test-expr-with-inline
diff --git a/tests/execution/test-expr.md b/tests/execution/test-expr.md
index 83138a8303..3f9ac816d2 100644
--- a/tests/execution/test-expr.md
+++ b/tests/execution/test-expr.md
@@ -1,5 +1,5 @@
 ---
-check_identity: true
+identity: true
 ---
 
 # test-expr
diff --git a/tests/execution/test-field-already-implemented-from-Interface.md b/tests/execution/test-field-already-implemented-from-Interface.md
index af7558c25a..afc8cba817 100644
--- a/tests/execution/test-field-already-implemented-from-Interface.md
+++ b/tests/execution/test-field-already-implemented-from-Interface.md
@@ -1,5 +1,5 @@
 ---
-expect_validation_error: true
+error: true
 ---
 
 # test-field-already-implemented-from-Interface
diff --git a/tests/execution/test-graphqlsource-no-base-url.md b/tests/execution/test-graphqlsource-no-base-url.md
index 075202869c..ddf3032a4e 100644
--- a/tests/execution/test-graphqlsource-no-base-url.md
+++ b/tests/execution/test-graphqlsource-no-base-url.md
@@ -1,5 +1,5 @@
 ---
-expect_validation_error: true
+error: true
 ---
 
 # test-graphqlsource-no-base-url
diff --git a/tests/execution/test-graphqlsource.md b/tests/execution/test-graphqlsource.md
index 575866c642..1ee90051d1 100644
--- a/tests/execution/test-graphqlsource.md
+++ b/tests/execution/test-graphqlsource.md
@@ -1,5 +1,5 @@
 ---
-check_identity: true
+identity: true
 ---
 
 # test-graphqlsource
diff --git a/tests/execution/test-groupby-without-batching.md b/tests/execution/test-groupby-without-batching.md
index f1243b765a..69a7a67aa1 100644
--- a/tests/execution/test-groupby-without-batching.md
+++ b/tests/execution/test-groupby-without-batching.md
@@ -1,5 +1,5 @@
 ---
-expect_validation_error: true
+error: true
 ---
 
 # test-groupby-without-batching
diff --git a/tests/execution/test-grpc-group-by.md b/tests/execution/test-grpc-group-by.md
index f9f95ac2d8..1cbd951ff0 100644
--- a/tests/execution/test-grpc-group-by.md
+++ b/tests/execution/test-grpc-group-by.md
@@ -1,5 +1,5 @@
 ---
-expect_validation_error: true
+error: true
 ---
 
 # test-grpc-group-by
diff --git a/tests/execution/test-grpc-invalid-method-format.md b/tests/execution/test-grpc-invalid-method-format.md
index 07c5dcad81..6e6b7b9bbc 100644
--- a/tests/execution/test-grpc-invalid-method-format.md
+++ b/tests/execution/test-grpc-invalid-method-format.md
@@ -1,5 +1,5 @@
 ---
-expect_validation_error: true
+error: true
 ---
 
 # test-grpc-invalid-method-format
diff --git a/tests/execution/test-grpc-invalid-proto-id.md b/tests/execution/test-grpc-invalid-proto-id.md
index 851e266040..bfc75c0feb 100644
--- a/tests/execution/test-grpc-invalid-proto-id.md
+++ b/tests/execution/test-grpc-invalid-proto-id.md
@@ -1,5 +1,5 @@
 ---
-expect_validation_error: true
+error: true
 ---
 
 # test-grpc-invalid-proto-id
diff --git a/tests/execution/test-grpc-missing-fields.md b/tests/execution/test-grpc-missing-fields.md
index 575905e3e2..51f92e2b11 100644
--- a/tests/execution/test-grpc-missing-fields.md
+++ b/tests/execution/test-grpc-missing-fields.md
@@ -1,5 +1,5 @@
 ---
-expect_validation_error: true
+error: true
 ---
 
 # test-grpc-missing-fields
diff --git a/tests/execution/test-grpc-nested-data.md b/tests/execution/test-grpc-nested-data.md
index 82ff8ee9ad..03e77d4fdd 100644
--- a/tests/execution/test-grpc-nested-data.md
+++ b/tests/execution/test-grpc-nested-data.md
@@ -1,5 +1,5 @@
 ---
-expect_validation_error: true
+error: true
 ---
 
 # test-grpc-nested-data
diff --git a/tests/execution/test-grpc-nested-optional.md b/tests/execution/test-grpc-nested-optional.md
index 76218c220a..08a384cfdd 100644
--- a/tests/execution/test-grpc-nested-optional.md
+++ b/tests/execution/test-grpc-nested-optional.md
@@ -1,5 +1,5 @@
 ---
-expect_validation_error: true
+error: true
 ---
 
 # test-grpc-nested-optional
diff --git a/tests/execution/test-grpc-optional.md b/tests/execution/test-grpc-optional.md
index 53919da276..e5800ad373 100644
--- a/tests/execution/test-grpc-optional.md
+++ b/tests/execution/test-grpc-optional.md
@@ -1,5 +1,5 @@
 ---
-expect_validation_error: true
+error: true
 ---
 
 # test-grpc-optional
diff --git a/tests/execution/test-grpc-proto-path.md b/tests/execution/test-grpc-proto-path.md
index 189f615e02..bdb7a4a24f 100644
--- a/tests/execution/test-grpc-proto-path.md
+++ b/tests/execution/test-grpc-proto-path.md
@@ -1,5 +1,5 @@
 ---
-expect_validation_error: true
+error: true
 ---
 
 # test-grpc-proto-path
diff --git a/tests/execution/test-grpc-service-method.md b/tests/execution/test-grpc-service-method.md
index b97b2260d8..4c806595e7 100644
--- a/tests/execution/test-grpc-service-method.md
+++ b/tests/execution/test-grpc-service-method.md
@@ -1,5 +1,5 @@
 ---
-expect_validation_error: true
+error: true
 ---
 
 # test-grpc-service-method
diff --git a/tests/execution/test-grpc-service.md b/tests/execution/test-grpc-service.md
index 3f1c2f6dc6..85549b2013 100644
--- a/tests/execution/test-grpc-service.md
+++ b/tests/execution/test-grpc-service.md
@@ -1,5 +1,5 @@
 ---
-expect_validation_error: true
+error: true
 ---
 
 # test-grpc-service
diff --git a/tests/execution/test-grpc.md b/tests/execution/test-grpc.md
index e456b7d424..a676774bbf 100644
--- a/tests/execution/test-grpc.md
+++ b/tests/execution/test-grpc.md
@@ -1,5 +1,5 @@
 ---
-check_identity: true
+identity: true
 ---
 
 # test-grpc
diff --git a/tests/execution/test-hostname-faliure.md b/tests/execution/test-hostname-faliure.md
index d8cc4a7536..8fa02a96e0 100644
--- a/tests/execution/test-hostname-faliure.md
+++ b/tests/execution/test-hostname-faliure.md
@@ -1,5 +1,5 @@
 ---
-expect_validation_error: true
+error: true
 ---
 
 # test-hostname-faliure
diff --git a/tests/execution/test-http-baseurl.md b/tests/execution/test-http-baseurl.md
index c611590479..85b33c1bf0 100644
--- a/tests/execution/test-http-baseurl.md
+++ b/tests/execution/test-http-baseurl.md
@@ -1,5 +1,5 @@
 ---
-check_identity: true
+identity: true
 ---
 
 # test-http-baseurl
diff --git a/tests/execution/test-http-headers.md b/tests/execution/test-http-headers.md
index 79b8d51013..337280cdfb 100644
--- a/tests/execution/test-http-headers.md
+++ b/tests/execution/test-http-headers.md
@@ -1,5 +1,5 @@
 ---
-check_identity: true
+identity: true
 ---
 
 # test-http-headers
diff --git a/tests/execution/test-http-tmpl.md b/tests/execution/test-http-tmpl.md
index 9d7fda2f98..f9cbfd5265 100644
--- a/tests/execution/test-http-tmpl.md
+++ b/tests/execution/test-http-tmpl.md
@@ -1,5 +1,5 @@
 ---
-check_identity: true
+identity: true
 ---
 
 # test-http-tmpl
diff --git a/tests/execution/test-http-with-add-field.md b/tests/execution/test-http-with-add-field.md
index c9d6814564..1b99b7898f 100644
--- a/tests/execution/test-http-with-add-field.md
+++ b/tests/execution/test-http-with-add-field.md
@@ -1,5 +1,5 @@
 ---
-expect_validation_error: true
+error: true
 ---
 
 # test-http-with-add-field
diff --git a/tests/execution/test-http-with-inline.md b/tests/execution/test-http-with-inline.md
index b66ddb1a59..46636bbf3f 100644
--- a/tests/execution/test-http-with-inline.md
+++ b/tests/execution/test-http-with-inline.md
@@ -1,5 +1,5 @@
 ---
-expect_validation_error: true
+error: true
 ---
 
 # test-http-with-inline
diff --git a/tests/execution/test-http.md b/tests/execution/test-http.md
index 24dd33d8e9..5d975db4b6 100644
--- a/tests/execution/test-http.md
+++ b/tests/execution/test-http.md
@@ -1,5 +1,5 @@
 ---
-check_identity: true
+identity: true
 ---
 
 # test-http
diff --git a/tests/execution/test-inline-error.md b/tests/execution/test-inline-error.md
index 90b8e3cd65..c01c20be7b 100644
--- a/tests/execution/test-inline-error.md
+++ b/tests/execution/test-inline-error.md
@@ -1,5 +1,5 @@
 ---
-expect_validation_error: true
+error: true
 ---
 
 # test-inline-error
diff --git a/tests/execution/test-inline-list.md b/tests/execution/test-inline-list.md
index 559504b627..25d6086a86 100644
--- a/tests/execution/test-inline-list.md
+++ b/tests/execution/test-inline-list.md
@@ -1,5 +1,5 @@
 ---
-check_identity: true
+identity: true
 ---
 
 # test-inline-list
diff --git a/tests/execution/test-inline.md b/tests/execution/test-inline.md
index b9c723029a..a8345c95ab 100644
--- a/tests/execution/test-inline.md
+++ b/tests/execution/test-inline.md
@@ -1,5 +1,5 @@
 ---
-check_identity: true
+identity: true
 ---
 
 # test-inline
diff --git a/tests/execution/test-interface-result.md b/tests/execution/test-interface-result.md
index c88b502618..77f58d5ac8 100644
--- a/tests/execution/test-interface-result.md
+++ b/tests/execution/test-interface-result.md
@@ -1,5 +1,5 @@
 ---
-check_identity: true
+identity: true
 ---
 
 # test-interface-result
diff --git a/tests/execution/test-interface.md b/tests/execution/test-interface.md
index 1da10efacc..05a4b89b1c 100644
--- a/tests/execution/test-interface.md
+++ b/tests/execution/test-interface.md
@@ -1,5 +1,5 @@
 ---
-check_identity: true
+identity: true
 ---
 
 # test-interface
diff --git a/tests/execution/test-invalid-query-in-http.md b/tests/execution/test-invalid-query-in-http.md
index 0fc9da4e29..05cb8525d0 100644
--- a/tests/execution/test-invalid-query-in-http.md
+++ b/tests/execution/test-invalid-query-in-http.md
@@ -1,5 +1,5 @@
 ---
-expect_validation_error: true
+error: true
 ---
 
 # test-invalid-query-in-http
diff --git a/tests/execution/test-invalid-server.md b/tests/execution/test-invalid-server.md
index d1a1f4469a..35c476bb78 100644
--- a/tests/execution/test-invalid-server.md
+++ b/tests/execution/test-invalid-server.md
@@ -1,5 +1,5 @@
 ---
-expect_validation_error: true
+error: true
 ---
 
 # test-invalid-server
diff --git a/tests/execution/test-js-multiple-scripts.md b/tests/execution/test-js-multiple-scripts.md
index f362bab562..a9a6491357 100644
--- a/tests/execution/test-js-multiple-scripts.md
+++ b/tests/execution/test-js-multiple-scripts.md
@@ -1,5 +1,5 @@
 ---
-expect_validation_error: true
+error: true
 ---
 
 # Js Hello World
diff --git a/tests/execution/test-lack-resolver.md b/tests/execution/test-lack-resolver.md
index d8fecab03e..39893bf482 100644
--- a/tests/execution/test-lack-resolver.md
+++ b/tests/execution/test-lack-resolver.md
@@ -1,5 +1,5 @@
 ---
-expect_validation_error: true
+error: true
 ---
 
 # test-lack-resolver
diff --git a/tests/execution/test-missing-argument-on-all-resolvers.md b/tests/execution/test-missing-argument-on-all-resolvers.md
index 5e4b65168c..ef6ad59ce5 100644
--- a/tests/execution/test-missing-argument-on-all-resolvers.md
+++ b/tests/execution/test-missing-argument-on-all-resolvers.md
@@ -1,5 +1,5 @@
 ---
-expect_validation_error: true
+error: true
 ---
 
 # test-missing-argument-on-all-resolvers
diff --git a/tests/execution/test-missing-mutation-resolver.md b/tests/execution/test-missing-mutation-resolver.md
index 85d67ce6f8..d4df5ff5ed 100644
--- a/tests/execution/test-missing-mutation-resolver.md
+++ b/tests/execution/test-missing-mutation-resolver.md
@@ -1,5 +1,5 @@
 ---
-expect_validation_error: true
+error: true
 ---
 
 # test-missing-mutation-resolver
diff --git a/tests/execution/test-missing-query-resolver.md b/tests/execution/test-missing-query-resolver.md
index b79d9a8525..166d420538 100644
--- a/tests/execution/test-missing-query-resolver.md
+++ b/tests/execution/test-missing-query-resolver.md
@@ -1,5 +1,5 @@
 ---
-expect_validation_error: true
+error: true
 ---
 
 # test-missing-query-resolver
diff --git a/tests/execution/test-missing-root-types.md b/tests/execution/test-missing-root-types.md
index 580ff6798c..a654fb509c 100644
--- a/tests/execution/test-missing-root-types.md
+++ b/tests/execution/test-missing-root-types.md
@@ -1,5 +1,5 @@
 ---
-expect_validation_error: true
+error: true
 ---
 
 # test-missing-root-types
diff --git a/tests/execution/test-missing-schema-query.md b/tests/execution/test-missing-schema-query.md
index f7504fb60a..36174fcd1b 100644
--- a/tests/execution/test-missing-schema-query.md
+++ b/tests/execution/test-missing-schema-query.md
@@ -1,5 +1,5 @@
 ---
-expect_validation_error: true
+error: true
 ---
 
 # test-missing-schema-query
diff --git a/tests/execution/test-modify.md b/tests/execution/test-modify.md
index 8987fed4ec..bbb9f3d108 100644
--- a/tests/execution/test-modify.md
+++ b/tests/execution/test-modify.md
@@ -1,5 +1,5 @@
 ---
-check_identity: true
+identity: true
 ---
 
 # test-modify
diff --git a/tests/execution/test-multi-interface.md b/tests/execution/test-multi-interface.md
index 2aca6582ce..a7b064d489 100644
--- a/tests/execution/test-multi-interface.md
+++ b/tests/execution/test-multi-interface.md
@@ -1,5 +1,5 @@
 ---
-check_identity: true
+identity: true
 ---
 
 # test-multi-interface
diff --git a/tests/execution/test-multiple-resolvable-directives-on-field.md b/tests/execution/test-multiple-resolvable-directives-on-field.md
index f34331bc6d..70810b7676 100644
--- a/tests/execution/test-multiple-resolvable-directives-on-field.md
+++ b/tests/execution/test-multiple-resolvable-directives-on-field.md
@@ -1,5 +1,5 @@
 ---
-expect_validation_error: true
+error: true
 ---
 
 # test-multiple-resolvable-directives-on-field
diff --git a/tests/execution/test-nested-input.md b/tests/execution/test-nested-input.md
index 9619e7e902..3c452a7fce 100644
--- a/tests/execution/test-nested-input.md
+++ b/tests/execution/test-nested-input.md
@@ -1,5 +1,5 @@
 ---
-check_identity: true
+identity: true
 ---
 
 # test-nested-input
diff --git a/tests/execution/test-nested-link.md b/tests/execution/test-nested-link.md
index 259c1b4f71..907bfd2b2d 100644
--- a/tests/execution/test-nested-link.md
+++ b/tests/execution/test-nested-link.md
@@ -1,5 +1,5 @@
 ---
-check_identity: true
+identity: true
 ---
 
 # test-nested-link
diff --git a/tests/execution/test-nested-value.md b/tests/execution/test-nested-value.md
index 5bc1b6a4a5..000f28aa74 100644
--- a/tests/execution/test-nested-value.md
+++ b/tests/execution/test-nested-value.md
@@ -1,5 +1,5 @@
 ---
-check_identity: true
+identity: true
 ---
 
 # test-nested-value
diff --git a/tests/execution/test-no-base-url.md b/tests/execution/test-no-base-url.md
index 466f2fee8b..0b464c2c90 100644
--- a/tests/execution/test-no-base-url.md
+++ b/tests/execution/test-no-base-url.md
@@ -1,5 +1,5 @@
 ---
-expect_validation_error: true
+error: true
 ---
 
 # test-no-base-url
diff --git a/tests/execution/test-omit-list.md b/tests/execution/test-omit-list.md
index 6f2c1e3617..278c3f8443 100644
--- a/tests/execution/test-omit-list.md
+++ b/tests/execution/test-omit-list.md
@@ -1,5 +1,5 @@
 ---
-check_identity: true
+identity: true
 ---
 
 # test-omit-list
diff --git a/tests/execution/test-omit.md b/tests/execution/test-omit.md
index b0254ac62d..c01e5b8fbd 100644
--- a/tests/execution/test-omit.md
+++ b/tests/execution/test-omit.md
@@ -1,5 +1,5 @@
 ---
-check_identity: true
+identity: true
 ---
 
 # test-omit
diff --git a/tests/execution/test-query-documentation.md b/tests/execution/test-query-documentation.md
index 909d2ac8f4..eafadba8d8 100644
--- a/tests/execution/test-query-documentation.md
+++ b/tests/execution/test-query-documentation.md
@@ -1,5 +1,5 @@
 ---
-check_identity: true
+identity: true
 ---
 
 # test-query-documentation
diff --git a/tests/execution/test-query.md b/tests/execution/test-query.md
index 23cb62eed2..25ff876d38 100644
--- a/tests/execution/test-query.md
+++ b/tests/execution/test-query.md
@@ -1,5 +1,5 @@
 ---
-check_identity: true
+identity: true
 ---
 
 # test-query
diff --git a/tests/execution/test-ref-other.md b/tests/execution/test-ref-other.md
index c9453cac94..2c6c8f444c 100644
--- a/tests/execution/test-ref-other.md
+++ b/tests/execution/test-ref-other.md
@@ -1,5 +1,5 @@
 ---
-check_identity: true
+identity: true
 ---
 
 # test-ref-other
diff --git a/tests/execution/test-response-header-value.md b/tests/execution/test-response-header-value.md
index ae03756399..42e6c36590 100644
--- a/tests/execution/test-response-header-value.md
+++ b/tests/execution/test-response-header-value.md
@@ -1,5 +1,5 @@
 ---
-expect_validation_error: true
+error: true
 ---
 
 # test-response-header-value
diff --git a/tests/execution/test-response-headers-multi.md b/tests/execution/test-response-headers-multi.md
index 2d6fd4ff5d..9eb4b3dfd6 100644
--- a/tests/execution/test-response-headers-multi.md
+++ b/tests/execution/test-response-headers-multi.md
@@ -1,5 +1,5 @@
 ---
-expect_validation_error: true
+error: true
 ---
 
 # test-response-headers-multi
diff --git a/tests/execution/test-response-headers-name.md b/tests/execution/test-response-headers-name.md
index 802532fc09..a4cad1f5ed 100644
--- a/tests/execution/test-response-headers-name.md
+++ b/tests/execution/test-response-headers-name.md
@@ -1,5 +1,5 @@
 ---
-expect_validation_error: true
+error: true
 ---
 
 # test-response-headers-name
diff --git a/tests/execution/test-server-vars.md b/tests/execution/test-server-vars.md
index d0c1a72c2d..05f42be64b 100644
--- a/tests/execution/test-server-vars.md
+++ b/tests/execution/test-server-vars.md
@@ -1,5 +1,5 @@
 ---
-check_identity: true
+identity: true
 ---
 
 # test-server-vars
diff --git a/tests/execution/test-tag.md b/tests/execution/test-tag.md
index d6eb8ad931..ef8e6dafef 100644
--- a/tests/execution/test-tag.md
+++ b/tests/execution/test-tag.md
@@ -1,5 +1,5 @@
 ---
-check_identity: true
+identity: true
 ---
 
 # test-tag
diff --git a/tests/execution/test-undefined-query.md b/tests/execution/test-undefined-query.md
index e94e6225d9..8194f0e304 100644
--- a/tests/execution/test-undefined-query.md
+++ b/tests/execution/test-undefined-query.md
@@ -1,5 +1,5 @@
 ---
-expect_validation_error: true
+error: true
 ---
 
 # test-undefined-query
diff --git a/tests/execution/test-union.md b/tests/execution/test-union.md
index c88431d143..068ff67514 100644
--- a/tests/execution/test-union.md
+++ b/tests/execution/test-union.md
@@ -1,5 +1,5 @@
 ---
-check_identity: true
+identity: true
 ---
 
 # test-union
diff --git a/tests/execution/test-upstream.md b/tests/execution/test-upstream.md
index 7ddacaafa4..c5e7ffa0a2 100644
--- a/tests/execution/test-upstream.md
+++ b/tests/execution/test-upstream.md
@@ -1,5 +1,5 @@
 ---
-check_identity: true
+identity: true
 ---
 
 # test-upstream
diff --git a/tests/execution/undeclared-type-no-base-url.md b/tests/execution/undeclared-type-no-base-url.md
index 9b15b65637..161a46ab1c 100644
--- a/tests/execution/undeclared-type-no-base-url.md
+++ b/tests/execution/undeclared-type-no-base-url.md
@@ -1,5 +1,5 @@
 ---
-expect_validation_error: true
+error: true
 ---
 
 # undeclared-type-no-base-url
diff --git a/tests/execution/undeclared-type.md b/tests/execution/undeclared-type.md
index df7577de1b..8f43d0faff 100644
--- a/tests/execution/undeclared-type.md
+++ b/tests/execution/undeclared-type.md
@@ -1,5 +1,5 @@
 ---
-expect_validation_error: true
+error: true
 ---
 
 # undeclared-type