diff --git a/json/tests/draft-next/enum.json b/json/tests/draft-next/enum.json
index 32e5af01..e263f390 100644
--- a/json/tests/draft-next/enum.json
+++ b/json/tests/draft-next/enum.json
@@ -168,6 +168,30 @@
             }
         ]
     },
+    {
+        "description": "enum with [false] does not match [0]",
+        "schema": {
+            "$schema": "https://json-schema.org/draft/next/schema",
+            "enum": [[false]]
+        },
+        "tests": [
+            {
+                "description": "[false] is valid",
+                "data": [false],
+                "valid": true
+            },
+            {
+                "description": "[0] is invalid",
+                "data": [0],
+                "valid": false
+            },
+            {
+                "description": "[0.0] is invalid",
+                "data": [0.0],
+                "valid": false
+            }
+        ]
+    },
     {
         "description": "enum with true does not match 1",
         "schema": {
@@ -192,6 +216,30 @@
             }
         ]
     },
+    {
+        "description": "enum with [true] does not match [1]",
+        "schema": {
+            "$schema": "https://json-schema.org/draft/next/schema",
+            "enum": [[true]]
+        },
+        "tests": [
+            {
+                "description": "[true] is valid",
+                "data": [true],
+                "valid": true
+            },
+            {
+                "description": "[1] is invalid",
+                "data": [1],
+                "valid": false
+            },
+            {
+                "description": "[1.0] is invalid",
+                "data": [1.0],
+                "valid": false
+            }
+        ]
+    },
     {
         "description": "enum with 0 does not match false",
         "schema": {
@@ -216,6 +264,30 @@
             }
         ]
     },
+    {
+        "description": "enum with [0] does not match [false]",
+        "schema": {
+            "$schema": "https://json-schema.org/draft/next/schema",
+            "enum": [[0]]
+        },
+        "tests": [
+            {
+                "description": "[false] is invalid",
+                "data": [false],
+                "valid": false
+            },
+            {
+                "description": "[0] is valid",
+                "data": [0],
+                "valid": true
+            },
+            {
+                "description": "[0.0] is valid",
+                "data": [0.0],
+                "valid": true
+            }
+        ]
+    },
     {
         "description": "enum with 1 does not match true",
         "schema": {
@@ -240,6 +312,30 @@
             }
         ]
     },
+    {
+        "description": "enum with [1] does not match [true]",
+        "schema": {
+            "$schema": "https://json-schema.org/draft/next/schema",
+            "enum": [[1]]
+        },
+        "tests": [
+            {
+                "description": "[true] is invalid",
+                "data": [true],
+                "valid": false
+            },
+            {
+                "description": "[1] is valid",
+                "data": [1],
+                "valid": true
+            },
+            {
+                "description": "[1.0] is valid",
+                "data": [1.0],
+                "valid": true
+            }
+        ]
+    },
     {
         "description": "nul characters in strings",
         "schema": {
diff --git a/json/tests/draft-next/maxLength.json b/json/tests/draft-next/maxLength.json
index e09e44ad..c88f604e 100644
--- a/json/tests/draft-next/maxLength.json
+++ b/json/tests/draft-next/maxLength.json
@@ -27,7 +27,7 @@
                 "valid": true
             },
             {
-                "description": "two supplementary Unicode code points is long enough",
+                "description": "two graphemes is long enough",
                 "data": "\uD83D\uDCA9\uD83D\uDCA9",
                 "valid": true
             }
diff --git a/json/tests/draft-next/minLength.json b/json/tests/draft-next/minLength.json
index 16022acb..52c9c9a1 100644
--- a/json/tests/draft-next/minLength.json
+++ b/json/tests/draft-next/minLength.json
@@ -27,7 +27,7 @@
                 "valid": true
             },
             {
-                "description": "one supplementary Unicode code point is not long enough",
+                "description": "one grapheme is not long enough",
                 "data": "\uD83D\uDCA9",
                 "valid": false
             }
