Merge commit 'b9ff8c481f054bff83dad4c5b4da0efc221175f2'

* commit 'b9ff8c481f054bff83dad4c5b4da0efc221175f2':
  Squashed 'json/' changes from f82764080..91ecacf60

61 files changed, 198 insertions, 191 deletions

diff --git a/json/bin/jsonschema_suite b/json/bin/jsonschema_suite
index bd77ee4..000103c 100755
--- a/json/bin/jsonschema_suite
+++ b/json/bin/jsonschema_suite
@@ -94,6 +94,27 @@ class SanityTests(unittest.TestCase):
             seen.add(each)
         self.assertFalse(duplicated, "Elements are not unique.")
 
+    def assertFollowsDescriptionStyle(self, description):
+        """
+        Instead of saying "test that X frobs" or "X should frob" use "X frobs".
+
+        See e.g. https://jml.io/pages/test-docstrings.html
+
+        This test isn't comprehensive (it doesn't catch all the extra
+        verbiage there), but it's just to catch whatever it manages to
+        cover.
+        """
+
+        message = (
+            "In descriptions, don't say 'Test that X frobs' or 'X should "
+            "frob' or 'X should be valid'. Just say 'X frobs' or 'X is "
+            "valid'. It's shorter, and the test suite is entirely about "
+            "what *should* be already. "
+            "See https://jml.io/pages/test-docstrings.html for help."
+        )
+        self.assertNotRegex(description, r"\bshould\b", message)
+        self.assertNotRegex(description, r"(?i)\btest(s)? that\b", message)
+
     def test_all_test_files_are_valid_json(self):
         """
         All test files contain valid JSON.
@@ -160,36 +181,15 @@ class SanityTests(unittest.TestCase):
                 )
         print(f"Found {count} test cases.")
 
-    def test_descriptions_do_not_use_modal_verbs(self):
-        """
-        Instead of saying "test that X frobs" or "X should frob" use "X frobs".
-
-        See e.g. https://jml.io/pages/test-docstrings.html
-
-        This test isn't comprehensive (it doesn't catch all the extra
-        verbiage there), but it's just to catch whatever it manages to
-        cover.
-        """
+    def test_case_descriptions_do_not_use_modal_verbs(self):
+        for case in cases(self.test_files):
+            with self.subTest(description=case["description"]):
+                self.assertFollowsDescriptionStyle(case["description"])
 
-        message = (
-            "In descriptions, don't say 'Test that X frobs' or 'X should "
-            "frob' or 'X should be valid'. Just say 'X frobs' or 'X is "
-            "valid'. It's shorter, and the test suite is entirely about "
-            "what *should* be already. "
-            "See https://jml.io/pages/test-docstrings.html for help."
-        )
+    def test_test_descriptions_do_not_use_modal_verbs(self):
         for test in tests(self.test_files):
             with self.subTest(description=test["description"]):
-                self.assertNotRegex(
-                    test["description"],
-                    r"\bshould\b",
-                    message,
-                )
-                self.assertNotRegex(
-                    test["description"],
-                    r"(?i)\btest(s)? that\b",
-                    message,
-                )
+                self.assertFollowsDescriptionStyle(test["description"])
 
     @unittest.skipIf(jsonschema is None, "Validation library not present!")
     def test_all_schemas_are_valid(self):
diff --git a/json/tests/draft-next/additionalProperties.json b/json/tests/draft-next/additionalProperties.json
index 98b8842..0f8e162 100644
--- a/json/tests/draft-next/additionalProperties.json
+++ b/json/tests/draft-next/additionalProperties.json
@@ -60,8 +60,7 @@
         ]
     },
     {
-        "description":
-            "additionalProperties allows a schema which should validate",
+        "description": "additionalProperties with schema",
         "schema": {
             "properties": {"foo": {}, "bar": {}},
             "additionalProperties": {"type": "boolean"}
@@ -115,7 +114,7 @@
         ]
     },
     {
-        "description": "additionalProperties should not look in applicators",
+        "description": "additionalProperties does not look in applicators",
         "schema": {
             "allOf": [
                 {"properties": {"foo": {}}}
@@ -131,7 +130,7 @@
         ]
     },
     {
-        "description": "additionalProperties should properly handle null data",
+        "description": "additionalProperties with null valued instance properties",
         "schema": {
             "additionalProperties": {
                 "type": "null"
@@ -139,7 +138,7 @@
         },
         "tests": [
             {
-                "description": "null properties allowed",
+                "description": "allows null values",
                 "data": {"foo": null},
                 "valid": true
             }
diff --git a/json/tests/draft-next/contains.json b/json/tests/draft-next/contains.json
index 5f3d05a..4645a14 100644
--- a/json/tests/draft-next/contains.json
+++ b/json/tests/draft-next/contains.json
@@ -239,7 +239,7 @@
         ]
     },
     {
-        "description": "contains should properly handle null data",
+        "description": "contains with null instance elements",
         "schema": {
             "contains": {
                 "type": "null"
@@ -247,7 +247,7 @@
         },
         "tests": [
             {
-                "description": "null items allowed",
+                "description": "allows null items",
                 "data": [ null ],
                 "valid": true
             }
diff --git a/json/tests/draft-next/dynamicRef.json b/json/tests/draft-next/dynamicRef.json
index 79f04b5..fdb0a1a 100644
--- a/json/tests/draft-next/dynamicRef.json
+++ b/json/tests/draft-next/dynamicRef.json
@@ -1,6 +1,6 @@
 [
     {
-        "description": "A $dynamicRef to a $dynamicAnchor in the same schema resource should behave like a normal $ref to an $anchor",
+        "description": "A $dynamicRef to a $dynamicAnchor in the same schema resource behaves like a normal $ref to an $anchor",
         "schema": {
             "$id": "https://test.json-schema.org/dynamicRef-dynamicAnchor-same-schema/root",
             "type": "array",
@@ -26,7 +26,7 @@
         ]
     },
     {
-        "description": "A $ref to a $dynamicAnchor in the same schema resource should behave like a normal $ref to an $anchor",
+        "description": "A $ref to a $dynamicAnchor in the same schema resource behaves like a normal $ref to an $anchor",
         "schema": {
             "$id": "https://test.json-schema.org/ref-dynamicAnchor-same-schema/root",
             "type": "array",
@@ -52,7 +52,7 @@
         ]
     },
     {
-        "description": "A $dynamicRef should resolve to the first $dynamicAnchor still in scope that is encountered when the schema is evaluated",
+        "description": "A $dynamicRef resolves to the first $dynamicAnchor still in scope that is encountered when the schema is evaluated",
         "schema": {
             "$id": "https://test.json-schema.org/typical-dynamic-resolution/root",
             "$ref": "list",
@@ -82,7 +82,7 @@
         ]
     },
     {
-        "description": "A $dynamicRef with intermediate scopes that don't include a matching $dynamicAnchor should not affect dynamic scope resolution",
+        "description": "A $dynamicRef with intermediate scopes that don't include a matching $dynamicAnchor does not affect dynamic scope resolution",
         "schema": {
             "$id": "https://test.json-schema.org/dynamic-resolution-with-intermediate-scopes/root",
             "$ref": "intermediate-scope",
@@ -116,7 +116,7 @@
         ]
     },
     {
-        "description": "An $anchor with the same name as a $dynamicAnchor should not be used for dynamic scope resolution",
+        "description": "An $anchor with the same name as a $dynamicAnchor is not used for dynamic scope resolution",
         "schema": {
             "$id": "https://test.json-schema.org/dynamic-resolution-ignores-anchors/root",
             "$ref": "list",
@@ -146,7 +146,7 @@
         ]
     },
     {
-        "description": "A $dynamicRef that initially resolves to a schema with a matching $dynamicAnchor should resolve to the first $dynamicAnchor in the dynamic scope",
+        "description": "A $dynamicRef that initially resolves to a schema with a matching $dynamicAnchor resolves to the first $dynamicAnchor in the dynamic scope",
         "schema": {
             "$id": "https://test.json-schema.org/relative-dynamic-reference/root",
             "$dynamicAnchor": "meta",
@@ -243,7 +243,7 @@
         ]
     },
     {
-        "description": "after leaving a dynamic scope, it should not be used by a $dynamicRef",
+        "description": "after leaving a dynamic scope, it is not used by a $dynamicRef",
         "schema": {
             "$id": "https://test.json-schema.org/dynamic-ref-leaving-dynamic-scope/main",
             "if": {
diff --git a/json/tests/draft-next/items.json b/json/tests/draft-next/items.json
index 01f20e6..38ab0e0 100644
--- a/json/tests/draft-next/items.json
+++ b/json/tests/draft-next/items.json
@@ -254,7 +254,7 @@
         ]
     },
     {
-        "description": "items with null",
+        "description": "items with null instance elements",
         "schema": {
             "items": {
                 "type": "null"
diff --git a/json/tests/draft-next/multipleOf.json b/json/tests/draft-next/multipleOf.json
index faa87cf..25c25a9 100644
--- a/json/tests/draft-next/multipleOf.json
+++ b/json/tests/draft-next/multipleOf.json
@@ -58,7 +58,7 @@
         ]
     },
     {
-        "description": "invalid instance should not raise error when float division = inf",
+        "description": "float division = inf",
         "schema": {"type": "integer", "multipleOf": 0.123456789},
         "tests": [
             {
diff --git a/json/tests/draft-next/optional/ecmascript-regex.json b/json/tests/draft-next/optional/ecmascript-regex.json
index 9f79d42..e273c95 100644
--- a/json/tests/draft-next/optional/ecmascript-regex.json
+++ b/json/tests/draft-next/optional/ecmascript-regex.json
@@ -290,7 +290,7 @@
         ]
     },
     {
-        "description": "unicode semantics should be used for all pattern matching",
+        "description": "patterns always use unicode semantics with pattern",
         "schema": { "pattern": "\\p{Letter}cole" },
         "tests": [
             {
@@ -416,7 +416,7 @@
         ]
     },
     {
-        "description": "unicode semantics should be used for all patternProperties matching",
+        "description": "patterns always use unicode semantics with patternProperties",
         "schema": {
             "type": "object",
             "patternProperties": {
diff --git a/json/tests/draft-next/patternProperties.json b/json/tests/draft-next/patternProperties.json
index 34b2e85..c276e64 100644
--- a/json/tests/draft-next/patternProperties.json
+++ b/json/tests/draft-next/patternProperties.json
@@ -154,7 +154,7 @@
         ]
     },
     {
-        "description": "patternProperties should properly handle null data",
+        "description": "patternProperties with null valued instance properties",
         "schema": {
             "patternProperties": {
                 "^.*bar$": {"type": "null"}
@@ -162,7 +162,7 @@
         },
         "tests": [
             {
-                "description": "null properties allowed",
+                "description": "allows null values",
                 "data": {"foobar": null},
                 "valid": true
             }
diff --git a/json/tests/draft-next/prefixItems.json b/json/tests/draft-next/prefixItems.json
index 8dc58ed..aab1e36 100644
--- a/json/tests/draft-next/prefixItems.json
+++ b/json/tests/draft-next/prefixItems.json
@@ -79,7 +79,7 @@
         ]
     },
     {
-        "description": "prefixItems properly handles null data",
+        "description": "prefixItems with null instance elements",
         "schema": {
             "prefixItems": [
                 {
@@ -89,7 +89,7 @@
         },
         "tests": [
             {
-                "description": "null items allowed",
+                "description": "allows null elements",
                 "data": [ null ],
                 "valid": true
             }
diff --git a/json/tests/draft-next/properties.json b/json/tests/draft-next/properties.json
index 8c3ed35..21a2e09 100644
--- a/json/tests/draft-next/properties.json
+++ b/json/tests/draft-next/properties.json
@@ -165,7 +165,7 @@
         ]
     },
     {
-        "description": "properties should properly handle null data",
+        "description": "properties with null valued instance properties",
         "schema": {
             "properties": {
                 "foo": {"type": "null"}
@@ -173,7 +173,7 @@
         },
         "tests": [
             {
-                "description": "null properties allowed",
+                "description": "allows null values",
                 "data": {"foo": null},
                 "valid": true
             }
diff --git a/json/tests/draft-next/unevaluatedItems.json b/json/tests/draft-next/unevaluatedItems.json
index eedb19f..14c8d95 100644
--- a/json/tests/draft-next/unevaluatedItems.json
+++ b/json/tests/draft-next/unevaluatedItems.json
@@ -627,7 +627,7 @@
         ]
     },
     {
-        "description": "unevaluatedItems should properly handle null data",
+        "description": "unevaluatedItems with null instance elements",
         "schema": {
             "unevaluatedItems": {
                 "type": "null"
@@ -635,7 +635,7 @@
         },
         "tests": [
             {
-                "description": "null items allowed",
+                "description": "allows null elements",
                 "data": [ null ],
                 "valid": true
             }
diff --git a/json/tests/draft-next/unevaluatedProperties.json b/json/tests/draft-next/unevaluatedProperties.json
index e7865d1..0d5c4b8 100644
--- a/json/tests/draft-next/unevaluatedProperties.json
+++ b/json/tests/draft-next/unevaluatedProperties.json
@@ -1392,5 +1392,20 @@
                 "valid": true
             }
         ]
+    },
+    {
+        "description": "unevaluatedProperties with null valued instance properties",
+        "schema": {
+            "unevaluatedProperties": {
+                "type": "null"
+            }
+        },
+        "tests": [
+            {
+                "description": "allows null valued properties",
+                "data": {"foo": null},
+                "valid": true
+            }
+        ]
     }
 ]
diff --git a/json/tests/draft2019-09/additionalItems.json b/json/tests/draft2019-09/additionalItems.json
index 454142b..deb44fd 100644
--- a/json/tests/draft2019-09/additionalItems.json
+++ b/json/tests/draft2019-09/additionalItems.json
@@ -95,7 +95,7 @@
         ]
     },
     {
-        "description": "additionalItems should not look in applicators, valid case",
+        "description": "additionalItems does not look in applicators, valid case",
         "schema": {
             "allOf": [
                 { "items": [ { "type": "integer" } ] }
@@ -111,7 +111,7 @@
         ]
     },
     {
-        "description": "additionalItems should not look in applicators, invalid case",
+        "description": "additionalItems does not look in applicators, invalid case",
         "schema": {
             "allOf": [
                 { "items": [ { "type": "integer" }, { "type": "string" } ] }
@@ -147,7 +147,7 @@
         ]
     },
     {
-        "description": "additionalItems should properly handle null data",
+        "description": "additionalItems with null instance elements",
         "schema": {
             "additionalItems": {
                 "type": "null"
@@ -155,7 +155,7 @@
         },
         "tests": [
             {
-                "description": "null items allowed",
+                "description": "allows null elements",
                 "data": [ null ],
                 "valid": true
             }
diff --git a/json/tests/draft2019-09/additionalProperties.json b/json/tests/draft2019-09/additionalProperties.json
index 98b8842..0f8e162 100644
--- a/json/tests/draft2019-09/additionalProperties.json
+++ b/json/tests/draft2019-09/additionalProperties.json
@@ -60,8 +60,7 @@
         ]
     },
     {
-        "description":
-            "additionalProperties allows a schema which should validate",
+        "description": "additionalProperties with schema",
         "schema": {
             "properties": {"foo": {}, "bar": {}},
             "additionalProperties": {"type": "boolean"}
@@ -115,7 +114,7 @@
         ]
     },
     {
-        "description": "additionalProperties should not look in applicators",
+        "description": "additionalProperties does not look in applicators",
         "schema": {
             "allOf": [
                 {"properties": {"foo": {}}}
@@ -131,7 +130,7 @@
         ]
     },
     {
-        "description": "additionalProperties should properly handle null data",
+        "description": "additionalProperties with null valued instance properties",
         "schema": {
             "additionalProperties": {
                 "type": "null"
@@ -139,7 +138,7 @@
         },
         "tests": [
             {
-                "description": "null properties allowed",
+                "description": "allows null values",
                 "data": {"foo": null},
                 "valid": true
             }
diff --git a/json/tests/draft2019-09/contains.json b/json/tests/draft2019-09/contains.json
index a6add6b..2b1a515 100644
--- a/json/tests/draft2019-09/contains.json
+++ b/json/tests/draft2019-09/contains.json
@@ -148,7 +148,7 @@
         ]
     },
     {
-        "description": "contains should properly handle null data",
+        "description": "contains with null instance elements",
         "schema": {
             "contains": {
                 "type": "null"
@@ -156,7 +156,7 @@
         },
         "tests": [
             {
-                "description": "null items allowed",
+                "description": "allows null items",
                 "data": [ null ],
                 "valid": true
             }
diff --git a/json/tests/draft2019-09/items.json b/json/tests/draft2019-09/items.json
index c77ba0b..e46a25b 100644
--- a/json/tests/draft2019-09/items.json
+++ b/json/tests/draft2019-09/items.json
@@ -248,7 +248,7 @@
         ]
     },
     {
-        "description": "single-form items should properly handle null data",
+        "description": "single-form items with null instance elements",
         "schema": {
             "items": {
                 "type": "null"
@@ -256,7 +256,7 @@
         },
         "tests": [
             {
-                "description": "null properties allowed",
+                "description": "allows null elements",
                 "data": [ null ],
                 "valid": true
             }
diff --git a/json/tests/draft2019-09/multipleOf.json b/json/tests/draft2019-09/multipleOf.json
index faa87cf..25c25a9 100644
--- a/json/tests/draft2019-09/multipleOf.json
+++ b/json/tests/draft2019-09/multipleOf.json
@@ -58,7 +58,7 @@
         ]
     },
     {
-        "description": "invalid instance should not raise error when float division = inf",
+        "description": "float division = inf",
         "schema": {"type": "integer", "multipleOf": 0.123456789},
         "tests": [
             {
diff --git a/json/tests/draft2019-09/optional/ecmascript-regex.json b/json/tests/draft2019-09/optional/ecmascript-regex.json
index 764248f..c4886aa 100644
--- a/json/tests/draft2019-09/optional/ecmascript-regex.json
+++ b/json/tests/draft2019-09/optional/ecmascript-regex.json
@@ -290,7 +290,7 @@
         ]
     },
     {
-        "description": "unicode semantics should be used for all pattern matching",
+        "description": "patterns always use unicode semantics with pattern",
         "schema": { "pattern": "\\p{Letter}cole" },
         "tests": [
             {
@@ -405,7 +405,7 @@
         ]
     },
     {
-        "description": "unicode semantics should be used for all patternProperties matching",
+        "description": "patterns always use unicode semantics with patternProperties",
         "schema": {
             "type": "object",
             "patternProperties": {
diff --git a/json/tests/draft2019-09/patternProperties.json b/json/tests/draft2019-09/patternProperties.json
index 34b2e85..c276e64 100644
--- a/json/tests/draft2019-09/patternProperties.json
+++ b/json/tests/draft2019-09/patternProperties.json
@@ -154,7 +154,7 @@
         ]
     },
     {
-        "description": "patternProperties should properly handle null data",
+        "description": "patternProperties with null valued instance properties",
         "schema": {
             "patternProperties": {
                 "^.*bar$": {"type": "null"}
@@ -162,7 +162,7 @@
         },
         "tests": [
             {
-                "description": "null properties allowed",
+                "description": "allows null values",
                 "data": {"foobar": null},
                 "valid": true
             }
diff --git a/json/tests/draft2019-09/properties.json b/json/tests/draft2019-09/properties.json
index 8c3ed35..21a2e09 100644
--- a/json/tests/draft2019-09/properties.json
+++ b/json/tests/draft2019-09/properties.json
@@ -165,7 +165,7 @@
         ]
     },
     {
-        "description": "properties should properly handle null data",
+        "description": "properties with null valued instance properties",
         "schema": {
             "properties": {
                 "foo": {"type": "null"}
@@ -173,7 +173,7 @@
         },
         "tests": [
             {
-                "description": "null properties allowed",
+                "description": "allows null values",
                 "data": {"foo": null},
                 "valid": true
             }
diff --git a/json/tests/draft2019-09/unevaluatedItems.json b/json/tests/draft2019-09/unevaluatedItems.json
index 3bf8483..fa7ad7c 100644
--- a/json/tests/draft2019-09/unevaluatedItems.json
+++ b/json/tests/draft2019-09/unevaluatedItems.json
@@ -517,7 +517,7 @@
         ]
     },
     {
-        "description": "unevaluatedItems should properly handle null data",
+        "description": "unevaluatedItems with null instance elements",
         "schema": {
             "unevaluatedItems": {
                 "type": "null"
@@ -525,7 +525,7 @@
         },
         "tests": [
             {
-                "description": "null items allowed",
+                "description": "allows null elements",
                 "data": [ null ],
                 "valid": true
             }
diff --git a/json/tests/draft2019-09/unevaluatedProperties.json b/json/tests/draft2019-09/unevaluatedProperties.json
index 894f683..e39b21d 100644
--- a/json/tests/draft2019-09/unevaluatedProperties.json
+++ b/json/tests/draft2019-09/unevaluatedProperties.json
@@ -1345,7 +1345,7 @@
         ]
     },
     {
-        "description": "unevaluatedProperties should properly handle null data",
+        "description": "unevaluatedProperties with null valued instance properties",
         "schema": {
             "unevaluatedProperties": {
                 "type": "null"
@@ -1353,7 +1353,7 @@
         },
         "tests": [
             {
-                "description": "null properties allowed",
+                "description": "allows null valued properties",
                 "data": {"foo": null},
                 "valid": true
             }
diff --git a/json/tests/draft2020-12/additionalProperties.json b/json/tests/draft2020-12/additionalProperties.json
index 98b8842..0f8e162 100644
--- a/json/tests/draft2020-12/additionalProperties.json
+++ b/json/tests/draft2020-12/additionalProperties.json
@@ -60,8 +60,7 @@
         ]
     },
     {
-        "description":
-            "additionalProperties allows a schema which should validate",
+        "description": "additionalProperties with schema",
         "schema": {
             "properties": {"foo": {}, "bar": {}},
             "additionalProperties": {"type": "boolean"}
@@ -115,7 +114,7 @@
         ]
     },
     {
-        "description": "additionalProperties should not look in applicators",
+        "description": "additionalProperties does not look in applicators",
         "schema": {
             "allOf": [
                 {"properties": {"foo": {}}}
@@ -131,7 +130,7 @@
         ]
     },
     {
-        "description": "additionalProperties should properly handle null data",
+        "description": "additionalProperties with null valued instance properties",
         "schema": {
             "additionalProperties": {
                 "type": "null"
@@ -139,7 +138,7 @@
         },
         "tests": [
             {
-                "description": "null properties allowed",
+                "description": "allows null values",
                 "data": {"foo": null},
                 "valid": true
             }
diff --git a/json/tests/draft2020-12/contains.json b/json/tests/draft2020-12/contains.json
index a6add6b..2b1a515 100644
--- a/json/tests/draft2020-12/contains.json
+++ b/json/tests/draft2020-12/contains.json
@@ -148,7 +148,7 @@
         ]
     },
     {
-        "description": "contains should properly handle null data",
+        "description": "contains with null instance elements",
         "schema": {
             "contains": {
                 "type": "null"
@@ -156,7 +156,7 @@
         },
         "tests": [
             {
-                "description": "null items allowed",
+                "description": "allows null items",
                 "data": [ null ],
                 "valid": true
             }
diff --git a/json/tests/draft2020-12/dynamicRef.json b/json/tests/draft2020-12/dynamicRef.json
index 3a51356..c0a40c4 100644
--- a/json/tests/draft2020-12/dynamicRef.json
+++ b/json/tests/draft2020-12/dynamicRef.json
@@ -1,6 +1,6 @@
 [
     {
-        "description": "A $dynamicRef to a $dynamicAnchor in the same schema resource should behave like a normal $ref to an $anchor",
+        "description": "A $dynamicRef to a $dynamicAnchor in the same schema resource behaves like a normal $ref to an $anchor",
         "schema": {
             "$id": "https://test.json-schema.org/dynamicRef-dynamicAnchor-same-schema/root",
             "type": "array",
@@ -26,7 +26,7 @@
         ]
     },
     {
-        "description": "A $dynamicRef to an $anchor in the same schema resource should behave like a normal $ref to an $anchor",
+        "description": "A $dynamicRef to an $anchor in the same schema resource behaves like a normal $ref to an $anchor",
         "schema": {
             "$id": "https://test.json-schema.org/dynamicRef-anchor-same-schema/root",
             "type": "array",
@@ -52,7 +52,7 @@
         ]
     },
     {
-        "description": "A $ref to a $dynamicAnchor in the same schema resource should behave like a normal $ref to an $anchor",
+        "description": "A $ref to a $dynamicAnchor in the same schema resource behaves like a normal $ref to an $anchor",
         "schema": {
             "$id": "https://test.json-schema.org/ref-dynamicAnchor-same-schema/root",
             "type": "array",
@@ -78,7 +78,7 @@
         ]
     },
     {
-        "description": "A $dynamicRef should resolve to the first $dynamicAnchor still in scope that is encountered when the schema is evaluated",
+        "description": "A $dynamicRef resolves to the first $dynamicAnchor still in scope that is encountered when the schema is evaluated",
         "schema": {
             "$id": "https://test.json-schema.org/typical-dynamic-resolution/root",
             "$ref": "list",
@@ -114,7 +114,7 @@
         ]
     },
     {
-        "description": "A $dynamicRef with intermediate scopes that don't include a matching $dynamicAnchor should not affect dynamic scope resolution",
+        "description": "A $dynamicRef with intermediate scopes that don't include a matching $dynamicAnchor does not affect dynamic scope resolution",
         "schema": {
             "$id": "https://test.json-schema.org/dynamic-resolution-with-intermediate-scopes/root",
             "$ref": "intermediate-scope",
@@ -154,7 +154,7 @@
         ]
     },
     {
-        "description": "An $anchor with the same name as a $dynamicAnchor should not be used for dynamic scope resolution",
+        "description": "An $anchor with the same name as a $dynamicAnchor is not used for dynamic scope resolution",
         "schema": {
             "$id": "https://test.json-schema.org/dynamic-resolution-ignores-anchors/root",
             "$ref": "list",
@@ -185,7 +185,7 @@
         ]
     },
     {
-        "description": "A $dynamicRef without a matching $dynamicAnchor in the same schema resource should behave like a normal $ref to $anchor",
+        "description": "A $dynamicRef without a matching $dynamicAnchor in the same schema resource behaves like a normal $ref to $anchor",
         "schema": {
             "$id": "https://test.json-schema.org/dynamic-resolution-without-bookend/root",
             "$ref": "list",
@@ -216,7 +216,7 @@
         ]
     },
     {
-        "description": "A $dynamicRef with a non-matching $dynamicAnchor in the same schema resource should behave like a normal $ref to $anchor",
+        "description": "A $dynamicRef with a non-matching $dynamicAnchor in the same schema resource behaves like a normal $ref to $anchor",
         "schema": {
             "$id": "https://test.json-schema.org/unmatched-dynamic-anchor/root",
             "$ref": "list",
@@ -248,7 +248,7 @@
         ]
     },
     {
-        "description": "A $dynamicRef that initially resolves to a schema with a matching $dynamicAnchor should resolve to the first $dynamicAnchor in the dynamic scope",
+        "description": "A $dynamicRef that initially resolves to a schema with a matching $dynamicAnchor resolves to the first $dynamicAnchor in the dynamic scope",
         "schema": {
             "$id": "https://test.json-schema.org/relative-dynamic-reference/root",
             "$dynamicAnchor": "meta",
@@ -299,7 +299,7 @@
         ]
     },
     {
-        "description": "A $dynamicRef that initially resolves to a schema without a matching $dynamicAnchor should behave like a normal $ref to $anchor",
+        "description": "A $dynamicRef that initially resolves to a schema without a matching $dynamicAnchor behaves like a normal $ref to $anchor",
         "schema": {
             "$id": "https://test.json-schema.org/relative-dynamic-reference-without-bookend/root",
             "$dynamicAnchor": "meta",
@@ -386,7 +386,7 @@
         ]
     },
     {
-        "description": "after leaving a dynamic scope, it should not be used by a $dynamicRef",
+        "description": "after leaving a dynamic scope, it is not used by a $dynamicRef",
         "schema": {
             "$id": "https://test.json-schema.org/dynamic-ref-leaving-dynamic-scope/main",
             "if": {
diff --git a/json/tests/draft2020-12/multipleOf.json b/json/tests/draft2020-12/multipleOf.json
index faa87cf..25c25a9 100644
--- a/json/tests/draft2020-12/multipleOf.json
+++ b/json/tests/draft2020-12/multipleOf.json
@@ -58,7 +58,7 @@
         ]
     },
     {
-        "description": "invalid instance should not raise error when float division = inf",
+        "description": "float division = inf",
         "schema": {"type": "integer", "multipleOf": 0.123456789},
         "tests": [
             {
diff --git a/json/tests/draft2020-12/optional/ecmascript-regex.json b/json/tests/draft2020-12/optional/ecmascript-regex.json
index 4d57efa..3ab9aaf 100644
--- a/json/tests/draft2020-12/optional/ecmascript-regex.json
+++ b/json/tests/draft2020-12/optional/ecmascript-regex.json
@@ -290,7 +290,7 @@
         ]
     },
     {
-        "description": "unicode semantics should be used for all pattern matching",
+        "description": "patterns always use unicode semantics with pattern",
         "schema": { "pattern": "\\p{Letter}cole" },
         "tests": [
             {
@@ -416,7 +416,7 @@
         ]
     },
     {
-        "description": "unicode semantics should be used for all patternProperties matching",
+        "description": "patterns always use unicode semantics with patternProperties",
         "schema": {
             "type": "object",
             "patternProperties": {
diff --git a/json/tests/draft2020-12/patternProperties.json b/json/tests/draft2020-12/patternProperties.json
index 34b2e85..c276e64 100644
--- a/json/tests/draft2020-12/patternProperties.json
+++ b/json/tests/draft2020-12/patternProperties.json
@@ -154,7 +154,7 @@
         ]
     },
     {
-        "description": "patternProperties should properly handle null data",
+        "description": "patternProperties with null valued instance properties",
         "schema": {
             "patternProperties": {
                 "^.*bar$": {"type": "null"}
@@ -162,7 +162,7 @@
         },
         "tests": [
             {
-                "description": "null properties allowed",
+                "description": "allows null values",
                 "data": {"foobar": null},
                 "valid": true
             }
diff --git a/json/tests/draft2020-12/prefixItems.json b/json/tests/draft2020-12/prefixItems.json
index f72da11..aab1e36 100644
--- a/json/tests/draft2020-12/prefixItems.json
+++ b/json/tests/draft2020-12/prefixItems.json
@@ -79,7 +79,7 @@
         ]
     },
     {
-        "description": "prefixItems should properly handle null data",
+        "description": "prefixItems with null instance elements",
         "schema": {
             "prefixItems": [
                 {
@@ -89,7 +89,7 @@
         },
         "tests": [
             {
-                "description": "null items allowed",
+                "description": "allows null elements",
                 "data": [ null ],
                 "valid": true
             }
diff --git a/json/tests/draft2020-12/properties.json b/json/tests/draft2020-12/properties.json
index 8c3ed35..21a2e09 100644
--- a/json/tests/draft2020-12/properties.json
+++ b/json/tests/draft2020-12/properties.json
@@ -165,7 +165,7 @@
         ]
     },
     {
-        "description": "properties should properly handle null data",
+        "description": "properties with null valued instance properties",
         "schema": {
             "properties": {
                 "foo": {"type": "null"}
@@ -173,7 +173,7 @@
         },
         "tests": [
             {
-                "description": "null properties allowed",
+                "description": "allows null values",
                 "data": {"foo": null},
                 "valid": true
             }
diff --git a/json/tests/draft2020-12/unevaluatedItems.json b/json/tests/draft2020-12/unevaluatedItems.json
index eedb19f..14c8d95 100644
--- a/json/tests/draft2020-12/unevaluatedItems.json
+++ b/json/tests/draft2020-12/unevaluatedItems.json
@@ -627,7 +627,7 @@
         ]
     },
     {
-        "description": "unevaluatedItems should properly handle null data",
+        "description": "unevaluatedItems with null instance elements",
         "schema": {
             "unevaluatedItems": {
                 "type": "null"
@@ -635,7 +635,7 @@
         },
         "tests": [
             {
-                "description": "null items allowed",
+                "description": "allows null elements",
                 "data": [ null ],
                 "valid": true
             }
diff --git a/json/tests/draft2020-12/unevaluatedProperties.json b/json/tests/draft2020-12/unevaluatedProperties.json
index 894f683..e39b21d 100644
--- a/json/tests/draft2020-12/unevaluatedProperties.json
+++ b/json/tests/draft2020-12/unevaluatedProperties.json
@@ -1345,7 +1345,7 @@
         ]
     },
     {
-        "description": "unevaluatedProperties should properly handle null data",
+        "description": "unevaluatedProperties with null valued instance properties",
         "schema": {
             "unevaluatedProperties": {
                 "type": "null"
@@ -1353,7 +1353,7 @@
         },
         "tests": [
             {
-                "description": "null properties allowed",
+                "description": "allows null valued properties",
                 "data": {"foo": null},
                 "valid": true
             }
diff --git a/json/tests/draft3/additionalItems.json b/json/tests/draft3/additionalItems.json
index 24b1d86..0cb6687 100644
--- a/json/tests/draft3/additionalItems.json
+++ b/json/tests/draft3/additionalItems.json
@@ -95,7 +95,7 @@
         ]
     },
     {
-        "description": "additionalItems should not look in applicators",
+        "description": "additionalItems does not look in applicators",
         "schema": {
             "extends": [
                 { "items": [ { "type": "integer" } ] }
@@ -111,7 +111,7 @@
         ]
     },
     {
-        "description": "additionalItems should properly handle null data",
+        "description": "additionalItems with null instance elements",
         "schema": {
             "additionalItems": {
                 "type": "null"
@@ -119,7 +119,7 @@
         },
         "tests": [
             {
-                "description": "null items allowed",
+                "description": "allows null elements",
                 "data": [ null ],
                 "valid": true
             }
diff --git a/json/tests/draft3/additionalProperties.json b/json/tests/draft3/additionalProperties.json
index 0a33b3b..af7bfc6 100644
--- a/json/tests/draft3/additionalProperties.json
+++ b/json/tests/draft3/additionalProperties.json
@@ -60,8 +60,7 @@
         ]
     },
     {
-        "description":
-            "additionalProperties allows a schema which should validate",
+        "description": "additionalProperties with schema",
         "schema": {
             "properties": {"foo": {}, "bar": {}},
             "additionalProperties": {"type": "boolean"}
@@ -115,7 +114,7 @@
         ]
     },
     {
-        "description": "additionalProperties should not look in applicators",
+        "description": "additionalProperties does not look in applicators",
         "schema": {
             "extends": [
                 {"properties": {"foo": {}}}
@@ -131,7 +130,7 @@
         ]
     },
     {
-        "description": "additionalProperties should properly handle null data",
+        "description": "additionalProperties with null valued instance properties",
         "schema": {
             "additionalProperties": {
                 "type": "null"
@@ -139,7 +138,7 @@
         },
         "tests": [
             {
-                "description": "null properties allowed",
+                "description": "allows null values",
                 "data": {"foo": null},
                 "valid": true
             }
diff --git a/json/tests/draft3/items.json b/json/tests/draft3/items.json
index 586a559..e8bda22 100644
--- a/json/tests/draft3/items.json
+++ b/json/tests/draft3/items.json
@@ -44,7 +44,7 @@
         ]
     },
     {
-        "description": "single-form items should properly handle null data",
+        "description": "items with null instance elements",
         "schema": {
             "items": {
                 "type": "null"
@@ -52,14 +52,14 @@
         },
         "tests": [
             {
-                "description": "null properties allowed",
+                "description": "allows null elements",
                 "data": [ null ],
                 "valid": true
             }
         ]
     },
     {
-        "description": "array-form items should properly handle null data",
+        "description": "array-form items with null instance elements",
         "schema": {
             "items": [
                 {
@@ -69,7 +69,7 @@
         },
         "tests": [
             {
-                "description": "null items allowed",
+                "description": "allows null elements",
                 "data": [ null ],
                 "valid": true
             }
diff --git a/json/tests/draft3/patternProperties.json b/json/tests/draft3/patternProperties.json
index 71954fd..b0f2a8e 100644
--- a/json/tests/draft3/patternProperties.json
+++ b/json/tests/draft3/patternProperties.json
@@ -113,7 +113,7 @@
         ]
     },
     {
-        "description": "patternProperties should properly handle null data",
+        "description": "patternProperties with null valued instance properties",
         "schema": {
             "patternProperties": {
                 "^.*bar$": {"type": "null"}
@@ -121,7 +121,7 @@
         },
         "tests": [
             {
-                "description": "null properties allowed",
+                "description": "allows null values",
                 "data": {"foobar": null},
                 "valid": true
             }
diff --git a/json/tests/draft3/properties.json b/json/tests/draft3/properties.json
index 5b6a833..cd23801 100644
--- a/json/tests/draft3/properties.json
+++ b/json/tests/draft3/properties.json
@@ -95,7 +95,7 @@
         ]
     },
     {
-        "description": "properties should properly handle null data",
+        "description": "properties with null valued instance properties",
         "schema": {
             "properties": {
                 "foo": {"type": "null"}
@@ -103,7 +103,7 @@
         },
         "tests": [
             {
-                "description": "null properties allowed",
+                "description": "allows null values",
                 "data": {"foo": null},
                 "valid": true
             }
diff --git a/json/tests/draft3/type.json b/json/tests/draft3/type.json
index f962cc3..8447bc8 100644
--- a/json/tests/draft3/type.json
+++ b/json/tests/draft3/type.json
@@ -435,8 +435,7 @@
         ]
     },
     {
-        "description": 
-            "when types includes a schema it should fully validate the schema",
+        "description": "applies a nested schema",
         "schema": {
             "type": [
                 "integer",
diff --git a/json/tests/draft4/additionalItems.json b/json/tests/draft4/additionalItems.json
index 454142b..deb44fd 100644
--- a/json/tests/draft4/additionalItems.json
+++ b/json/tests/draft4/additionalItems.json
@@ -95,7 +95,7 @@
         ]
     },
     {
-        "description": "additionalItems should not look in applicators, valid case",
+        "description": "additionalItems does not look in applicators, valid case",
         "schema": {
             "allOf": [
                 { "items": [ { "type": "integer" } ] }
@@ -111,7 +111,7 @@
         ]
     },
     {
-        "description": "additionalItems should not look in applicators, invalid case",
+        "description": "additionalItems does not look in applicators, invalid case",
         "schema": {
             "allOf": [
                 { "items": [ { "type": "integer" }, { "type": "string" } ] }
@@ -147,7 +147,7 @@
         ]
     },
     {
-        "description": "additionalItems should properly handle null data",
+        "description": "additionalItems with null instance elements",
         "schema": {
             "additionalItems": {
                 "type": "null"
@@ -155,7 +155,7 @@
         },
         "tests": [
             {
-                "description": "null items allowed",
+                "description": "allows null elements",
                 "data": [ null ],
                 "valid": true
             }
diff --git a/json/tests/draft4/additionalProperties.json b/json/tests/draft4/additionalProperties.json
index 98b8842..0f8e162 100644
--- a/json/tests/draft4/additionalProperties.json
+++ b/json/tests/draft4/additionalProperties.json
@@ -60,8 +60,7 @@
         ]
     },
     {
-        "description":
-            "additionalProperties allows a schema which should validate",
+        "description": "additionalProperties with schema",
         "schema": {
             "properties": {"foo": {}, "bar": {}},
             "additionalProperties": {"type": "boolean"}
@@ -115,7 +114,7 @@
         ]
     },
     {
-        "description": "additionalProperties should not look in applicators",
+        "description": "additionalProperties does not look in applicators",
         "schema": {
             "allOf": [
                 {"properties": {"foo": {}}}
@@ -131,7 +130,7 @@
         ]
     },
     {
-        "description": "additionalProperties should properly handle null data",
+        "description": "additionalProperties with null valued instance properties",
         "schema": {
             "additionalProperties": {
                 "type": "null"
@@ -139,7 +138,7 @@
         },
         "tests": [
             {
-                "description": "null properties allowed",
+                "description": "allows null values",
                 "data": {"foo": null},
                 "valid": true
             }
diff --git a/json/tests/draft4/items.json b/json/tests/draft4/items.json
index 89801db..16ea070 100644
--- a/json/tests/draft4/items.json
+++ b/json/tests/draft4/items.json
@@ -193,7 +193,7 @@
         ]
     },
     {
-        "description": "single-form items should properly handle null data",
+        "description": "items with null instance elements",
         "schema": {
             "items": {
                 "type": "null"
@@ -201,14 +201,14 @@
         },
         "tests": [
             {
-                "description": "null properties allowed",
+                "description": "allows null elements",
                 "data": [ null ],
                 "valid": true
             }
         ]
     },
     {
-        "description": "array-form items should properly handle null data",
+        "description": "array-form items with null instance elements",
         "schema": {
             "items": [
                 {
@@ -218,7 +218,7 @@
         },
         "tests": [
             {
-                "description": "null items allowed",
+                "description": "allows null elements",
                 "data": [ null ],
                 "valid": true
             }
diff --git a/json/tests/draft4/multipleOf.json b/json/tests/draft4/multipleOf.json
index faa87cf..9abeb97 100644
--- a/json/tests/draft4/multipleOf.json
+++ b/json/tests/draft4/multipleOf.json
@@ -58,11 +58,11 @@
         ]
     },
     {
-        "description": "invalid instance should not raise error when float division = inf",
+        "description": "float division = inf",
         "schema": {"type": "integer", "multipleOf": 0.123456789},
         "tests": [
             {
-                "description": "always invalid, but naive implementations may raise an overflow error",
+                "description": "invalid, but naive implementations may raise an overflow error",
                 "data": 1e308,
                 "valid": false
             }
diff --git a/json/tests/draft4/optional/ecmascript-regex.json b/json/tests/draft4/optional/ecmascript-regex.json
index 9266c04..c431bac 100644
--- a/json/tests/draft4/optional/ecmascript-regex.json
+++ b/json/tests/draft4/optional/ecmascript-regex.json
@@ -290,7 +290,7 @@
         ]
     },
     {
-        "description": "unicode semantics should be used for all pattern matching",
+        "description": "patterns always use unicode semantics with pattern",
         "schema": { "pattern": "\\p{Letter}cole" },
         "tests": [
             {
@@ -405,7 +405,7 @@
         ]
     },
     {
-        "description": "unicode semantics should be used for all patternProperties matching",
+        "description": "patterns always use unicode semantics with patternProperties",
         "schema": {
             "type": "object",
             "patternProperties": {
diff --git a/json/tests/draft4/patternProperties.json b/json/tests/draft4/patternProperties.json
index 0511763..51c8af3 100644
--- a/json/tests/draft4/patternProperties.json
+++ b/json/tests/draft4/patternProperties.json
@@ -118,7 +118,7 @@
         ]
     },
     {
-        "description": "patternProperties should properly handle null data",
+        "description": "patternProperties with null valued instance properties",
         "schema": {
             "patternProperties": {
                 "^.*bar$": {"type": "null"}
@@ -126,7 +126,7 @@
         },
         "tests": [
             {
-                "description": "null properties allowed",
+                "description": "allows null values",
                 "data": {"foobar": null},
                 "valid": true
             }
diff --git a/json/tests/draft4/properties.json b/json/tests/draft4/properties.json
index 9fcb601..9d0f259 100644
--- a/json/tests/draft4/properties.json
+++ b/json/tests/draft4/properties.json
@@ -134,7 +134,7 @@
         ]
     },
     {
-        "description": "properties should properly handle null data",
+        "description": "properties with null valued instance properties",
         "schema": {
             "properties": {
                 "foo": {"type": "null"}
@@ -142,7 +142,7 @@
         },
         "tests": [
             {
-                "description": "null properties allowed",
+                "description": "allows null values",
                 "data": {"foo": null},
                 "valid": true
             }
diff --git a/json/tests/draft6/additionalItems.json b/json/tests/draft6/additionalItems.json
index 454142b..deb44fd 100644
--- a/json/tests/draft6/additionalItems.json
+++ b/json/tests/draft6/additionalItems.json
@@ -95,7 +95,7 @@
         ]
     },
     {
-        "description": "additionalItems should not look in applicators, valid case",
+        "description": "additionalItems does not look in applicators, valid case",
         "schema": {
             "allOf": [
                 { "items": [ { "type": "integer" } ] }
@@ -111,7 +111,7 @@
         ]
     },
     {
-        "description": "additionalItems should not look in applicators, invalid case",
+        "description": "additionalItems does not look in applicators, invalid case",
         "schema": {
             "allOf": [
                 { "items": [ { "type": "integer" }, { "type": "string" } ] }
@@ -147,7 +147,7 @@
         ]
     },
     {
-        "description": "additionalItems should properly handle null data",
+        "description": "additionalItems with null instance elements",
         "schema": {
             "additionalItems": {
                 "type": "null"
@@ -155,7 +155,7 @@
         },
         "tests": [
             {
-                "description": "null items allowed",
+                "description": "allows null elements",
                 "data": [ null ],
                 "valid": true
             }
diff --git a/json/tests/draft6/additionalProperties.json b/json/tests/draft6/additionalProperties.json
index 98b8842..0f8e162 100644
--- a/json/tests/draft6/additionalProperties.json
+++ b/json/tests/draft6/additionalProperties.json
@@ -60,8 +60,7 @@
         ]
     },
     {
-        "description":
-            "additionalProperties allows a schema which should validate",
+        "description": "additionalProperties with schema",
         "schema": {
             "properties": {"foo": {}, "bar": {}},
             "additionalProperties": {"type": "boolean"}
@@ -115,7 +114,7 @@
         ]
     },
     {
-        "description": "additionalProperties should not look in applicators",
+        "description": "additionalProperties does not look in applicators",
         "schema": {
             "allOf": [
                 {"properties": {"foo": {}}}
@@ -131,7 +130,7 @@
         ]
     },
     {
-        "description": "additionalProperties should properly handle null data",
+        "description": "additionalProperties with null valued instance properties",
         "schema": {
             "additionalProperties": {
                 "type": "null"
@@ -139,7 +138,7 @@
         },
         "tests": [
             {
-                "description": "null properties allowed",
+                "description": "allows null values",
                 "data": {"foo": null},
                 "valid": true
             }
diff --git a/json/tests/draft6/contains.json b/json/tests/draft6/contains.json
index be87c97..bd93654 100644
--- a/json/tests/draft6/contains.json
+++ b/json/tests/draft6/contains.json
@@ -127,7 +127,7 @@
         ]
     },
     {
-        "description": "contains should properly handle null data",
+        "description": "contains with null instance elements",
         "schema": {
             "contains": {
                 "type": "null"
@@ -135,7 +135,7 @@
         },
         "tests": [
             {
-                "description": "null items allowed",
+                "description": "allows null items",
                 "data": [ null ],
                 "valid": true
             }
diff --git a/json/tests/draft6/items.json b/json/tests/draft6/items.json
index dc56e7c..7ed6781 100644
--- a/json/tests/draft6/items.json
+++ b/json/tests/draft6/items.json
@@ -248,7 +248,7 @@
         ]
     },
     {
-        "description": "single-form items should properly handle null data",
+        "description": "single-form items with null instance elements",
         "schema": {
             "items": {
                 "type": "null"
@@ -256,14 +256,14 @@
         },
         "tests": [
             {
-                "description": "null properties allowed",
+                "description": "allows null elements",
                 "data": [ null ],
                 "valid": true
             }
         ]
     },
     {
-        "description": "array-form items should properly handle null data",
+        "description": "array-form items with null instance elements",
         "schema": {
             "items": [
                 {
@@ -273,7 +273,7 @@
         },
         "tests": [
             {
-                "description": "null items allowed",
+                "description": "allows null elements",
                 "data": [ null ],
                 "valid": true
             }
diff --git a/json/tests/draft6/multipleOf.json b/json/tests/draft6/multipleOf.json
index faa87cf..25c25a9 100644
--- a/json/tests/draft6/multipleOf.json
+++ b/json/tests/draft6/multipleOf.json
@@ -58,7 +58,7 @@
         ]
     },
     {
-        "description": "invalid instance should not raise error when float division = inf",
+        "description": "float division = inf",
         "schema": {"type": "integer", "multipleOf": 0.123456789},
         "tests": [
             {
diff --git a/json/tests/draft6/optional/ecmascript-regex.json b/json/tests/draft6/optional/ecmascript-regex.json
index 764248f..c4886aa 100644
--- a/json/tests/draft6/optional/ecmascript-regex.json
+++ b/json/tests/draft6/optional/ecmascript-regex.json
@@ -290,7 +290,7 @@
         ]
     },
     {
-        "description": "unicode semantics should be used for all pattern matching",
+        "description": "patterns always use unicode semantics with pattern",
         "schema": { "pattern": "\\p{Letter}cole" },
         "tests": [
             {
@@ -405,7 +405,7 @@
         ]
     },
     {
-        "description": "unicode semantics should be used for all patternProperties matching",
+        "description": "patterns always use unicode semantics with patternProperties",
         "schema": {
             "type": "object",
             "patternProperties": {
diff --git a/json/tests/draft6/patternProperties.json b/json/tests/draft6/patternProperties.json
index 34b2e85..c276e64 100644
--- a/json/tests/draft6/patternProperties.json
+++ b/json/tests/draft6/patternProperties.json
@@ -154,7 +154,7 @@
         ]
     },
     {
-        "description": "patternProperties should properly handle null data",
+        "description": "patternProperties with null valued instance properties",
         "schema": {
             "patternProperties": {
                 "^.*bar$": {"type": "null"}
@@ -162,7 +162,7 @@
         },
         "tests": [
             {
-                "description": "null properties allowed",
+                "description": "allows null values",
                 "data": {"foobar": null},
                 "valid": true
             }
diff --git a/json/tests/draft6/properties.json b/json/tests/draft6/properties.json
index 8c3ed35..21a2e09 100644
--- a/json/tests/draft6/properties.json
+++ b/json/tests/draft6/properties.json
@@ -165,7 +165,7 @@
         ]
     },
     {
-        "description": "properties should properly handle null data",
+        "description": "properties with null valued instance properties",
         "schema": {
             "properties": {
                 "foo": {"type": "null"}
@@ -173,7 +173,7 @@
         },
         "tests": [
             {
-                "description": "null properties allowed",
+                "description": "allows null values",
                 "data": {"foo": null},
                 "valid": true
             }
diff --git a/json/tests/draft7/additionalItems.json b/json/tests/draft7/additionalItems.json
index 454142b..deb44fd 100644
--- a/json/tests/draft7/additionalItems.json
+++ b/json/tests/draft7/additionalItems.json
@@ -95,7 +95,7 @@
         ]
     },
     {
-        "description": "additionalItems should not look in applicators, valid case",
+        "description": "additionalItems does not look in applicators, valid case",
         "schema": {
             "allOf": [
                 { "items": [ { "type": "integer" } ] }
@@ -111,7 +111,7 @@
         ]
     },
     {
-        "description": "additionalItems should not look in applicators, invalid case",
+        "description": "additionalItems does not look in applicators, invalid case",
         "schema": {
             "allOf": [
                 { "items": [ { "type": "integer" }, { "type": "string" } ] }
@@ -147,7 +147,7 @@
         ]
     },
     {
-        "description": "additionalItems should properly handle null data",
+        "description": "additionalItems with null instance elements",
         "schema": {
             "additionalItems": {
                 "type": "null"
@@ -155,7 +155,7 @@
         },
         "tests": [
             {
-                "description": "null items allowed",
+                "description": "allows null elements",
                 "data": [ null ],
                 "valid": true
             }
diff --git a/json/tests/draft7/additionalProperties.json b/json/tests/draft7/additionalProperties.json
index 98b8842..0f8e162 100644
--- a/json/tests/draft7/additionalProperties.json
+++ b/json/tests/draft7/additionalProperties.json
@@ -60,8 +60,7 @@
         ]
     },
     {
-        "description":
-            "additionalProperties allows a schema which should validate",
+        "description": "additionalProperties with schema",
         "schema": {
             "properties": {"foo": {}, "bar": {}},
             "additionalProperties": {"type": "boolean"}
@@ -115,7 +114,7 @@
         ]
     },
     {
-        "description": "additionalProperties should not look in applicators",
+        "description": "additionalProperties does not look in applicators",
         "schema": {
             "allOf": [
                 {"properties": {"foo": {}}}
@@ -131,7 +130,7 @@
         ]
     },
     {
-        "description": "additionalProperties should properly handle null data",
+        "description": "additionalProperties with null valued instance properties",
         "schema": {
             "additionalProperties": {
                 "type": "null"
@@ -139,7 +138,7 @@
         },
         "tests": [
             {
-                "description": "null properties allowed",
+                "description": "allows null values",
                 "data": {"foo": null},
                 "valid": true
             }
diff --git a/json/tests/draft7/contains.json b/json/tests/draft7/contains.json
index b1c36a4..2b1a515 100644
--- a/json/tests/draft7/contains.json
+++ b/json/tests/draft7/contains.json
@@ -148,7 +148,7 @@
         ]
     },
     {
-        "description": "contains should properly handle null data",
+        "description": "contains with null instance elements",
         "schema": {
             "contains": {
                 "type": "null"
@@ -156,7 +156,7 @@
         },
         "tests": [
             {
-                "description": "null properties allowed",
+                "description": "allows null items",
                 "data": [ null ],
                 "valid": true
             }
diff --git a/json/tests/draft7/items.json b/json/tests/draft7/items.json
index dc56e7c..7ed6781 100644
--- a/json/tests/draft7/items.json
+++ b/json/tests/draft7/items.json
@@ -248,7 +248,7 @@
         ]
     },
     {
-        "description": "single-form items should properly handle null data",
+        "description": "single-form items with null instance elements",
         "schema": {
             "items": {
                 "type": "null"
@@ -256,14 +256,14 @@
         },
         "tests": [
             {
-                "description": "null properties allowed",
+                "description": "allows null elements",
                 "data": [ null ],
                 "valid": true
             }
         ]
     },
     {
-        "description": "array-form items should properly handle null data",
+        "description": "array-form items with null instance elements",
         "schema": {
             "items": [
                 {
@@ -273,7 +273,7 @@
         },
         "tests": [
             {
-                "description": "null items allowed",
+                "description": "allows null elements",
                 "data": [ null ],
                 "valid": true
             }
diff --git a/json/tests/draft7/multipleOf.json b/json/tests/draft7/multipleOf.json
index faa87cf..25c25a9 100644
--- a/json/tests/draft7/multipleOf.json
+++ b/json/tests/draft7/multipleOf.json
@@ -58,7 +58,7 @@
         ]
     },
     {
-        "description": "invalid instance should not raise error when float division = inf",
+        "description": "float division = inf",
         "schema": {"type": "integer", "multipleOf": 0.123456789},
         "tests": [
             {
diff --git a/json/tests/draft7/optional/ecmascript-regex.json b/json/tests/draft7/optional/ecmascript-regex.json
index 764248f..c4886aa 100644
--- a/json/tests/draft7/optional/ecmascript-regex.json
+++ b/json/tests/draft7/optional/ecmascript-regex.json
@@ -290,7 +290,7 @@
         ]
     },
     {
-        "description": "unicode semantics should be used for all pattern matching",
+        "description": "patterns always use unicode semantics with pattern",
         "schema": { "pattern": "\\p{Letter}cole" },
         "tests": [
             {
@@ -405,7 +405,7 @@
         ]
     },
     {
-        "description": "unicode semantics should be used for all patternProperties matching",
+        "description": "patterns always use unicode semantics with patternProperties",
         "schema": {
             "type": "object",
             "patternProperties": {
diff --git a/json/tests/draft7/patternProperties.json b/json/tests/draft7/patternProperties.json
index 34b2e85..c276e64 100644
--- a/json/tests/draft7/patternProperties.json
+++ b/json/tests/draft7/patternProperties.json
@@ -154,7 +154,7 @@
         ]
     },
     {
-        "description": "patternProperties should properly handle null data",
+        "description": "patternProperties with null valued instance properties",
         "schema": {
             "patternProperties": {
                 "^.*bar$": {"type": "null"}
@@ -162,7 +162,7 @@
         },
         "tests": [
             {
-                "description": "null properties allowed",
+                "description": "allows null values",
                 "data": {"foobar": null},
                 "valid": true
             }
diff --git a/json/tests/draft7/properties.json b/json/tests/draft7/properties.json
index 8c3ed35..21a2e09 100644
--- a/json/tests/draft7/properties.json
+++ b/json/tests/draft7/properties.json
@@ -165,7 +165,7 @@
         ]
     },
     {
-        "description": "properties should properly handle null data",
+        "description": "properties with null valued instance properties",
         "schema": {
             "properties": {
                 "foo": {"type": "null"}
@@ -173,7 +173,7 @@
         },
         "tests": [
             {
-                "description": "null properties allowed",
+                "description": "allows null values",
                 "data": {"foo": null},
                 "valid": true
             }