diff --git a/json/tests/draft-next/unevaluatedItems.json b/json/tests/draft-next/unevaluatedItems.json
index 21e6fd67..08f6ef12 100644
--- a/json/tests/draft-next/unevaluatedItems.json
+++ b/json/tests/draft-next/unevaluatedItems.json
@@ -461,6 +461,37 @@
             }
         ]
     },
+    {
+        "description": "unevaluatedItems before $ref",
+        "schema": {
+            "$schema": "https://json-schema.org/draft/next/schema",
+            "unevaluatedItems": false,
+            "prefixItems": [
+                { "type": "string" }
+            ],
+            "$ref": "#/$defs/bar",
+            "$defs": {
+              "bar": {
+                  "prefixItems": [
+                      true,
+                      { "type": "string" }
+                  ]
+              }
+            }
+        },
+        "tests": [
+            {
+                "description": "with no unevaluated items",
+                "data": ["foo", "bar"],
+                "valid": true
+            },
+            {
+                "description": "with unevaluated items",
+                "data": ["foo", "bar", "baz"],
+                "valid": false
+            }
+        ]
+    },
     {
         "description": "unevaluatedItems with $dynamicRef",
         "schema": {
diff --git a/json/tests/draft-next/unevaluatedProperties.json b/json/tests/draft-next/unevaluatedProperties.json
index 78127cd0..d0d53507 100644
--- a/json/tests/draft-next/unevaluatedProperties.json
+++ b/json/tests/draft-next/unevaluatedProperties.json
@@ -715,6 +715,44 @@
             }
         ]
     },
+    {
+        "description": "unevaluatedProperties before $ref",
+        "schema": {
+            "$schema": "https://json-schema.org/draft/next/schema",
+            "type": "object",
+            "unevaluatedProperties": false,
+            "properties": {
+                "foo": { "type": "string" }
+            },
+            "$ref": "#/$defs/bar",
+            "$defs": {
+                "bar": {
+                    "properties": {
+                        "bar": { "type": "string" }
+                    }
+                }
+            }
+        },
+        "tests": [
+            {
+                "description": "with no unevaluated properties",
+                "data": {
+                    "foo": "foo",
+                    "bar": "bar"
+                },
+                "valid": true
+            },
+            {
+                "description": "with unevaluated properties",
+                "data": {
+                    "foo": "foo",
+                    "bar": "bar",
+                    "baz": "baz"
+                },
+                "valid": false
+            }
+        ]
+    },
     {
         "description": "unevaluatedProperties with $dynamicRef",
         "schema": {
diff --git a/json/tests/draft2019-09/enum.json b/json/tests/draft2019-09/enum.json
index f9a44a61..1315211e 100644
--- a/json/tests/draft2019-09/enum.json
+++ b/json/tests/draft2019-09/enum.json
@@ -168,6 +168,30 @@
             }
         ]
     },
+    {
+        "description": "enum with [false] does not match [0]",
+        "schema": {
+            "$schema": "https://json-schema.org/draft/2019-09/schema",
+            "enum": [[false]]
+        },
+        "tests": [
+            {
+                "description": "[false] is valid",
+                "data": [false],
+                "valid": true
+            },
+            {
+                "description": "[0] is invalid",
+                "data": [0],
+                "valid": false
+            },
+            {
+                "description": "[0.0] is invalid",
+                "data": [0.0],
+                "valid": false
+            }
+        ]
+    },
     {
         "description": "enum with true does not match 1",
         "schema": {
@@ -192,6 +216,30 @@
             }
         ]
     },
+    {
+        "description": "enum with [true] does not match [1]",
+        "schema": {
+            "$schema": "https://json-schema.org/draft/2019-09/schema",
+            "enum": [[true]]
+        },
+        "tests": [
+            {
+                "description": "[true] is valid",
+                "data": [true],
+                "valid": true
+            },
+            {
+                "description": "[1] is invalid",
+                "data": [1],
+                "valid": false
+            },
+            {
+                "description": "[1.0] is invalid",
+                "data": [1.0],
+                "valid": false
+            }
+        ]
+    },
     {
         "description": "enum with 0 does not match false",
         "schema": {
@@ -216,6 +264,30 @@
             }
         ]
     },
+    {
+        "description": "enum with [0] does not match [false]",
+        "schema": {
+            "$schema": "https://json-schema.org/draft/2019-09/schema",
+            "enum": [[0]]
+        },
+        "tests": [
+            {
+                "description": "[false] is invalid",
+                "data": [false],
+                "valid": false
+            },
+            {
+                "description": "[0] is valid",
+                "data": [0],
+                "valid": true
+            },
+            {
+                "description": "[0.0] is valid",
+                "data": [0.0],
+                "valid": true
+            }
+        ]
+    },
     {
         "description": "enum with 1 does not match true",
         "schema": {
@@ -240,6 +312,30 @@
             }
         ]
     },
+    {
+        "description": "enum with [1] does not match [true]",
+        "schema": {
+            "$schema": "https://json-schema.org/draft/2019-09/schema",
+            "enum": [[1]]
+        },
+        "tests": [
+            {
+                "description": "[true] is invalid",
+                "data": [true],
+                "valid": false
+            },
+            {
+                "description": "[1] is valid",
+                "data": [1],
+                "valid": true
+            },
+            {
+                "description": "[1.0] is valid",
+                "data": [1.0],
+                "valid": true
+            }
+        ]
+    },
     {
         "description": "nul characters in strings",
         "schema": {
diff --git a/json/tests/draft2019-09/maxLength.json b/json/tests/draft2019-09/maxLength.json
index f242c3ef..a0cc7d9b 100644
--- a/json/tests/draft2019-09/maxLength.json
+++ b/json/tests/draft2019-09/maxLength.json
@@ -27,7 +27,7 @@
                 "valid": true
             },
             {
-                "description": "two supplementary Unicode code points is long enough",
+                "description": "two graphemes is long enough",
                 "data": "\uD83D\uDCA9\uD83D\uDCA9",
                 "valid": true
             }
diff --git a/json/tests/draft2019-09/minLength.json b/json/tests/draft2019-09/minLength.json
index 19dec2ca..12782660 100644
--- a/json/tests/draft2019-09/minLength.json
+++ b/json/tests/draft2019-09/minLength.json
@@ -27,7 +27,7 @@
                 "valid": true
             },
             {
-                "description": "one supplementary Unicode code point is not long enough",
+                "description": "one grapheme is not long enough",
                 "data": "\uD83D\uDCA9",
                 "valid": false
             }
diff --git a/json/tests/draft2019-09/unevaluatedItems.json b/json/tests/draft2019-09/unevaluatedItems.json
index 57d0a9c0..8e2ee4b1 100644
--- a/json/tests/draft2019-09/unevaluatedItems.json
+++ b/json/tests/draft2019-09/unevaluatedItems.json
@@ -480,6 +480,37 @@
             }
         ]
     },
+    {
+        "description": "unevaluatedItems before $ref",
+        "schema": {
+            "$schema": "https://json-schema.org/draft/2019-09/schema",
+            "unevaluatedItems": false,
+            "items": [
+                { "type": "string" }
+            ],
+            "$ref": "#/$defs/bar",
+            "$defs": {
+              "bar": {
+                  "items": [
+                      true,
+                      { "type": "string" }
+                  ]
+              }
+            }
+        },
+        "tests": [
+            {
+                "description": "with no unevaluated items",
+                "data": ["foo", "bar"],
+                "valid": true
+            },
+            {
+                "description": "with unevaluated items",
+                "data": ["foo", "bar", "baz"],
+                "valid": false
+            }
+        ]
+    },
     {
         "description": "unevaluatedItems with $recursiveRef",
         "schema": {
diff --git a/json/tests/draft2019-09/unevaluatedProperties.json b/json/tests/draft2019-09/unevaluatedProperties.json
index a8d7fffe..71c36dfa 100644
--- a/json/tests/draft2019-09/unevaluatedProperties.json
+++ b/json/tests/draft2019-09/unevaluatedProperties.json
@@ -715,6 +715,44 @@
             }
         ]
     },
+    {
+        "description": "unevaluatedProperties before $ref",
+        "schema": {
+            "$schema": "https://json-schema.org/draft/2019-09/schema",
+            "type": "object",
+            "unevaluatedProperties": false,
+            "properties": {
+                "foo": { "type": "string" }
+            },
+            "$ref": "#/$defs/bar",
+            "$defs": {
+                "bar": {
+                    "properties": {
+                        "bar": { "type": "string" }
+                    }
+                }
+            }
+        },
+        "tests": [
+            {
+                "description": "with no unevaluated properties",
+                "data": {
+                    "foo": "foo",
+                    "bar": "bar"
+                },
+                "valid": true
+            },
+            {
+                "description": "with unevaluated properties",
+                "data": {
+                    "foo": "foo",
+                    "bar": "bar",
+                    "baz": "baz"
+                },
+                "valid": false
+            }
+        ]
+    },
     {
         "description": "unevaluatedProperties with $recursiveRef",
         "schema": {
diff --git a/json/tests/draft2020-12/enum.json b/json/tests/draft2020-12/enum.json
index 0d780b2a..c8f35eac 100644
--- a/json/tests/draft2020-12/enum.json
+++ b/json/tests/draft2020-12/enum.json
@@ -168,6 +168,30 @@
             }
         ]
     },
+    {
+        "description": "enum with [false] does not match [0]",
+        "schema": {
+            "$schema": "https://json-schema.org/draft/2020-12/schema",
+            "enum": [[false]]
+        },
+        "tests": [
+            {
+                "description": "[false] is valid",
+                "data": [false],
+                "valid": true
+            },
+            {
+                "description": "[0] is invalid",
+                "data": [0],
+                "valid": false
+            },
+            {
+                "description": "[0.0] is invalid",
+                "data": [0.0],
+                "valid": false
+            }
+        ]
+    },
     {
         "description": "enum with true does not match 1",
         "schema": {
@@ -192,6 +216,30 @@
             }
         ]
     },
+    {
+        "description": "enum with [true] does not match [1]",
+        "schema": {
+            "$schema": "https://json-schema.org/draft/2020-12/schema",
+            "enum": [[true]]
+        },
+        "tests": [
+            {
+                "description": "[true] is valid",
+                "data": [true],
+                "valid": true
+            },
+            {
+                "description": "[1] is invalid",
+                "data": [1],
+                "valid": false
+            },
+            {
+                "description": "[1.0] is invalid",
+                "data": [1.0],
+                "valid": false
+            }
+        ]
+    },
     {
         "description": "enum with 0 does not match false",
         "schema": {
@@ -216,6 +264,30 @@
             }
         ]
     },
+    {
+        "description": "enum with [0] does not match [false]",
+        "schema": {
+            "$schema": "https://json-schema.org/draft/2020-12/schema",
+            "enum": [[0]]
+        },
+        "tests": [
+            {
+                "description": "[false] is invalid",
+                "data": [false],
+                "valid": false
+            },
+            {
+                "description": "[0] is valid",
+                "data": [0],
+                "valid": true
+            },
+            {
+                "description": "[0.0] is valid",
+                "data": [0.0],
+                "valid": true
+            }
+        ]
+    },
     {
         "description": "enum with 1 does not match true",
         "schema": {
@@ -240,6 +312,30 @@
             }
         ]
     },
+    {
+        "description": "enum with [1] does not match [true]",
+        "schema": {
+            "$schema": "https://json-schema.org/draft/2020-12/schema",
+            "enum": [[1]]
+        },
+        "tests": [
+            {
+                "description": "[true] is invalid",
+                "data": [true],
+                "valid": false
+            },
+            {
+                "description": "[1] is valid",
+                "data": [1],
+                "valid": true
+            },
+            {
+                "description": "[1.0] is valid",
+                "data": [1.0],
+                "valid": true
+            }
+        ]
+    },
     {
         "description": "nul characters in strings",
         "schema": {
diff --git a/json/tests/draft2020-12/maxLength.json b/json/tests/draft2020-12/maxLength.json
index b6eb0340..7462726d 100644
--- a/json/tests/draft2020-12/maxLength.json
+++ b/json/tests/draft2020-12/maxLength.json
@@ -27,7 +27,7 @@
                 "valid": true
             },
             {
-                "description": "two supplementary Unicode code points is long enough",
+                "description": "two graphemes is long enough",
                 "data": "\uD83D\uDCA9\uD83D\uDCA9",
                 "valid": true
             }
diff --git a/json/tests/draft2020-12/minLength.json b/json/tests/draft2020-12/minLength.json
index e0930b6f..5076c5a9 100644
--- a/json/tests/draft2020-12/minLength.json
+++ b/json/tests/draft2020-12/minLength.json
@@ -27,7 +27,7 @@
                 "valid": true
             },
             {
-                "description": "one supplementary Unicode code point is not long enough",
+                "description": "one grapheme is not long enough",
                 "data": "\uD83D\uDCA9",
                 "valid": false
             }
diff --git a/json/tests/draft2020-12/unevaluatedItems.json b/json/tests/draft2020-12/unevaluatedItems.json
index 276d7a5b..ee0cb658 100644
--- a/json/tests/draft2020-12/unevaluatedItems.json
+++ b/json/tests/draft2020-12/unevaluatedItems.json
@@ -461,6 +461,37 @@
             }
         ]
     },
+    {
+        "description": "unevaluatedItems before $ref",
+        "schema": {
+            "$schema": "https://json-schema.org/draft/2020-12/schema",
+            "unevaluatedItems": false,
+            "prefixItems": [
+                { "type": "string" }
+            ],
+            "$ref": "#/$defs/bar",
+            "$defs": {
+              "bar": {
+                  "prefixItems": [
+                      true,
+                      { "type": "string" }
+                  ]
+              }
+            }
+        },
+        "tests": [
+            {
+                "description": "with no unevaluated items",
+                "data": ["foo", "bar"],
+                "valid": true
+            },
+            {
+                "description": "with unevaluated items",
+                "data": ["foo", "bar", "baz"],
+                "valid": false
+            }
+        ]
+    },
     {
         "description": "unevaluatedItems with $dynamicRef",
         "schema": {
diff --git a/json/tests/draft2020-12/unevaluatedProperties.json b/json/tests/draft2020-12/unevaluatedProperties.json
index fcbbfa11..b8a2306c 100644
--- a/json/tests/draft2020-12/unevaluatedProperties.json
+++ b/json/tests/draft2020-12/unevaluatedProperties.json
@@ -715,6 +715,44 @@
             }
         ]
     },
+    {
+        "description": "unevaluatedProperties before $ref",
+        "schema": {
+            "$schema": "https://json-schema.org/draft/2020-12/schema",
+            "type": "object",
+            "unevaluatedProperties": false,
+            "properties": {
+                "foo": { "type": "string" }
+            },
+            "$ref": "#/$defs/bar",
+            "$defs": {
+                "bar": {
+                    "properties": {
+                        "bar": { "type": "string" }
+                    }
+                }
+            }
+        },
+        "tests": [
+            {
+                "description": "with no unevaluated properties",
+                "data": {
+                    "foo": "foo",
+                    "bar": "bar"
+                },
+                "valid": true
+            },
+            {
+                "description": "with unevaluated properties",
+                "data": {
+                    "foo": "foo",
+                    "bar": "bar",
+                    "baz": "baz"
+                },
+                "valid": false
+            }
+        ]
+    },
     {
         "description": "unevaluatedProperties with $dynamicRef",
         "schema": {
diff --git a/json/tests/draft3/maxLength.json b/json/tests/draft3/maxLength.json
index 4de42bca..b0a9ea5b 100644
--- a/json/tests/draft3/maxLength.json
+++ b/json/tests/draft3/maxLength.json
@@ -24,7 +24,7 @@
                 "valid": true
             },
             {
-                "description": "two supplementary Unicode code points is long enough",
+                "description": "two graphemes is long enough",
                 "data": "\uD83D\uDCA9\uD83D\uDCA9",
                 "valid": true
             }
diff --git a/json/tests/draft3/minLength.json b/json/tests/draft3/minLength.json
index 3f09158d..6652c750 100644
--- a/json/tests/draft3/minLength.json
+++ b/json/tests/draft3/minLength.json
@@ -24,7 +24,7 @@
                 "valid": true
             },
             {
-                "description": "one supplementary Unicode code point is not long enough",
+                "description": "one grapheme is not long enough",
                 "data": "\uD83D\uDCA9",
                 "valid": false
             }
diff --git a/json/tests/draft4/enum.json b/json/tests/draft4/enum.json
index f085097b..ce43acc0 100644
--- a/json/tests/draft4/enum.json
+++ b/json/tests/draft4/enum.json
@@ -154,6 +154,27 @@
             }
         ]
     },
+    {
+        "description": "enum with [false] does not match [0]",
+        "schema": {"enum": [[false]]},
+        "tests": [
+            {
+                "description": "[false] is valid",
+                "data": [false],
+                "valid": true
+            },
+            {
+                "description": "[0] is invalid",
+                "data": [0],
+                "valid": false
+            },
+            {
+                "description": "[0.0] is invalid",
+                "data": [0.0],
+                "valid": false
+            }
+        ]
+    },
     {
         "description": "enum with true does not match 1",
         "schema": {"enum": [true]},
@@ -175,6 +196,27 @@
             }
         ]
     },
+    {
+        "description": "enum with [true] does not match [1]",
+        "schema": {"enum": [[true]]},
+        "tests": [
+            {
+                "description": "[true] is valid",
+                "data": [true],
+                "valid": true
+            },
+            {
+                "description": "[1] is invalid",
+                "data": [1],
+                "valid": false
+            },
+            {
+                "description": "[1.0] is invalid",
+                "data": [1.0],
+                "valid": false
+            }
+        ]
+    },
     {
         "description": "enum with 0 does not match false",
         "schema": {"enum": [0]},
@@ -196,6 +238,27 @@
             }
         ]
     },
+    {
+        "description": "enum with [0] does not match [false]",
+        "schema": {"enum": [[0]]},
+        "tests": [
+            {
+                "description": "[false] is invalid",
+                "data": [false],
+                "valid": false
+            },
+            {
+                "description": "[0] is valid",
+                "data": [0],
+                "valid": true
+            },
+            {
+                "description": "[0.0] is valid",
+                "data": [0.0],
+                "valid": true
+            }
+        ]
+    },
     {
         "description": "enum with 1 does not match true",
         "schema": {"enum": [1]},
@@ -217,6 +280,27 @@
             }
         ]
     },
+    {
+        "description": "enum with [1] does not match [true]",
+        "schema": {"enum": [[1]]},
+        "tests": [
+            {
+                "description": "[true] is invalid",
+                "data": [true],
+                "valid": false
+            },
+            {
+                "description": "[1] is valid",
+                "data": [1],
+                "valid": true
+            },
+            {
+                "description": "[1.0] is valid",
+                "data": [1.0],
+                "valid": true
+            }
+        ]
+    },
     {
         "description": "nul characters in strings",
         "schema": { "enum": [ "hello\u0000there" ] },
diff --git a/json/tests/draft4/maxLength.json b/json/tests/draft4/maxLength.json
index 811d35b2..33879594 100644
--- a/json/tests/draft4/maxLength.json
+++ b/json/tests/draft4/maxLength.json
@@ -24,7 +24,7 @@
                 "valid": true
             },
             {
-                "description": "two supplementary Unicode code points is long enough",
+                "description": "two graphemes is long enough",
                 "data": "\uD83D\uDCA9\uD83D\uDCA9",
                 "valid": true
             }
diff --git a/json/tests/draft4/minLength.json b/json/tests/draft4/minLength.json
index 3f09158d..6652c750 100644
--- a/json/tests/draft4/minLength.json
+++ b/json/tests/draft4/minLength.json
@@ -24,7 +24,7 @@
                 "valid": true
             },
             {
-                "description": "one supplementary Unicode code point is not long enough",
+                "description": "one grapheme is not long enough",
                 "data": "\uD83D\uDCA9",
                 "valid": false
             }
diff --git a/json/tests/draft6/enum.json b/json/tests/draft6/enum.json
index f085097b..ce43acc0 100644
--- a/json/tests/draft6/enum.json
+++ b/json/tests/draft6/enum.json
@@ -154,6 +154,27 @@
             }
         ]
     },
+    {
+        "description": "enum with [false] does not match [0]",
+        "schema": {"enum": [[false]]},
+        "tests": [
+            {
+                "description": "[false] is valid",
+                "data": [false],
+                "valid": true
+            },
+            {
+                "description": "[0] is invalid",
+                "data": [0],
+                "valid": false
+            },
+            {
+                "description": "[0.0] is invalid",
+                "data": [0.0],
+                "valid": false
+            }
+        ]
+    },
     {
         "description": "enum with true does not match 1",
         "schema": {"enum": [true]},
@@ -175,6 +196,27 @@
             }
         ]
     },
+    {
+        "description": "enum with [true] does not match [1]",
+        "schema": {"enum": [[true]]},
+        "tests": [
+            {
+                "description": "[true] is valid",
+                "data": [true],
+                "valid": true
+            },
+            {
+                "description": "[1] is invalid",
+                "data": [1],
+                "valid": false
+            },
+            {
+                "description": "[1.0] is invalid",
+                "data": [1.0],
+                "valid": false
+            }
+        ]
+    },
     {
         "description": "enum with 0 does not match false",
         "schema": {"enum": [0]},
@@ -196,6 +238,27 @@
             }
         ]
     },
+    {
+        "description": "enum with [0] does not match [false]",
+        "schema": {"enum": [[0]]},
+        "tests": [
+            {
+                "description": "[false] is invalid",
+                "data": [false],
+                "valid": false
+            },
+            {
+                "description": "[0] is valid",
+                "data": [0],
+                "valid": true
+            },
+            {
+                "description": "[0.0] is valid",
+                "data": [0.0],
+                "valid": true
+            }
+        ]
+    },
     {
         "description": "enum with 1 does not match true",
         "schema": {"enum": [1]},
@@ -217,6 +280,27 @@
             }
         ]
     },
+    {
+        "description": "enum with [1] does not match [true]",
+        "schema": {"enum": [[1]]},
+        "tests": [
+            {
+                "description": "[true] is invalid",
+                "data": [true],
+                "valid": false
+            },
+            {
+                "description": "[1] is valid",
+                "data": [1],
+                "valid": true
+            },
+            {
+                "description": "[1.0] is valid",
+                "data": [1.0],
+                "valid": true
+            }
+        ]
+    },
     {
         "description": "nul characters in strings",
         "schema": { "enum": [ "hello\u0000there" ] },
diff --git a/json/tests/draft6/maxLength.json b/json/tests/draft6/maxLength.json
index 748b4daa..be60c540 100644
--- a/json/tests/draft6/maxLength.json
+++ b/json/tests/draft6/maxLength.json
@@ -24,7 +24,7 @@
                 "valid": true
             },
             {
-                "description": "two supplementary Unicode code points is long enough",
+                "description": "two graphemes is long enough",
                 "data": "\uD83D\uDCA9\uD83D\uDCA9",
                 "valid": true
             }
diff --git a/json/tests/draft6/minLength.json b/json/tests/draft6/minLength.json
index 64db9480..23c68fe3 100644
--- a/json/tests/draft6/minLength.json
+++ b/json/tests/draft6/minLength.json
@@ -24,7 +24,7 @@
                 "valid": true
             },
             {
-                "description": "one supplementary Unicode code point is not long enough",
+                "description": "one grapheme is not long enough",
                 "data": "\uD83D\uDCA9",
                 "valid": false
             }
diff --git a/json/tests/draft7/enum.json b/json/tests/draft7/enum.json
index f085097b..ce43acc0 100644
--- a/json/tests/draft7/enum.json
+++ b/json/tests/draft7/enum.json
@@ -154,6 +154,27 @@
             }
         ]
     },
+    {
+        "description": "enum with [false] does not match [0]",
+        "schema": {"enum": [[false]]},
+        "tests": [
+            {
+                "description": "[false] is valid",
+                "data": [false],
+                "valid": true
+            },
+            {
+                "description": "[0] is invalid",
+                "data": [0],
+                "valid": false
+            },
+            {
+                "description": "[0.0] is invalid",
+                "data": [0.0],
+                "valid": false
+            }
+        ]
+    },
     {
         "description": "enum with true does not match 1",
         "schema": {"enum": [true]},
@@ -175,6 +196,27 @@
             }
         ]
     },
+    {
+        "description": "enum with [true] does not match [1]",
+        "schema": {"enum": [[true]]},
+        "tests": [
+            {
+                "description": "[true] is valid",
+                "data": [true],
+                "valid": true
+            },
+            {
+                "description": "[1] is invalid",
+                "data": [1],
+                "valid": false
+            },
+            {
+                "description": "[1.0] is invalid",
+                "data": [1.0],
+                "valid": false
+            }
+        ]
+    },
     {
         "description": "enum with 0 does not match false",
         "schema": {"enum": [0]},
@@ -196,6 +238,27 @@
             }
         ]
     },
+    {
+        "description": "enum with [0] does not match [false]",
+        "schema": {"enum": [[0]]},
+        "tests": [
+            {
+                "description": "[false] is invalid",
+                "data": [false],
+                "valid": false
+            },
+            {
+                "description": "[0] is valid",
+                "data": [0],
+                "valid": true
+            },
+            {
+                "description": "[0.0] is valid",
+                "data": [0.0],
+                "valid": true
+            }
+        ]
+    },
     {
         "description": "enum with 1 does not match true",
         "schema": {"enum": [1]},
@@ -217,6 +280,27 @@
             }
         ]
     },
+    {
+        "description": "enum with [1] does not match [true]",
+        "schema": {"enum": [[1]]},
+        "tests": [
+            {
+                "description": "[true] is invalid",
+                "data": [true],
+                "valid": false
+            },
+            {
+                "description": "[1] is valid",
+                "data": [1],
+                "valid": true
+            },
+            {
+                "description": "[1.0] is valid",
+                "data": [1.0],
+                "valid": true
+            }
+        ]
+    },
     {
         "description": "nul characters in strings",
         "schema": { "enum": [ "hello\u0000there" ] },
diff --git a/json/tests/draft7/maxLength.json b/json/tests/draft7/maxLength.json
index 748b4daa..be60c540 100644
--- a/json/tests/draft7/maxLength.json
+++ b/json/tests/draft7/maxLength.json
@@ -24,7 +24,7 @@
                 "valid": true
             },
             {
-                "description": "two supplementary Unicode code points is long enough",
+                "description": "two graphemes is long enough",
                 "data": "\uD83D\uDCA9\uD83D\uDCA9",
                 "valid": true
             }
diff --git a/json/tests/draft7/minLength.json b/json/tests/draft7/minLength.json
index 64db9480..23c68fe3 100644
--- a/json/tests/draft7/minLength.json
+++ b/json/tests/draft7/minLength.json
@@ -24,7 +24,7 @@
                 "valid": true
             },
             {
-                "description": "one supplementary Unicode code point is not long enough",
+                "description": "one grapheme is not long enough",
                 "data": "\uD83D\uDCA9",
                 "valid": false
             }