Squashed 'json/' changes from d21ed578a..f57d3e0cc

f57d3e0cc Merge pull request #631 from json-schema-org/if-then-else-ref
3b8c281ff Ensure $ids are collected within if/then/else schemas.
02905b21b Fix a sloppy bug in the sanity checks in CI.

git-subtree-dir: json
git-subtree-split: f57d3e0ccb365a198fabe060aae2407af6adcff9

521 files changed, 0 insertions, 75984 deletions

diff --git a/json/.editorconfig b/json/.editorconfig
deleted file mode 100644
index 6db6a5b..0000000
--- a/json/.editorconfig
+++ /dev/null
@@ -1 +0,0 @@
-insert_final_newline = true
diff --git a/json/.github/CODEOWNERS b/json/.github/CODEOWNERS
deleted file mode 100644
index 15f4a2d..0000000
--- a/json/.github/CODEOWNERS
+++ /dev/null
@@ -1,2 +0,0 @@
-# Ping the entire test suite team by default.
-*       @json-schema-org/test-suite-team
diff --git a/json/.github/workflows/ci.yml b/json/.github/workflows/ci.yml
deleted file mode 100644
index a826069..0000000
--- a/json/.github/workflows/ci.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-name: Test Suite Sanity Checking
-
-on:
-  push:
-  pull_request:
-  release:
-    types: [published]
-  schedule:
-    # Daily at 6:42, arbitrarily as a time that's possibly non-busy
-    - cron: '42 6 * * *'
-
-jobs:
-  ci:
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v3
-    - name: Set up Python
-      uses: actions/setup-python@v4
-      with:
-        python-version: '3.x'
-    - name: Install tox
-      run: python -m pip install tox
-    - name: Run the sanity checks
-      run: python -m tox
diff --git a/json/.gitignore b/json/.gitignore
deleted file mode 100644
index 68bc17f..0000000
--- a/json/.gitignore
+++ /dev/null
@@ -1,160 +0,0 @@
-# Byte-compiled / optimized / DLL files
-__pycache__/
-*.py[cod]
-*$py.class
-
-# C extensions
-*.so
-
-# Distribution / packaging
-.Python
-build/
-develop-eggs/
-dist/
-downloads/
-eggs/
-.eggs/
-lib/
-lib64/
-parts/
-sdist/
-var/
-wheels/
-share/python-wheels/
-*.egg-info/
-.installed.cfg
-*.egg
-MANIFEST
-
-# PyInstaller
-#  Usually these files are written by a python script from a template
-#  before PyInstaller builds the exe, so as to inject date/other infos into it.
-*.manifest
-*.spec
-
-# Installer logs
-pip-log.txt
-pip-delete-this-directory.txt
-
-# Unit test / coverage reports
-htmlcov/
-.tox/
-.nox/
-.coverage
-.coverage.*
-.cache
-nosetests.xml
-coverage.xml
-*.cover
-*.py,cover
-.hypothesis/
-.pytest_cache/
-cover/
-
-# Translations
-*.mo
-*.pot
-
-# Django stuff:
-*.log
-local_settings.py
-db.sqlite3
-db.sqlite3-journal
-
-# Flask stuff:
-instance/
-.webassets-cache
-
-# Scrapy stuff:
-.scrapy
-
-# Sphinx documentation
-docs/_build/
-
-# PyBuilder
-.pybuilder/
-target/
-
-# Jupyter Notebook
-.ipynb_checkpoints
-
-# IPython
-profile_default/
-ipython_config.py
-
-# pyenv
-#   For a library or package, you might want to ignore these files since the code is
-#   intended to run in multiple environments; otherwise, check them in:
-# .python-version
-
-# pipenv
-#   According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
-#   However, in case of collaboration, if having platform-specific dependencies or dependencies
-#   having no cross-platform support, pipenv may install dependencies that don't work, or not
-#   install all needed dependencies.
-#Pipfile.lock
-
-# poetry
-#   Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control.
-#   This is especially recommended for binary packages to ensure reproducibility, and is more
-#   commonly ignored for libraries.
-#   https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control
-#poetry.lock
-
-# pdm
-#   Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control.
-#pdm.lock
-#   pdm stores project-wide configurations in .pdm.toml, but it is recommended to not include it
-#   in version control.
-#   https://pdm.fming.dev/#use-with-ide
-.pdm.toml
-
-# PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm
-__pypackages__/
-
-# Celery stuff
-celerybeat-schedule
-celerybeat.pid
-
-# SageMath parsed files
-*.sage.py
-
-# Environments
-.env
-.venv
-env/
-venv/
-ENV/
-env.bak/
-venv.bak/
-
-# Spyder project settings
-.spyderproject
-.spyproject
-
-# Rope project settings
-.ropeproject
-
-# mkdocs documentation
-/site
-
-# mypy
-.mypy_cache/
-.dmypy.json
-dmypy.json
-
-# Pyre type checker
-.pyre/
-
-# pytype static type analyzer
-.pytype/
-
-# Cython debug symbols
-cython_debug/
-
-# PyCharm
-#  JetBrains specific template is maintained in a separate JetBrains.gitignore that can
-#  be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
-#  and can be added to the global gitignore or merged into this file.  For a more nuclear
-#  option (not recommended) you can uncomment the following to ignore the entire idea folder.
-#.idea/
diff --git a/json/CONTRIBUTING.md b/json/CONTRIBUTING.md
deleted file mode 100644
index 8dab09e..0000000
--- a/json/CONTRIBUTING.md
+++ /dev/null
@@ -1,87 +0,0 @@
-# Contributing to the Suite
-
-All contributors to the test suite should familiarize themselves with this document.
-
-Both pull requests *and* reviews are welcome from any and all, regardless of their "formal" relationship (or lack thereof) with the JSON Schema organization.
-
-## Commit Access
-
-Any existing members with commit access to the repository may nominate new members to get access, or a contributor may request access for themselves.
-Access generally should be granted liberally to anyone who has shown positive contributions to the repository or organization.
-All who are active in other parts of the JSON Schema organization should get access to this repository as well.
-Access for a former contributor may be removed after long periods of inactivity.
-
-## Reviewing a Pull Request
-
-Pull requests may (and often should) be reviewed for approval by a single reviewer whose job it is to confirm the change is specified, correct, minimal and follows general style in the repository.
-A reviewer who does not feel comfortable signing off on the correctness of a change is free to comment without explicit approval.
-Other contributors are also encouraged to comment on pull requests whenever they have feedback, even if another contributor has submitted review comments.
-A submitter may also choose to request additional feedback if they feel the change is particularly technical or complex, or requires expertise in a particular area of the specification.
-If additional reviewers have participated in a pull request, the submitter should not rely on a single reviewer's approval without some form of confirmation that all participating reviewers are satisfied.
-On the other hand, whenever possible, reviewers who have minor comments should explicitly mention that they are OK with the PR being merged after or potentially *without* addressing them.
-
-When submitting a change, explicitly soliciting a specific reviewer explicitly is currently not needed, as the entire review team is generally pinged for pull requests.
-Nevertheless, submitters may choose to do so if they want specific review from an individual, or if a pull request is sitting without review for a period of time.
-For the latter scenario, leaving a comment on the pull request or in Slack is also reasonable.
-
-Confirming that a pull request runs successfully on an implementation is *not* generally sufficient to merge, though it is helpful evidence, and highly encouraged.
-Proposed changes should be confirmed by reading the specification and ensuring the behavior is specified and correct.
-Submitters are encouraged to link to the specification whenever doing so will be helpful to a reviewer.
-
-A reviewer may indicate that the proposed changes are too large for them to review.
-In such cases the submitter may wait for another reviewer who is comfortable reviewing the changes, but is generally strongly encouraged to split up the changes into multiple smaller ones.
-
-Reviewing pull requests is an extremely valuable contribution!
-New reviewers are highly encouraged to attempt to review pull requests even if they do not have experience doing so, and to themselves expect feedback from the submitter or from other reviewers on improving the quality of their reviews.
-In such cases the submitter should use their judgement to decide whether the new contributor's review is sufficient for merging, or whether they should wait for further feedback.
-
-## Merging Changes
-
-Approval of a change may be given using the GitHub UI or via a comment reply.
-Once it has been given, the pull request may be merged at any point.
-
-To merge a pull request, *either* the submitter or reviewer must have commit access to the repo (though this is also partially simply because that party's access is needed to merge).
-
-*Either* the submitter or reviewer may be the one to do the actual merge (whether via hitting the merge button or externally to the GitHub UI).
-If the submitter wishes to make final changes after a review they should attempt to say so (and thereby take responsibility for merging themselves).
-Contributors *should not* leave pull requests stagnant whenever possible, and particularly after they have been reviewed and approved.
-
-Changes should not be merged while continuous integration is failing.
-Failures typically are not spurious and indicate issues with the changes.
-In the event the change is indeed correct and CI is flaky or itself incorrect, effort should be made by the submitter, reviewer, or a solicited other contributor to fix the CI before the change is made.
-Improvements to CI itself are very valuable as well, and reviewers who find repeated issues with proposed changes are highly encouraged to improve CI for any changes which may be automatically detected.
-
-Changes should be merged *as-is* and not squashed into single commits.
-Submitters are free to structure their commits as they wish throughout the review process, or in some cases to restructure the commits after a review is finished and they are merging the branch, but are not required to do so, and reviewers should not do so on behalf of the submitter without being requested to do so.
-
-Contributors with commit access may choose to merge pull requests (or commit directly) to the repository for trivial changes.
-The definition of "trivial" is intentionally slightly ambiguous, and intended to be followed by good-faith contributors.
-An example of a trivial change is fixing a typo in the README, or bumping a version of a dependency used by the continuous integration suite.
-If another contributor takes issue with a change merged in this fashion, simply commenting politely that they have concerns about the change (either in an issue or directly) is the right remedy.
-
-## Writing Good Tests
-
-Be familiar with the test structure and assumptions documented in the [README](README.md).
-
-Test cases should include both valid and invalid instances which exercise the test case schema whenever possible.
-Exceptions include schemas where only one result is ever possible (such as the `false` schema, or ones using keywords which only produce annotations).
-
-Schemas should be *minimal*, by which we mean that they should contain only those keywords which are being tested by the specific test case, and should not contain complex values when simpler ones would do.
-The same applies to instances -- prefer simpler instances to more complex ones, and when testing string instances, consider using ones which are self-descriptive whenever it aids readability.
-
-Comments can and should be used to explain tests which are unclear or complex.
-The `comment` field is present both for test cases and individual tests for this purpose.
-Links to the relevant specification sections are also encouraged, though they can be tedious to maintain from one version to the next.
-
-When adding test cases, they should be added to all past (and future) versions of the specification which they apply to, potentially with minor modifications (e.g. changing `$id` to `id` or accounting for `$ref` not allowing siblings on older drafts).
-
-Changing the schema used in a particular test case should be done with extra caution, though it is not formally discouraged if the change simplifies the schema.
-Contributors should not generally append *additional* behavior to existing test case schemas, unless doing so has specific justification.
-Instead, new cases should be added, as it can often be subtle to predict which precise parts of a test case are unique.
-Adding additional *tests* however (instances) is of course safe and encouraged if gaps are found.
-
-Tests which are *incorrect* (against the specification) should be prioritized for fixing or removal whenever possible, as their continued presence in the suite can create confusion for downstream users of the suite.
-
-## Proposing Changes to the Policy
-
-This policy itself is of course changeable, and changes to it may be proposed in a discussion.
diff --git a/json/LICENSE b/json/LICENSE
deleted file mode 100644
index c28adba..0000000
--- a/json/LICENSE
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright (c) 2012 Julian Berman
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
diff --git a/json/README.md b/json/README.md
deleted file mode 100644
index a0ccf11..0000000
--- a/json/README.md
+++ /dev/null
@@ -1,344 +0,0 @@
-# JSON Schema Test Suite
-
-[![Contributor Covenant](https://img.shields.io/badge/Contributor%20Covenant-2.1-4baaaa.svg)](https://github.com/json-schema-org/.github/blob/main/CODE_OF_CONDUCT.md)
-[![Project Status: Active – The project has reached a stable, usable state and is being actively developed.](https://www.repostatus.org/badges/latest/active.svg)](https://www.repostatus.org/#active)
-[![Financial Contributors on Open Collective](https://opencollective.com/json-schema/all/badge.svg?label=financial+contributors)](https://opencollective.com/json-schema)
-
-[![DOI](https://zenodo.org/badge/5952934.svg)](https://zenodo.org/badge/latestdoi/5952934)
-[![Build Status](https://github.com/json-schema-org/JSON-Schema-Test-Suite/workflows/Test%20Suite%20Sanity%20Checking/badge.svg)](https://github.com/json-schema-org/JSON-Schema-Test-Suite/actions?query=workflow%3A%22Test+Suite+Sanity+Checking%22)
-
-This repository contains a set of JSON objects that implementers of JSON Schema validation libraries can use to test their validators.
-
-It is meant to be language agnostic and should require only a JSON parser.
-The conversion of the JSON objects into tests within a specific language and test framework of choice is left to be done by the validator implementer.
-
-## Coverage
-
-All JSON Schema specification releases should be well covered by this suite, including drafts 2020-12, 2019-09, 07, 06, 04 and 03.
-Drafts 04 and 03 are considered "frozen" in that less effort is put in to backport new tests to these versions.
-
-Additional coverage is always welcome, particularly for bugs encountered in real-world implementations.
-If you see anything missing or incorrect, please feel free to [file an issue](https://github.com/json-schema-org/JSON-Schema-Test-Suite/issues) or [submit a PR](https://github.com/json-schema-org/JSON-Schema-Test-Suite).
-
-## Introduction to the Test Suite Structure
-
-The tests in this suite are contained in the `tests` directory at the root of this repository.
-Inside that directory is a subdirectory for each released version of the specification.
-
-The structure and contents of each file in these directories is described below.
-
-In addition to the version-specific subdirectories, two additional directories are present:
-
-1. `draft-next/`: containing tests for the next version of the specification whilst it is in development
-2. `latest/`: a symbolic link which points to the directory which is the most recent release (which may be useful for implementations providing specific entry points for validating against the latest version of the specification)
-
-Inside each version directory there are a number of `.json` files each containing a collection of related tests.
-Often the grouping is by property under test, but not always.
-In addition to the `.json` files, each version directory contains one or more special subdirectories whose purpose is [described below](#subdirectories-within-each-draft), and which contain additional `.json` files.
-
-Each `.json` file consists of a single JSON array of test cases.
-
-### Terminology
-
-For clarity, we first define this document's usage of some testing terminology:
-
-| term            | definition                                                                                                                                                        |
-|-----------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| **test suite**  | the entirety of the contents of this repository, containing tests for multiple different releases of the JSON Schema specification                                |
-| **test case**   | a single schema, along with a description and an array of *test*s                                                                                                 |
-| **test**        | within a *test case*, a single test example, containing a description, instance and a boolean indicating whether the instance is valid under the test case schema |
-| **test runner** | a program, external to this repository and authored by a user of this suite, which is executing each of the tests in the suite                                    |
-
-An example illustrating this structure is immediately below, and a JSON Schema containing a formal definition of the contents of test cases can be found [alongside this README](./test-schema.json).
-
-### Sample Test Case
-
-Here is a single *test case*, containing one or more tests:
-
-```json
-{
-    "description": "The test case description",
-    "schema": { "type": "string" },
-    "tests": [
-        {
-            "description": "a test with a valid instance",
-            "data": "a string",
-            "valid": true
-        },
-        {
-            "description": "a test with an invalid instance",
-            "data": 15,
-            "valid": false
-        }
-    ]
-}
-```
-
-### Subdirectories Within Each Draft
-
-There is currently only one additional subdirectory that may exist within each draft test directory.
-
-This is:
-
-1. `optional/`: Contains tests that are considered optional.
-
-Note, the `optional/` subdirectory today conflates many reasons why a test may be optional -- it may be because tests within a particular file are indeed not required by the specification but still potentially useful to an implementer, or it may be because tests within it only apply to programming languages with particular functionality (in
-which case they are not truly optional in such a language).
-In the future this directory structure will be made richer to reflect these differences more clearly.
-
-## Using the Suite to Test a Validator Implementation
-
-The test suite structure was described [above](#introduction-to-the-test-suite-structure).
-
-If you are authoring a new validator implementation, or adding support for an additional version of the specification, this section describes:
-
-1. How to implement a test runner which passes tests to your validator
-2. Assumptions the suite makes about how the test runner will configure your validator
-3. Invariants the test suite claims to hold for its tests
-
-### How to Implement a Test Runner
-
-Presented here is a possible implementation of a test runner.
-The precise steps described do not need to be followed exactly, but the results of your own procedure should produce the same effects.
-
-To test a specific version:
-
-* For 2019-09 and later published drafts, implementations that are able to detect the draft of each schema via `$schema` SHOULD be configured to do so
-* For draft-07 and earlier, draft-next, and implementations unable to detect via `$schema`, implementations MUST be configured to expect the draft matching the test directory name
-* Load any remote references [described below](additional-assumptions) and configure your implementation to retrieve them via their URIs
-* Walk the filesystem tree for that version's subdirectory and for each `.json` file found:
-
-    * if the file is located in the root of the version directory:
-
-        * for each test case present in the file:
-
-            * load the schema from the `"schema"` property
-            * load (or log) the test case description from the `"description"` property for debugging or outputting
-            * for each test in the `"tests"` property:
-
-                * load the instance to be tested from the `"data"` property
-                * load (or log) the individual test description from the `"description"` property for debugging or outputting
-
-                * use the schema loaded above to validate whether the instance is considered valid under your implementation
-
-                * if the result from your implementation matches the value found in the `"valid"` property, your implementation correctly implements the specific example
-                * if the result does not match, or your implementation errors or crashes, your implementation does not correctly implement the specific example
-
-    * otherwise it is located in a special subdirectory as described above.
-      Follow the additional assumptions and restrictions for the containing subdirectory, then run the test case as above.
-
-If your implementation supports multiple versions, run the above procedure for each version supported, configuring your implementation as appropriate to call each version individually.
-
-### Additional Assumptions
-
-1. The suite, notably in its `refRemote.json` file in each draft, expects a number of remote references to be configured.
-   These are JSON documents, identified by URI, which are used by the suite to test the behavior of the `$ref` keyword (and related keywords).
-   Depending on your implementation, you may configure how to "register" these *either*:
-
-    * by directly retrieving them off the filesystem from the `remotes/` directory, in which case you should load each schema with a retrieval URI of `http://localhost:1234` followed by the relative path from the remotes directory -- e.g. a `$ref` to `http://localhost:1234/foo/bar/baz.json` is expected to resolve to the contents of the file at `remotes/foo/bar/baz.json`
-
-    * or alternatively, by executing `bin/jsonschema_suite remotes` using the executable in the `bin/` directory, which will output a JSON object containing all of the remotes combined, e.g.:
-
-    ```
-
-    $  bin/jsonschema_suite remotes
-    ```
-    ```json
-    {
-        "http://localhost:1234/baseUriChange/folderInteger.json": {
-            "type": "integer"
-        },
-        "http://localhost:1234/baseUriChangeFolder/folderInteger.json": {
-            "type": "integer"
-        }
-    }
-    ```
-
-2. Test cases found within [special subdirectories](#subdirectories-within-each-draft) may require additional configuration to run.
-   In particular, tests within the `optional/format` subdirectory may require implementations to change the way they treat the `"format"`keyword (particularly on older drafts which did not have a notion of vocabularies).
-
-### Invariants & Guarantees
-
-The test suite guarantees a number of things about tests it defines.
-Any deviation from the below is generally considered a bug.
-If you suspect one, please [file an issue](https://github.com/json-schema-org/JSON-Schema-Test-Suite/issues/new):
-
-1. All files containing test cases are valid JSON.
-2. The contents of the `"schema"` property in a test case are always valid
-   JSON Schemas under the corresponding specification.
-
-   The rationale behind this is that we are testing instances in a test's `"data"` element, and not the schema itself.
-   A number of tests *do* test the validity of a schema itself, but do so by representing the schema as an instance inside a test, with the associated meta-schema in the `"schema"` property (via the `"$ref"` keyword):
-
-   ```json
-   {
-       "description": "Test the \"type\" schema keyword",
-       "schema": {
-           "$ref": "https://json-schema.org/draft/2019-09/schema"
-        },
-       "tests": [
-           {
-               "description": "Valid: string",
-               "data": {
-                   "type": "string"
-               },
-               "valid": true
-           },
-           {
-               "description": "Invalid: null",
-               "data": {
-                   "type": null
-               },
-               "valid": false
-           }
-       ]
-   }
-   ```
-   See below for some [known limitations](#known-limitations).
-
-## Known Limitations
-
-This suite expresses its assertions about the behavior of an implementation *within* JSON Schema itself.
-Each test is the application of a schema to a particular instance.
-This means that the suite of tests can test against any behavior a schema can describe, and conversely cannot test against any behavior which a schema is incapable of representing, even if the behavior is mandated by the specification.
-
-For example, a schema can require that a string is a _URI-reference_ and even that it matches a certain pattern, but even though the specification contains [recommendations about URIs being normalized](https://json-schema.org/draft/2020-12/json-schema-core.html#name-the-id-keyword), a JSON schema cannot today represent this assertion within the core vocabularies of the specifications, so no test covers this behavior.
-
-## Who Uses the Test Suite
-
-This suite is being used by:
-
-### Clojure
-
-* [jinx](https://github.com/juxt/jinx)
-* [json-schema](https://github.com/tatut/json-schema)
-
-### Coffeescript
-
-* [jsck](https://github.com/pandastrike/jsck)
-
-### Common Lisp
-
-* [json-schema](https://github.com/fisxoj/json-schema)
-
-### C++
-
-* [Modern C++ JSON schema validator](https://github.com/pboettch/json-schema-validator)
-* [Valijson](https://github.com/tristanpenman/valijson)
-
-### Dart
-
-* [json\_schema](https://github.com/patefacio/json_schema)
-
-### Elixir
-
-* [ex\_json\_schema](https://github.com/jonasschmidt/ex_json_schema)
-
-### Erlang
-
-* [jesse](https://github.com/for-GET/jesse)
-
-### Go
-
-* [gojsonschema](https://github.com/sigu-399/gojsonschema)
-* [validate-json](https://github.com/cesanta/validate-json)
-
-### Haskell
-
-* [aeson-schema](https://github.com/timjb/aeson-schema)
-* [hjsonschema](https://github.com/seagreen/hjsonschema)
-
-### Java
-
-* [json-schema-validator](https://github.com/daveclayton/json-schema-validator)
-* [everit-org/json-schema](https://github.com/everit-org/json-schema)
-* [networknt/json-schema-validator](https://github.com/networknt/json-schema-validator)
-* [Justify](https://github.com/leadpony/justify)
-* [Snow](https://github.com/ssilverman/snowy-json)
-* [jsonschemafriend](https://github.com/jimblackler/jsonschemafriend)
-
-### JavaScript
-
-* [json-schema-benchmark](https://github.com/Muscula/json-schema-benchmark)
-* [direct-schema](https://github.com/IreneKnapp/direct-schema)
-* [is-my-json-valid](https://github.com/mafintosh/is-my-json-valid)
-* [jassi](https://github.com/iclanzan/jassi)
-* [JaySchema](https://github.com/natesilva/jayschema)
-* [json-schema-valid](https://github.com/ericgj/json-schema-valid)
-* [Jsonary](https://github.com/jsonary-js/jsonary)
-* [jsonschema](https://github.com/tdegrunt/jsonschema)
-* [request-validator](https://github.com/bugventure/request-validator)
-* [skeemas](https://github.com/Prestaul/skeemas)
-* [tv4](https://github.com/geraintluff/tv4)
-* [z-schema](https://github.com/zaggino/z-schema)
-* [jsen](https://github.com/bugventure/jsen)
-* [ajv](https://github.com/epoberezkin/ajv)
-* [djv](https://github.com/korzio/djv)
-
-### Node.js
-
-For node.js developers, the suite is also available as an [npm](https://www.npmjs.com/package/@json-schema-org/tests) package.
-
-Node-specific support is maintained in a [separate repository](https://github.com/json-schema-org/json-schema-test-suite-npm) which also welcomes your contributions!
-
-### .NET
-
-* [JsonSchema.Net](https://github.com/gregsdennis/json-everything)
-* [Newtonsoft.Json.Schema](https://github.com/JamesNK/Newtonsoft.Json.Schema)
-
-### Perl
-
-* [Test::JSON::Schema::Acceptance](https://github.com/karenetheridge/Test-JSON-Schema-Acceptance) (a wrapper of this test suite)
-* [JSON::Schema::Modern](https://github.com/karenetheridge/JSON-Schema-Modern)
-* [JSON::Schema::Tiny](https://github.com/karenetheridge/JSON-Schema-Tiny)
-
-### PHP
-
-* [opis/json-schema](https://github.com/opis/json-schema)
-* [json-schema](https://github.com/justinrainbow/json-schema)
-* [json-guard](https://github.com/thephpleague/json-guard)
-
-### PostgreSQL
-
-* [postgres-json-schema](https://github.com/gavinwahl/postgres-json-schema)
-* [is\_jsonb\_valid](https://github.com/furstenheim/is_jsonb_valid)
-
-### Python
-
-* [jsonschema](https://github.com/Julian/jsonschema)
-* [fastjsonschema](https://github.com/seznam/python-fastjsonschema)
-* [hypothesis-jsonschema](https://github.com/Zac-HD/hypothesis-jsonschema)
-* [jschon](https://github.com/marksparkza/jschon)
-* [python-experimental, OpenAPI Generator](https://github.com/OpenAPITools/openapi-generator/blob/master/docs/generators/python-experimental.md)
-
-### Ruby
-
-* [json-schema](https://github.com/hoxworth/json-schema)
-* [json\_schemer](https://github.com/davishmcclurg/json_schemer)
-
-### Rust
-
-* [jsonschema](https://github.com/Stranger6667/jsonschema-rs)
-* [valico](https://github.com/rustless/valico)
-
-### Scala
-
-* [typed-json](https://github.com/frawa/typed-json)
-
-### Swift
-
-* [JSONSchema](https://github.com/kylef/JSONSchema.swift)
-
-If you use it as well, please fork and send a pull request adding yourself to
-the list :).
-
-## Contributing
-
-If you see something missing or incorrect, a pull request is most welcome!
-
-There are some sanity checks in place for testing the test suite. You can run
-them with `bin/jsonschema_suite check` or `tox`. They will be run automatically
-by [GitHub Actions](https://github.com/json-schema-org/JSON-Schema-Test-Suite/actions?query=workflow%3A%22Test+Suite+Sanity+Checking%22)
-as well.
-
-This repository is maintained by the JSON Schema organization, and will be governed by the JSON Schema steering committee (once it exists).
diff --git a/json/bin/jsonschema_suite b/json/bin/jsonschema_suite
deleted file mode 100755
index 1288f04..0000000
--- a/json/bin/jsonschema_suite
+++ /dev/null
@@ -1,720 +0,0 @@
-#! /usr/bin/env python3
-from pathlib import Path
-from urllib.parse import urljoin
-import argparse
-import json
-import os
-import random
-import shutil
-import sys
-import textwrap
-import unittest
-import warnings
-
-try:
-    import jsonschema.validators
-except ImportError:
-    jsonschema = None
-    VALIDATORS = {}
-else:
-    VALIDATORS = {
-        "draft3": jsonschema.validators.Draft3Validator,
-        "draft4": jsonschema.validators.Draft4Validator,
-        "draft6": jsonschema.validators.Draft6Validator,
-        "draft7": jsonschema.validators.Draft7Validator,
-        "draft2019-09": jsonschema.validators.Draft201909Validator,
-        "draft2020-12": jsonschema.validators.Draft202012Validator,
-        "latest": jsonschema.validators.Draft202012Validator,
-    }
-
-
-ROOT_DIR = Path(__file__).parent.parent
-SUITE_ROOT_DIR = ROOT_DIR / "tests"
-OUTPUT_ROOT_DIR = ROOT_DIR / "output-tests"
-
-REMOTES_DIR = ROOT_DIR / "remotes"
-REMOTES_BASE_URL = "http://localhost:1234/"
-
-TEST_SCHEMA = json.loads(ROOT_DIR.joinpath("test-schema.json").read_text())
-OUTPUT_TEST_SCHEMA = json.loads(
-    ROOT_DIR.joinpath("output-test-schema.json").read_text(),
-)
-
-
-def files(paths):
-    """
-    Each test file in the provided paths, as an array of test cases.
-    """
-    for path in paths:
-        yield path, json.loads(path.read_text())
-
-
-def cases(paths):
-    """
-    Each test case within each file in the provided paths.
-    """
-    for _, test_file in files(paths):
-        yield from test_file
-
-
-def tests(paths):
-    """
-    Each individual test within all cases within the provided paths.
-    """
-    for case in cases(paths):
-        for test in case["tests"]:
-            test["schema"] = case["schema"]
-            yield test
-
-
-def collect(root_dir):
-    """
-    All of the test file paths within the given root directory, recursively.
-    """
-    return root_dir.rglob("*.json")
-
-
-def url_for_path(path):
-    """
-    Return the assumed remote URL for a file in the remotes/ directory.
-
-    Tests in the refRemote.json file reference this URL, and assume the
-    corresponding contents are available at the URL.
-    """
-
-    return urljoin(
-        REMOTES_BASE_URL,
-        str(path.relative_to(REMOTES_DIR)).replace("\\", "/"),  # Windows...
-    )
-
-
-def versions_and_validators():
-    """
-    All versions we can validate schemas from.
-    """
-
-    for version in SUITE_ROOT_DIR.iterdir():
-        if not version.is_dir():
-            continue
-
-            Validator = VALIDATORS.get(version.name)
-            if Validator is None:
-                warnings.warn(f"No schema validator for {version.name}")
-                continue
-
-            yield version, Validator
-
-
-class SanityTests(unittest.TestCase):
-    @classmethod
-    def setUpClass(cls):
-        print(f"Looking for tests in {SUITE_ROOT_DIR}")
-        print(f"Looking for output tests in {OUTPUT_ROOT_DIR}")
-        print(f"Looking for remotes in {REMOTES_DIR}")
-
-        cls.test_files = list(collect(SUITE_ROOT_DIR))
-        assert cls.test_files, "Didn't find the test files!"
-        print(f"Found {len(cls.test_files)} test files")
-
-        cls.output_test_files = [
-            each
-            for each in collect(OUTPUT_ROOT_DIR)
-            if each.name != "output-schema.json"
-        ]
-        assert cls.output_test_files, "Didn't find the output test files!"
-        print(f"Found {len(cls.output_test_files)} output test files")
-
-        cls.remote_files = list(collect(REMOTES_DIR))
-        assert cls.remote_files, "Didn't find the remote files!"
-        print(f"Found {len(cls.remote_files)} remote files")
-
-    def assertUnique(self, iterable):
-        """
-        Assert that the elements of an iterable are unique.
-        """
-
-        seen, duplicated = set(), set()
-        for each in iterable:
-            if each in seen:
-                duplicated.add(each)
-            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_json_files_are_valid(self):
-        """
-        All files (tests, output tests, remotes, etc.) contain valid JSON.
-        """
-        for path in collect(ROOT_DIR):
-            with self.subTest(path=path):
-                try:
-                    json.loads(path.read_text())
-                except ValueError as error:
-                    self.fail(f"{path} contains invalid JSON ({error})")
-
-    def test_all_case_descriptions_have_reasonable_length(self):
-        """
-        All cases have reasonably long descriptions.
-        """
-        for case in cases(self.test_files + self.output_test_files):
-            with self.subTest(description=case["description"]):
-                self.assertLess(
-                    len(case["description"]),
-                    150,
-                    "Description is too long (keep it to less than 150 chars).",
-                )
-
-    def test_all_test_descriptions_have_reasonable_length(self):
-        """
-        All tests have reasonably long descriptions.
-        """
-        for count, test in enumerate(
-            tests(self.test_files + self.output_test_files)
-        ):
-            with self.subTest(description=test["description"]):
-                self.assertLess(
-                    len(test["description"]),
-                    70,
-                    "Description is too long (keep it to less than 70 chars).",
-                )
-        print(f"Found {count} tests.")
-
-    def test_all_case_descriptions_are_unique(self):
-        """
-        All cases have unique descriptions in their files.
-        """
-        for path, cases in files(self.test_files + self.output_test_files):
-            with self.subTest(path=path):
-                self.assertUnique(case["description"] for case in cases)
-
-    def test_all_test_descriptions_are_unique(self):
-        """
-        All test cases have unique test descriptions in their tests.
-        """
-        for count, case in enumerate(
-            cases(self.test_files + self.output_test_files)
-        ):
-            with self.subTest(description=case["description"]):
-                self.assertUnique(
-                    test["description"] for test in case["tests"]
-                )
-        print(f"Found {count} test cases.")
-
-    def test_case_descriptions_do_not_use_modal_verbs(self):
-        for case in cases(self.test_files + self.output_test_files):
-            with self.subTest(description=case["description"]):
-                self.assertFollowsDescriptionStyle(case["description"])
-
-    def test_test_descriptions_do_not_use_modal_verbs(self):
-        for test in tests(self.test_files + self.output_test_files):
-            with self.subTest(description=test["description"]):
-                self.assertFollowsDescriptionStyle(test["description"])
-
-    @unittest.skipIf(jsonschema is None, "Validation library not present!")
-    def test_all_schemas_are_valid(self):
-        """
-        All schemas are valid under their metaschemas.
-        """
-        for version, Validator in versions_and_validators():
-            # Valid (optional test) schemas contain regexes which
-            # aren't valid Python regexes, so skip checking it
-            Validator.FORMAT_CHECKER.checkers.pop("regex", None)
-
-            test_files = collect(version)
-            for case in cases(test_files):
-                with self.subTest(case=case):
-                    try:
-                        Validator.check_schema(
-                            case["schema"],
-                            format_checker=Validator.FORMAT_CHECKER,
-                        )
-                    except jsonschema.SchemaError:
-                        self.fail(
-                            "Found an invalid schema. "
-                            "See the traceback for details on why."
-                        )
-
-    @unittest.skipIf(jsonschema is None, "Validation library not present!")
-    def test_arbitrary_schemas_do_not_use_unknown_keywords(self):
-        """
-        Test cases do not use unknown keywords.
-
-        (Unless they specifically are testing the specified behavior for
-        unknown keywords).
-
-        This helps prevent accidental leakage of newer keywords into older
-        drafts where they didn't exist.
-        """
-
-        KNOWN = {
-            "draft2020-12": {
-                "$anchor",
-                "$comment",
-                "$defs",
-                "$dynamicAnchor",
-                "$dynamicRef",
-                "$id",
-                "$ref",
-                "$schema",
-                "$vocabulary",
-                "additionalProperties",
-                "allOf",
-                "allOf",
-                "anyOf",
-                "const",
-                "contains",
-                "contentEncoding",
-                "contentMediaType",
-                "contentSchema",
-                "dependencies",
-                "dependentRequired",
-                "dependentSchemas",
-                "description",
-                "else",
-                "enum",
-                "exclusiveMaximum",
-                "exclusiveMinimum",
-                "format",
-                "if",
-                "items",
-                "maxContains",
-                "maxItems",
-                "maxItems",
-                "maxLength",
-                "maxProperties",
-                "maximum",
-                "minContains",
-                "minItems",
-                "minLength",
-                "minProperties",
-                "minimum",
-                "multipleOf",
-                "not",
-                "oneOf",
-                "pattern",
-                "patternProperties",
-                "prefixItems",
-                "properties",
-                "propertyNames",
-                "required",
-                "then",
-                "title",
-                "type",
-                "unevaluatedItems",
-                "unevaluatedProperties",
-                "uniqueItems",
-            },
-            "draft2019-09": {
-                "$anchor",
-                "$comment",
-                "$defs",
-                "$id",
-                "$recursiveAnchor",
-                "$recursiveRef",
-                "$ref",
-                "$schema",
-                "$vocabulary",
-                "additionalItems",
-                "additionalProperties",
-                "allOf",
-                "anyOf",
-                "const",
-                "contains",
-                "contentEncoding",
-                "contentMediaType",
-                "contentSchema",
-                "dependencies",
-                "dependentRequired",
-                "dependentSchemas",
-                "description",
-                "else",
-                "enum",
-                "exclusiveMaximum",
-                "exclusiveMinimum",
-                "format",
-                "if",
-                "items",
-                "maxContains",
-                "maxItems",
-                "maxLength",
-                "maxProperties",
-                "maximum",
-                "minContains",
-                "minItems",
-                "minLength",
-                "minProperties",
-                "minimum",
-                "multipleOf",
-                "not",
-                "oneOf",
-                "pattern",
-                "patternProperties",
-                "properties",
-                "propertyNames",
-                "required",
-                "then",
-                "title",
-                "type",
-                "unevaluatedItems",
-                "unevaluatedProperties",
-                "uniqueItems",
-            },
-            "draft7": {
-                "$comment",
-                "$id",
-                "$ref",
-                "$schema",
-                "additionalItems",
-                "additionalProperties",
-                "allOf",
-                "anyOf",
-                "const",
-                "contains",
-                "contentEncoding",
-                "contentMediaType",
-                "definitions",
-                "dependencies",
-                "description",
-                "else",
-                "enum",
-                "exclusiveMaximum",
-                "exclusiveMinimum",
-                "format",
-                "if",
-                "items",
-                "maxItems",
-                "maxLength",
-                "maxProperties",
-                "maximum",
-                "minItems",
-                "minLength",
-                "minProperties",
-                "minimum",
-                "multipleOf",
-                "not",
-                "oneOf",
-                "pattern",
-                "patternProperties",
-                "properties",
-                "propertyNames",
-                "required",
-                "then",
-                "title",
-                "type",
-                "type",
-                "uniqueItems",
-            },
-            "draft6": {
-                "$comment",
-                "$id",
-                "$ref",
-                "$schema",
-                "additionalItems",
-                "additionalProperties",
-                "allOf",
-                "anyOf",
-                "const",
-                "contains",
-                "definitions",
-                "dependencies",
-                "description",
-                "enum",
-                "exclusiveMaximum",
-                "exclusiveMinimum",
-                "format",
-                "items",
-                "maxItems",
-                "maxLength",
-                "maxProperties",
-                "maximum",
-                "minItems",
-                "minLength",
-                "minProperties",
-                "minimum",
-                "multipleOf",
-                "not",
-                "oneOf",
-                "pattern",
-                "patternProperties",
-                "properties",
-                "propertyNames",
-                "required",
-                "title",
-                "type",
-                "uniqueItems",
-            },
-            "draft4": {
-                "$ref",
-                "$schema",
-                "additionalItems",
-                "additionalItems",
-                "additionalProperties",
-                "allOf",
-                "anyOf",
-                "definitions",
-                "dependencies",
-                "description",
-                "enum",
-                "exclusiveMaximum",
-                "exclusiveMinimum",
-                "format",
-                "id",
-                "items",
-                "maxItems",
-                "maxLength",
-                "maxProperties",
-                "maximum",
-                "minItems",
-                "minLength",
-                "minProperties",
-                "minimum",
-                "multipleOf",
-                "not",
-                "oneOf",
-                "pattern",
-                "patternProperties",
-                "properties",
-                "required",
-                "title",
-                "type",
-                "uniqueItems",
-            },
-            "draft3": {
-                "$ref",
-                "$schema",
-                "additionalItems",
-                "additionalProperties",
-                "definitions",
-                "dependencies",
-                "description",
-                "disallow",
-                "divisibleBy",
-                "enum",
-                "exclusiveMaximum",
-                "exclusiveMinimum",
-                "extends",
-                "format",
-                "id",
-                "items",
-                "maxItems",
-                "maxLength",
-                "maximum",
-                "minItems",
-                "minLength",
-                "minimum",
-                "pattern",
-                "patternProperties",
-                "properties",
-                "title",
-                "type",
-                "uniqueItems",
-            },
-        }
-
-        def missing(d):
-            from collections.abc import Mapping
-
-            class BlowUpForUnknownProperties(Mapping):
-                def __iter__(this):
-                    return iter(d)
-
-                def __getitem__(this, k):
-                    if k not in KNOWN[version.name]:
-                        self.fail(
-                            f"{k} is not a known keyword for {version.name}. "
-                            "If this test is testing behavior related to "
-                            "unknown keywords you may need to add it to the "
-                            "allowlist in the jsonschema_suite checker. "
-                            "Otherwise it may contain a typo!"
-                        )
-                    return d[k]
-
-                def __len__(this):
-                    return len(d)
-
-            return BlowUpForUnknownProperties()
-
-        for version, Validator in versions_and_validators():
-            if version.name == "latest":
-                continue
-
-            self.addCleanup(
-                setattr, Validator, "VALIDATORS", Validator.VALIDATORS,
-            )
-            Validator.VALIDATORS = missing(dict(Validator.VALIDATORS))
-
-            test_files = [
-                each for each in collect(version)
-                if each.stem != "refOfUnknownKeyword"
-            ]
-            for case in cases(test_files):
-                if "unknown keyword" in case["description"]:
-                    continue
-                with self.subTest(case=case, version=version.name):
-                    try:
-                        Validator(case["schema"]).is_valid(12)
-                    except jsonschema.exceptions.RefResolutionError:
-                        pass
-
-    @unittest.skipIf(jsonschema is None, "Validation library not present!")
-    def test_suites_are_valid(self):
-        """
-        All test files are valid under test-schema.json.
-        """
-        Validator = jsonschema.validators.validator_for(TEST_SCHEMA)
-        validator = Validator(TEST_SCHEMA)
-        for path, cases in files(self.test_files):
-            with self.subTest(path=path):
-                try:
-                    validator.validate(cases)
-                except jsonschema.ValidationError as error:
-                    self.fail(str(error))
-
-    @unittest.skipIf(jsonschema is None, "Validation library not present!")
-    def test_output_suites_are_valid(self):
-        """
-        All output test files are valid under output-test-schema.json.
-        """
-        Validator = jsonschema.validators.validator_for(OUTPUT_TEST_SCHEMA)
-        validator = Validator(OUTPUT_TEST_SCHEMA)
-        for path, cases in files(self.output_test_files):
-            with self.subTest(path=path):
-                try:
-                    validator.validate(cases)
-                except jsonschema.exceptions.RefResolutionError:
-                    # python-jsonschema/jsonschema#884
-                    pass
-                except jsonschema.ValidationError as error:
-                    self.fail(str(error))
-
-
-def main(arguments):
-    if arguments.command == "check":
-        suite = unittest.TestLoader().loadTestsFromTestCase(SanityTests)
-        result = unittest.TextTestRunner().run(suite)
-        sys.exit(not result.wasSuccessful())
-    elif arguments.command == "flatten":
-        selected_cases = [case for case in cases(collect(arguments.version))]
-
-        if arguments.randomize:
-            random.shuffle(selected_cases)
-
-        json.dump(selected_cases, sys.stdout, indent=4, sort_keys=True)
-    elif arguments.command == "remotes":
-        remotes = {
-            url_for_path(path): json.loads(path.read_text())
-            for path in collect(REMOTES_DIR)
-        }
-        json.dump(remotes, sys.stdout, indent=4, sort_keys=True)
-    elif arguments.command == "dump_remotes":
-        if arguments.update:
-            shutil.rmtree(arguments.out_dir, ignore_errors=True)
-
-        try:
-            shutil.copytree(REMOTES_DIR, arguments.out_dir)
-        except FileExistsError:
-            print(f"{arguments.out_dir} already exists. Aborting.")
-            sys.exit(1)
-    elif arguments.command == "serve":
-        try:
-            import flask
-        except ImportError:
-            print(
-                textwrap.dedent(
-                    """
-                The Flask library is required to serve the remote schemas.
-
-                You can install it by running `pip install Flask`.
-
-                Alternatively, see the `jsonschema_suite remotes` or
-                `jsonschema_suite dump_remotes` commands to create static files
-                that can be served with your own web server.
-            """.strip(
-                        "\n"
-                    )
-                )
-            )
-            sys.exit(1)
-
-        app = flask.Flask(__name__)
-
-        @app.route("/<path:path>")
-        def serve_path(path):
-            return flask.send_from_directory(REMOTES_DIR, path)
-
-        app.run(port=1234)
-
-
-parser = argparse.ArgumentParser(
-    description="JSON Schema Test Suite utilities",
-)
-subparsers = parser.add_subparsers(
-    help="utility commands", dest="command", metavar="COMMAND"
-)
-subparsers.required = True
-
-check = subparsers.add_parser("check", help="Sanity check the test suite.")
-
-flatten = subparsers.add_parser(
-    "flatten",
-    help="Output a flattened file containing a selected version's test cases.",
-)
-flatten.add_argument(
-    "--randomize",
-    action="store_true",
-    help="Randomize the order of the outputted cases.",
-)
-flatten.add_argument(
-    "version",
-    help="The directory containing the version to output",
-)
-
-remotes = subparsers.add_parser(
-    "remotes",
-    help="Output the expected URLs and their associated schemas for remote "
-    "ref tests as a JSON object.",
-)
-
-dump_remotes = subparsers.add_parser(
-    "dump_remotes",
-    help="Dump the remote ref schemas into a file tree",
-)
-dump_remotes.add_argument(
-    "--update",
-    action="store_true",
-    help="Update the remotes in an existing directory.",
-)
-dump_remotes.add_argument(
-    "--out-dir",
-    default=REMOTES_DIR,
-    type=os.path.abspath,
-    help="The output directory to create as the root of the file tree",
-)
-
-serve = subparsers.add_parser(
-    "serve",
-    help="Start a webserver to serve schemas used by remote ref tests.",
-)
-
-if __name__ == "__main__":
-    main(parser.parse_args())
diff --git a/json/output-test-schema.json b/json/output-test-schema.json
deleted file mode 100644
index 02c51ef..0000000
--- a/json/output-test-schema.json
+++ /dev/null
@@ -1,70 +0,0 @@
-{
-    "$schema": "https://json-schema.org/draft/2020-12/schema",
-    "$id": "https://json-schema.org/tests/output-test-schema",
-    "description": "A schema for files contained within this suite",
-
-    "type": "array",
-    "minItems": 1,
-    "items": {
-        "description": "An individual test case, containing multiple tests of a single schema's behavior",
-
-        "type": "object",
-        "required": [ "description", "schema", "tests" ],
-        "properties": {
-            "description": {
-                "description": "The test case description",
-                "type": "string"
-            },
-            "comment": {
-                "description": "Any additional comments about the test case",
-                "type": "string"
-            },
-            "schema": {
-                "description": "A valid JSON Schema (one written for the corresponding version directory that the file sits within)."
-            },
-            "tests": {
-                "description": "A set of related tests all using the same schema",
-                "type": "array",
-                "items": { "$ref": "#/$defs/test" },
-                "minItems": 1
-            }
-        },
-        "additionalProperties": false
-    },
-
-    "$defs": {
-        "test": {
-            "description": "A single output test",
-
-            "type": "object",
-            "required": [ "description", "data", "output" ],
-            "properties": {
-                "description": {
-                    "description": "The test description, briefly explaining which behavior it exercises",
-                    "type": "string"
-                },
-                "comment": {
-                    "description": "Any additional comments about the test",
-                    "type": "string"
-                },
-                "data": {
-                    "description": "The instance which should be validated against the schema in \"schema\"."
-                },
-                "output": {
-                    "description": "schemas that are used to verify output",
-                    "type": "object",
-                    "properties": {
-                        "flag": { "$ref": "https://json-schema.org/draft/2020-12/schema" },
-                        "basic": { "$ref": "https://json-schema.org/draft/2020-12/schema" },
-                        "detailed": { "$ref": "https://json-schema.org/draft/2020-12/schema" },
-                        "verbose": { "$ref": "https://json-schema.org/draft/2020-12/schema" },
-                        "list": { "$ref": "https://json-schema.org/draft/2020-12/schema" },
-                        "hierarchy": { "$ref": "https://json-schema.org/draft/2020-12/schema" }
-                    },
-                    "minProperties": 1,
-                    "additionalProperties": false
-                }
-            }
-        }
-    }
-}
diff --git a/json/output-tests/README.md b/json/output-tests/README.md
deleted file mode 100644
index 0cd7c87..0000000
--- a/json/output-tests/README.md
+++ /dev/null
@@ -1,63 +0,0 @@
-These tests are intended to validate that implementations are correctly generating output in accordance with the specification.
-
-Output was initially specified with draft 2019-09.  It remained largely unchanged for draft 2020-12, but will receive an update with the next release.
-
-***NOTE** Although the formats didn't change between 2019-09 and 2020-12, the tests are replicated for 2020-12 because the `$schema` is different and implementations may (but shouldn't) produce different output.*
-
-## Organization
-
-The tests are organized by specification release and then into two categories: content and structure.
-
-Content tests verify that the keywords are producing the correct annotations and/or error messages.  Since there are no requirements on the content of error messages, there's not much that can be verified for them, but it is possible to identify when a error message _could_ be present.  Primarily, these tests need to extensively cover the annotation behaviors of each keyword.  The only output format needed for these tests is `basic` for 2019-09/2020/12 and `list` for later versions.
-
-Structure tests verify that the structures of the various formats (i.e. `flag`, `basic`, `detailed`, `verbose` for 2019/2020 and `flag`, `list`, `hierarchical` for later versions) are correct.  These tests don't need to cover each keyword; rather they need to sufficiently cover the various aspects of building the output structures by using whatever keywords are necessary to do so.
-
-In each release folder, you'll also find an _output-schema.json_ file that contains the schema from the specification repo that describes output for that release.  This schema will need to be loaded as the tests reference it.
-
-## Test Files
-
-The content of a test file is the same as the validation tests in `tests/`, however an `output` property has been added to each test case.
-
-The `output` property itself has a property for each of the output formats where the value is a schema that will successfully validate for compliant output.  For the content tests, only `basic`/`list` needs to be present.
-
-## Other notes
-
-### Ambiguity around 2020-09/2020-12 `basic`
-
-The 2019-09/2020-12 specs don't define the structure of `basic` very thoroughly.  Specifically there is a nuance where if the list contains a single output node, there are two possible structures, given the text:
-
-- the output node for the root schema appears in the list with a containing node that just has a `valid` property
-    ```json
-    {
-        "valid": false,
-        "errors": [
-            {
-                "valid": false,
-                "keywordLocation": "",
-                "absoluteKeywordLocation": "https://json-schema.org/tests/content/draft2019-09/general/0",
-                "instanceLocation": ""
-            }
-        ]
-    }
-    ```
-- the entire structure is collapsed to just the root output node as `detailed` would do.
-    ```json
-    {
-        "valid": false,
-        "keywordLocation": "",
-        "absoluteKeywordLocation": "https://json-schema.org/tests/content/draft2019-09/general/0",
-        "instanceLocation": ""
-    }
-    ```
-As the Test Suite should not prefer one interpretation over another, these cases need to be tested another way.
-
-A simple solution (though there are likely others) is to force a second output unit by adding an `"anyOf": [ true ]`.  This has no impact on the validation result while adding superfluous structure to the output that avoids the above ambiguous scenario.  The test schema should still be targeted on what's being tested and ignore any output units generated by this extra keyword.
-
-## Contributing
-
-Of course, first and foremost, follow the [Contributing guide](/CONTRIBUTING.md).
-
-When writing test cases, try to keep output validation schemas targeted to verify a single requirement.  Where possible (and where it makes sense), create multiple tests to cover multiple requirements.  This will help keep the output validation schemas small and increase readability.  (It also increases your test count. 😉)
-
-For the content tests, there is also a _general.json_ file that contains tests that do not necessarily pertain to any single keyword.
-<!-- This general.json file may be added to the structure tests later, but I haven't gotten to them yet, so I don't know. -->
diff --git a/json/output-tests/draft-next/content/general.json b/json/output-tests/draft-next/content/general.json
deleted file mode 100644
index 27082ed..0000000
--- a/json/output-tests/draft-next/content/general.json
+++ /dev/null
@@ -1,43 +0,0 @@
-[
-    {
-        "description": "failed validation produces no annotations",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "$id": "https://json-schema.org/tests/content/draft-next/general/0",
-            "type": "string",
-            "readOnly": true
-        },
-        "tests": [
-            {
-                "description": "dropped annotations MAY appear in droppedAnnotations",
-                "data": 1,
-                "output": {
-                    "list": {
-                        "$id": "https://json-schema.org/tests/content/draft-next/general/0/tests/0/basic",
-                        "$ref": "/draft/next/output/schema",
-                        "properties": {
-                            "details": {
-                                "contains": {
-                                    "properties": {
-                                        "evaluationPath": {"const": ""},
-                                        "schemaLocation": {"const": "https://json-schema.org/tests/content/draft-next/general/0"},
-                                        "instanceLocation": {"const": ""},
-                                        "annotations": false,
-                                        "droppedAnnotations": {
-                                            "properties": {
-                                                "readOnly": {"const": true}
-                                            },
-                                            "required": ["readOnly"]
-                                        }
-                                    },
-                                    "required": ["evaluationPath", "schemaLocation", "instanceLocation"]
-                                }
-                            }
-                        },
-                        "required": ["details"]
-                    }
-                }
-            }
-        ]
-    }
-]
diff --git a/json/output-tests/draft-next/content/readOnly.json b/json/output-tests/draft-next/content/readOnly.json
deleted file mode 100644
index d387d93..0000000
--- a/json/output-tests/draft-next/content/readOnly.json
+++ /dev/null
@@ -1,41 +0,0 @@
-[
-    {
-        "description": "readOnly generates its value as an annotation",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "$id": "https://json-schema.org/tests/content/draft-next/readOnly/0",
-            "readOnly": true
-        },
-        "tests": [
-            {
-                "description": "readOnly is true",
-                "data": 1,
-                "output": {
-                    "list": {
-                        "$id": "https://json-schema.org/tests/content/draft-next/readOnly/0/tests/0/basic",
-                        "$ref": "/draft/next/output/schema",
-                        "properties": {
-                            "details": {
-                                "contains": {
-                                    "properties": {
-                                        "evaluationPath": {"const": ""},
-                                        "schemaLocation": {"const": "https://json-schema.org/tests/content/draft-next/readOnly/0"},
-                                        "instanceLocation": {"const": ""},
-                                        "annotations": {
-                                            "properties": {
-                                                "readOnly": {"const": true}
-                                            },
-                                            "required": ["readOnly"]
-                                        }
-                                    },
-                                    "required": ["evaluationPath", "schemaLocation", "instanceLocation", "annotations"]
-                                }
-                            }
-                        },
-                        "required": ["details"]
-                    }
-                }
-            }
-        ]
-    }
-]
diff --git a/json/output-tests/draft-next/content/type.json b/json/output-tests/draft-next/content/type.json
deleted file mode 100644
index e17f1f5..0000000
--- a/json/output-tests/draft-next/content/type.json
+++ /dev/null
@@ -1,39 +0,0 @@
-[
-    {
-        "description": "incorrect type",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "$id": "https://json-schema.org/tests/content/draft-next/type/0",
-            "type": "string"
-        },
-        "tests": [
-            {
-                "description": "incorrect type must be reported, but a message is not required",
-                "data": 1,
-                "output": {
-                    "list": {
-                        "$id": "https://json-schema.org/tests/content/draft-next/type/0/tests/0/basic",
-                        "$ref": "/draft/next/output/schema",
-                        "properties": {
-                            "details": {
-                                "contains": {
-                                    "properties": {
-                                        "evaluationPath": {"const": ""},
-                                        "schemaLocation": {"const": "https://json-schema.org/tests/content/draft-next/type/0"},
-                                        "instanceLocation": {"const": ""},
-                                        "annotations": false,
-                                        "errors": {
-                                            "required": ["type"]
-                                        }
-                                    },
-                                    "required": ["evaluationPath", "schemaLocation", "instanceLocation"]
-                                }
-                            }
-                        },
-                        "required": ["details"]
-                    }
-                }
-            }
-        ]
-    }
-]
diff --git a/json/output-tests/draft-next/output-schema.json b/json/output-tests/draft-next/output-schema.json
deleted file mode 100644
index 26286fa..0000000
--- a/json/output-tests/draft-next/output-schema.json
+++ /dev/null
@@ -1,95 +0,0 @@
-{
-  "$schema": "https://json-schema.org/draft/next/schema",
-  "$id": "https://json-schema.org/draft/next/output/schema",
-  "description": "A schema that validates the minimum requirements for validation output",
-
-  "anyOf": [
-    { "$ref": "#/$defs/flag" },
-    { "$ref": "#/$defs/basic" },
-    { "$ref": "#/$defs/hierarchical" }
-  ],
-  "$defs": {
-    "outputUnit":{
-      "properties": {
-        "valid": { "type": "boolean" },
-        "evaluationPath": {
-          "type": "string",
-          "format": "json-pointer"
-        },
-        "schemaLocation": {
-          "type": "string",
-          "format": "uri"
-        },
-        "instanceLocation": {
-          "type": "string",
-          "format": "json-pointer"
-        },
-        "details": {
-          "$ref": "#/$defs/outputUnitArray"
-        },
-        "annotations": {
-          "type": "object",
-          "additionalProperties": true
-        },
-        "droppedAnnotations": {
-          "type": "object",
-          "additionalProperties": true
-        },
-        "errors": {
-          "type": "object",
-          "additionalProperties": { "type": "string" }
-        }
-      },
-      "required": [ "valid", "evaluationPath", "schemaLocation", "instanceLocation" ],
-      "allOf": [
-        {
-          "if": {
-            "anyOf": [
-              {
-                "required": [ "errors" ]
-              },
-              {
-                "required": [ "droppedAnnotations" ]
-              }
-            ]
-          },
-          "then": {
-            "properties": {
-              "valid": { "const": false }
-            }
-          }
-        },
-        {
-          "if": {
-            "required": [ "annotations" ]
-          },
-          "then": {
-            "properties": {
-              "valid": { "const": true }
-            }
-          }
-        }
-      ]
-    },
-    "outputUnitArray": {
-      "type": "array",
-      "items": { "$ref": "#/$defs/outputUnit" }
-    },
-    "flag": {
-      "properties": {
-        "valid": { "type": "boolean" }
-      },
-      "required": [ "valid" ]
-    },
-    "basic": {
-      "properties": {
-        "valid": { "type": "boolean" },
-        "details": {
-          "$ref": "#/$defs/outputUnitArray"
-        }
-      },
-      "required": [ "valid", "details" ]
-    },
-    "hierarchical": { "$ref": "#/$defs/outputUnit" }
-  }
-}
diff --git a/json/output-tests/draft2019-09/content/general.json b/json/output-tests/draft2019-09/content/general.json
deleted file mode 100644
index 9194170..0000000
--- a/json/output-tests/draft2019-09/content/general.json
+++ /dev/null
@@ -1,34 +0,0 @@
-[
-    {
-        "description": "failed validation produces no annotations",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "$id": "https://json-schema.org/tests/content/draft2019-09/general/0",
-            "type": "string",
-            "readOnly": true
-        },
-        "tests": [
-            {
-                "description": "readOnly annotation is dropped",
-                "data": 1,
-                "output": {
-                    "basic": {
-                        "$id": "https://json-schema.org/tests/content/draft2019-09/general/0/tests/0/basic",
-                        "$ref": "/draft/2019-09/output/schema",
-                        "properties": {
-                            "errors": {
-                                "items": {
-                                    "properties": {
-                                        "annotation": false
-                                    }
-                                }
-                            },
-                            "annotations": false
-                        },
-                        "required": ["errors"]
-                    }
-                }
-            }
-        ]
-    }
-]
diff --git a/json/output-tests/draft2019-09/content/readOnly.json b/json/output-tests/draft2019-09/content/readOnly.json
deleted file mode 100644
index 62db1a8..0000000
--- a/json/output-tests/draft2019-09/content/readOnly.json
+++ /dev/null
@@ -1,38 +0,0 @@
-[
-    {
-        "description": "readOnly generates its value as an annotation",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "$id": "https://json-schema.org/tests/content/draft2019-09/readOnly/0",
-            "readOnly": true
-        },
-        "tests": [
-            {
-                "description": "readOnly is true",
-                "data": 1,
-                "output": {
-                    "basic": {
-                        "$id": "https://json-schema.org/tests/content/draft2019-09/readOnly/0/tests/0/basic",
-                        "$ref": "/draft/2019-09/output/schema",
-                        "properties": {
-                            "annotations": {
-                                "contains": {
-                                    "type": "object",
-                                    "properties": {
-                                        "keywordLocation": {"const": "/readOnly"},
-                                        "absoluteKeywordLocation": {"const": "https://json-schema.org/tests/content/draft2019-09/readOnly/0#/readOnly"},
-                                        "instanceLocation": {"const": ""},
-                                        "annotation": {"const": true}
-                                    },
-                                    "required": ["keywordLocation", "instanceLocation", "annotation"]
-                                }
-                            },
-                            "errors": false
-                        },
-                        "required": ["annotations"]
-                    }
-                }
-            }
-        ]
-    }
-]
diff --git a/json/output-tests/draft2019-09/content/type.json b/json/output-tests/draft2019-09/content/type.json
deleted file mode 100644
index cff77a7..0000000
--- a/json/output-tests/draft2019-09/content/type.json
+++ /dev/null
@@ -1,63 +0,0 @@
-[
-    {
-        "description": "validating type",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "$id": "https://json-schema.org/tests/content/draft2019-09/type/0",
-            "type": "string",
-            "anyOf": [ true ]
-        },
-        "tests": [
-            {
-                "description": "incorrect type must be reported, but a message is not required",
-                "data": 1,
-                "output": {
-                    "basic": {
-                        "$id": "https://json-schema.org/tests/content/draft2019-09/type/0/tests/0/basic",
-                        "$ref": "/draft/2019-09/output/schema",
-                        "properties": {
-                            "errors": {
-                                "contains": {
-                                    "properties": {
-                                        "keywordLocation": {"const": "/type"},
-                                        "absoluteKeywordLocation": {"const": "https://json-schema.org/tests/content/draft2019-09/type/0#/type"},
-                                        "instanceLocation": {"const": ""},
-                                        "annotation": false
-                                    },
-                                    "required": ["keywordLocation", "instanceLocation"]
-                                }
-                            }
-                        },
-                        "required": ["errors"]
-                    }
-                }
-            },
-            {
-                "description": "correct type yields an output unit",
-                "data": "a string",
-                "output": {
-                    "basic": {
-                        "$id": "https://json-schema.org/tests/content/draft2019-09/type/0/tests/1/basic",
-                        "$ref": "/draft/2019-09/output/schema",
-                        "properties": {
-                            "annotations": {
-                                "contains": {
-                                    "properties": {
-                                        "valid": {"const": true},
-                                        "keywordLocation": {"const": "/type"},
-                                        "absoluteKeywordLocation": {"const": "https://json-schema.org/tests/content/draft2019-09/type/0#/type"},
-                                        "instanceLocation": {"const": ""},
-                                        "annotation": false,
-                                        "error": false
-                                    },
-                                    "required": ["keywordLocation", "instanceLocation"]
-                                }
-                            }
-                        },
-                        "required": ["annotations"]
-                    }
-                }
-            }
-        ]
-    }
-]
diff --git a/json/output-tests/draft2019-09/output-schema.json b/json/output-tests/draft2019-09/output-schema.json
deleted file mode 100644
index 0a65f20..0000000
--- a/json/output-tests/draft2019-09/output-schema.json
+++ /dev/null
@@ -1,96 +0,0 @@
-{
-  "$schema": "https://json-schema.org/draft/2019-09/schema",
-  "$id": "https://json-schema.org/draft/2019-09/output/schema",
-  "description": "A schema that validates the minimum requirements for validation output",
-
-  "anyOf": [
-    { "$ref": "#/$defs/flag" },
-    { "$ref": "#/$defs/basic" },
-    { "$ref": "#/$defs/detailed" },
-    { "$ref": "#/$defs/verbose" }
-  ],
-  "$defs": {
-    "outputUnit":{
-      "properties": {
-        "valid": { "type": "boolean" },
-        "keywordLocation": {
-          "type": "string",
-          "format": "json-pointer"
-        },
-        "absoluteKeywordLocation": {
-          "type": "string",
-          "format": "uri"
-        },
-        "instanceLocation": {
-          "type": "string",
-          "format": "json-pointer"
-        },
-        "error": {
-          "type": "string"
-        },
-        "errors": {
-          "$ref": "#/$defs/outputUnitArray"
-        },
-        "annotations": {
-          "$ref": "#/$defs/outputUnitArray"
-        }
-      },
-      "required": [ "valid", "keywordLocation", "instanceLocation" ],
-      "allOf": [
-        {
-          "if": {
-            "properties": {
-              "valid": { "const": false }
-            }
-          },
-          "then": {
-            "anyOf": [
-              {
-                "required": [ "error" ]
-              },
-              {
-                "required": [ "errors" ]
-              }
-            ]
-          }
-        },
-        {
-          "if": {
-            "anyOf": [
-              {
-                "properties": {
-                  "keywordLocation": {
-                    "pattern": "/\\$ref/"
-                  }
-                }
-              },
-              {
-                "properties": {
-                  "keywordLocation": {
-                    "pattern": "/\\$dynamicRef/"
-                  }
-                }
-              }
-            ]
-          },
-          "then": {
-            "required": [ "absoluteKeywordLocation" ]
-          }
-        }
-      ]
-    },
-    "outputUnitArray": {
-      "type": "array",
-      "items": { "$ref": "#/$defs/outputUnit" }
-    },
-    "flag": {
-      "properties": {
-        "valid": { "type": "boolean" }
-      },
-      "required": [ "valid" ]
-    },
-    "basic": { "$ref": "#/$defs/outputUnit" },
-    "detailed": { "$ref": "#/$defs/outputUnit" },
-    "verbose": { "$ref": "#/$defs/outputUnit" }
-  }
-}
diff --git a/json/output-tests/draft2020-12/content/general.json b/json/output-tests/draft2020-12/content/general.json
deleted file mode 100644
index 1f2b370..0000000
--- a/json/output-tests/draft2020-12/content/general.json
+++ /dev/null
@@ -1,34 +0,0 @@
-[
-    {
-        "description": "failed validation produces no annotations",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "$id": "https://json-schema.org/tests/content/draft2020-12/general/0",
-            "type": "string",
-            "readOnly": true
-        },
-        "tests": [
-            {
-                "description": "readOnly annotation is dropped",
-                "data": 1,
-                "output": {
-                    "basic": {
-                        "$id": "https://json-schema.org/tests/content/draft2020-12/general/0/tests/0/basic",
-                        "$ref": "/draft/2020-12/output/schema",
-                        "properties": {
-                            "errors": {
-                                "items": {
-                                    "properties": {
-                                        "annotation": false
-                                    }
-                                }
-                            },
-                            "annotations": false
-                        },
-                        "required": ["errors"]
-                    }
-                }
-            }
-        ]
-    }
-]
diff --git a/json/output-tests/draft2020-12/content/readOnly.json b/json/output-tests/draft2020-12/content/readOnly.json
deleted file mode 100644
index 9baf48d..0000000
--- a/json/output-tests/draft2020-12/content/readOnly.json
+++ /dev/null
@@ -1,37 +0,0 @@
-[
-    {
-        "description": "readOnly generates its value as an annotation",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "$id": "https://json-schema.org/tests/content/draft2020-12/readOnly/0",
-            "readOnly": true
-        },
-        "tests": [
-            {
-                "description": "readOnly is true",
-                "data": 1,
-                "output": {
-                    "basic": {
-                        "$id": "https://json-schema.org/tests/content/draft2020-12/readOnly/0/tests/0/basic",
-                        "$ref": "/draft/2020-12/output/schema",
-                        "properties": {
-                            "annotations": {
-                                "contains": {
-                                    "properties": {
-                                        "keywordLocation": {"const": "/readOnly"},
-                                        "absoluteKeywordLocation": {"const": "https://json-schema.org/tests/content/draft2020-12/readOnly/0#/readOnly"},
-                                        "instanceLocation": {"const": ""},
-                                        "annotation": {"const": true}
-                                    },
-                                    "required": ["keywordLocation", "instanceLocation", "annotation"]
-                                }
-                            },
-                            "errors": false
-                        },
-                        "required": ["annotations"]
-                    }
-                }
-            }
-        ]
-    }
-]
diff --git a/json/output-tests/draft2020-12/content/type.json b/json/output-tests/draft2020-12/content/type.json
deleted file mode 100644
index 710475b..0000000
--- a/json/output-tests/draft2020-12/content/type.json
+++ /dev/null
@@ -1,63 +0,0 @@
-[
-    {
-        "description": "validating type",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "$id": "https://json-schema.org/tests/content/draft2020-12/type/0",
-            "type": "string",
-            "anyOf": [ true ]
-        },
-        "tests": [
-            {
-                "description": "incorrect type must be reported, but a message is not required",
-                "data": 1,
-                "output": {
-                    "basic": {
-                        "$id": "https://json-schema.org/tests/content/draft2020-12/type/0/tests/0/basic",
-                        "$ref": "/draft/2020-12/output/schema",
-                        "properties": {
-                            "errors": {
-                                "contains": {
-                                    "properties": {
-                                        "keywordLocation": {"const": "/type"},
-                                        "absoluteKeywordLocation": {"const": "https://json-schema.org/tests/content/draft2020-12/type/0#/type"},
-                                        "instanceLocation": {"const": ""},
-                                        "annotation": false
-                                    },
-                                    "required": ["keywordLocation", "instanceLocation"]
-                                }
-                            }
-                        },
-                        "required": ["errors"]
-                    }
-                }
-            },
-            {
-                "description": "correct type yields an output unit",
-                "data": "a string",
-                "output": {
-                    "basic": {
-                        "$id": "https://json-schema.org/tests/content/draft2020-12/type/0/tests/1/basic",
-                        "$ref": "/draft/2020-12/output/schema",
-                        "properties": {
-                            "annotations": {
-                                "contains": {
-                                    "properties": {
-                                        "valid": {"const": true},
-                                        "keywordLocation": {"const": "/type"},
-                                        "absoluteKeywordLocation": {"const": "https://json-schema.org/tests/content/draft2020-12/type/0#/type"},
-                                        "instanceLocation": {"const": ""},
-                                        "annotation": false,
-                                        "error": false
-                                    },
-                                    "required": ["keywordLocation", "instanceLocation"]
-                                }
-                            }
-                        },
-                        "required": ["annotations"]
-                    }
-                }
-            }
-        ]
-    }
-]
diff --git a/json/output-tests/draft2020-12/output-schema.json b/json/output-tests/draft2020-12/output-schema.json
deleted file mode 100644
index 1eef288..0000000
--- a/json/output-tests/draft2020-12/output-schema.json
+++ /dev/null
@@ -1,96 +0,0 @@
-{
-  "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://json-schema.org/draft/2020-12/output/schema",
-  "description": "A schema that validates the minimum requirements for validation output",
-
-  "anyOf": [
-    { "$ref": "#/$defs/flag" },
-    { "$ref": "#/$defs/basic" },
-    { "$ref": "#/$defs/detailed" },
-    { "$ref": "#/$defs/verbose" }
-  ],
-  "$defs": {
-    "outputUnit":{
-      "properties": {
-        "valid": { "type": "boolean" },
-        "keywordLocation": {
-          "type": "string",
-          "format": "json-pointer"
-        },
-        "absoluteKeywordLocation": {
-          "type": "string",
-          "format": "uri"
-        },
-        "instanceLocation": {
-          "type": "string",
-          "format": "json-pointer"
-        },
-        "error": {
-          "type": "string"
-        },
-        "errors": {
-          "$ref": "#/$defs/outputUnitArray"
-        },
-        "annotations": {
-          "$ref": "#/$defs/outputUnitArray"
-        }
-      },
-      "required": [ "valid", "keywordLocation", "instanceLocation" ],
-      "allOf": [
-        {
-          "if": {
-            "properties": {
-              "valid": { "const": false }
-            }
-          },
-          "then": {
-            "anyOf": [
-              {
-                "required": [ "error" ]
-              },
-              {
-                "required": [ "errors" ]
-              }
-            ]
-          }
-        },
-        {
-          "if": {
-            "anyOf": [
-              {
-                "properties": {
-                  "keywordLocation": {
-                    "pattern": "/\\$ref/"
-                  }
-                }
-              },
-              {
-                "properties": {
-                  "keywordLocation": {
-                    "pattern": "/\\$dynamicRef/"
-                  }
-                }
-              }
-            ]
-          },
-          "then": {
-            "required": [ "absoluteKeywordLocation" ]
-          }
-        }
-      ]
-    },
-    "outputUnitArray": {
-      "type": "array",
-      "items": { "$ref": "#/$defs/outputUnit" }
-    },
-    "flag": {
-      "properties": {
-        "valid": { "type": "boolean" }
-      },
-      "required": [ "valid" ]
-    },
-    "basic": { "$ref": "#/$defs/outputUnit" },
-    "detailed": { "$ref": "#/$defs/outputUnit" },
-    "verbose": { "$ref": "#/$defs/outputUnit" }
-  }
-}
diff --git a/json/package.json b/json/package.json
deleted file mode 100644
index 75da9e2..0000000
--- a/json/package.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "name": "json-schema-test-suite",
-  "version": "0.1.0",
-  "description": "A language agnostic test suite for the JSON Schema specifications",
-  "repository": "github:json-schema-org/JSON-Schema-Test-Suite",
-  "keywords": [
-    "json-schema",
-    "tests"
-  ],
-  "author": "http://json-schema.org",
-  "license": "MIT"
-}
diff --git a/json/remotes/baseUriChange/folderInteger.json b/json/remotes/baseUriChange/folderInteger.json
deleted file mode 100644
index 8b50ea3..0000000
--- a/json/remotes/baseUriChange/folderInteger.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "type": "integer"
-}
diff --git a/json/remotes/baseUriChangeFolder/folderInteger.json b/json/remotes/baseUriChangeFolder/folderInteger.json
deleted file mode 100644
index 8b50ea3..0000000
--- a/json/remotes/baseUriChangeFolder/folderInteger.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "type": "integer"
-}
diff --git a/json/remotes/baseUriChangeFolderInSubschema/folderInteger.json b/json/remotes/baseUriChangeFolderInSubschema/folderInteger.json
deleted file mode 100644
index 8b50ea3..0000000
--- a/json/remotes/baseUriChangeFolderInSubschema/folderInteger.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "type": "integer"
-}
diff --git a/json/remotes/different-id-ref-string.json b/json/remotes/different-id-ref-string.json
deleted file mode 100644
index 7f88860..0000000
--- a/json/remotes/different-id-ref-string.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "$id": "http://localhost:1234/real-id-ref-string.json",
-    "$defs": {"bar": {"type": "string"}},
-    "$ref": "#/$defs/bar"
-}
diff --git a/json/remotes/draft-next/baseUriChange/folderInteger.json b/json/remotes/draft-next/baseUriChange/folderInteger.json
deleted file mode 100644
index 388c881..0000000
--- a/json/remotes/draft-next/baseUriChange/folderInteger.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "$schema": "https://json-schema.org/draft/next/schema",
-    "type": "integer"
-}
diff --git a/json/remotes/draft-next/baseUriChangeFolder/folderInteger.json b/json/remotes/draft-next/baseUriChangeFolder/folderInteger.json
deleted file mode 100644
index 388c881..0000000
--- a/json/remotes/draft-next/baseUriChangeFolder/folderInteger.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "$schema": "https://json-schema.org/draft/next/schema",
-    "type": "integer"
-}
diff --git a/json/remotes/draft-next/baseUriChangeFolderInSubschema/folderInteger.json b/json/remotes/draft-next/baseUriChangeFolderInSubschema/folderInteger.json
deleted file mode 100644
index 388c881..0000000
--- a/json/remotes/draft-next/baseUriChangeFolderInSubschema/folderInteger.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "$schema": "https://json-schema.org/draft/next/schema",
-    "type": "integer"
-}
diff --git a/json/remotes/draft-next/extendible-dynamic-ref.json b/json/remotes/draft-next/extendible-dynamic-ref.json
deleted file mode 100644
index e787aa3..0000000
--- a/json/remotes/draft-next/extendible-dynamic-ref.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-    "$schema": "https://json-schema.org/draft/next/schema",
-    "description": "extendible array",
-    "$id": "http://localhost:1234/draft-next/extendible-dynamic-ref.json",
-    "type": "object",
-    "properties": {
-        "elements": {
-            "type": "array",
-            "items": {
-                "$dynamicRef": "#elements"
-            }
-        }
-    },
-    "required": ["elements"],
-    "additionalProperties": false,
-    "$defs": {
-        "elements": {
-            "$dynamicAnchor": "elements"
-        }
-    }
-}
diff --git a/json/remotes/draft-next/format-assertion-false.json b/json/remotes/draft-next/format-assertion-false.json
deleted file mode 100644
index 91c8669..0000000
--- a/json/remotes/draft-next/format-assertion-false.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "$id": "http://localhost:1234/draft-next/format-assertion-false.json",
-    "$schema": "https://json-schema.org/draft/next/schema",
-    "$vocabulary": {
-        "https://json-schema.org/draft/next/vocab/core": true,
-        "https://json-schema.org/draft/next/vocab/format-assertion": false
-    },
-    "allOf": [
-        { "$ref": "https://json-schema.org/draft/next/meta/core" },
-        { "$ref": "https://json-schema.org/draft/next/meta/format-assertion" }
-    ]
-}
diff --git a/json/remotes/draft-next/format-assertion-true.json b/json/remotes/draft-next/format-assertion-true.json
deleted file mode 100644
index a33d143..0000000
--- a/json/remotes/draft-next/format-assertion-true.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "$id": "http://localhost:1234/draft-next/format-assertion-true.json",
-    "$schema": "https://json-schema.org/draft/next/schema",
-    "$vocabulary": {
-        "https://json-schema.org/draft/next/vocab/core": true,
-        "https://json-schema.org/draft/next/vocab/format-assertion": true
-    },
-    "allOf": [
-        { "$ref": "https://json-schema.org/draft/next/meta/core" },
-        { "$ref": "https://json-schema.org/draft/next/meta/format-assertion" }
-    ]
-}
diff --git a/json/remotes/draft-next/integer.json b/json/remotes/draft-next/integer.json
deleted file mode 100644
index 388c881..0000000
--- a/json/remotes/draft-next/integer.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "$schema": "https://json-schema.org/draft/next/schema",
-    "type": "integer"
-}
diff --git a/json/remotes/draft-next/locationIndependentIdentifier.json b/json/remotes/draft-next/locationIndependentIdentifier.json
deleted file mode 100644
index 17b4df5..0000000
--- a/json/remotes/draft-next/locationIndependentIdentifier.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "$schema": "https://json-schema.org/draft/next/schema",
-    "$defs": {
-        "refToInteger": {
-            "$ref": "#foo"
-        },
-        "A": {
-            "$anchor": "foo",
-            "type": "integer"
-        }
-    }
-}
diff --git a/json/remotes/draft-next/metaschema-no-validation.json b/json/remotes/draft-next/metaschema-no-validation.json
deleted file mode 100644
index c19c9e8..0000000
--- a/json/remotes/draft-next/metaschema-no-validation.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "$schema": "https://json-schema.org/draft/next/schema",
-    "$id": "http://localhost:1234/draft-next/metaschema-no-validation.json",
-    "$vocabulary": {
-        "https://json-schema.org/draft/next/vocab/applicator": true,
-        "https://json-schema.org/draft/next/vocab/core": true
-    },
-    "allOf": [
-        { "$ref": "https://json-schema.org/draft/next/meta/applicator" },
-        { "$ref": "https://json-schema.org/draft/next/meta/core" }
-    ]
-}
diff --git a/json/remotes/draft-next/name-defs.json b/json/remotes/draft-next/name-defs.json
deleted file mode 100644
index cdb8c0c..0000000
--- a/json/remotes/draft-next/name-defs.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "$schema": "https://json-schema.org/draft/next/schema",
-    "$defs": {
-        "orNull": {
-            "anyOf": [
-                {
-                    "type": "null"
-                },
-                {
-                    "$ref": "#"
-                }
-            ]
-        }
-    },
-    "type": "string"
-}
diff --git a/json/remotes/draft-next/nested/foo-ref-string.json b/json/remotes/draft-next/nested/foo-ref-string.json
deleted file mode 100644
index 50bf77f..0000000
--- a/json/remotes/draft-next/nested/foo-ref-string.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "$schema": "https://json-schema.org/draft/next/schema",
-    "type": "object",
-    "properties": {
-        "foo": {"$ref": "string.json"}
-    }
-}
diff --git a/json/remotes/draft-next/nested/string.json b/json/remotes/draft-next/nested/string.json
deleted file mode 100644
index 7462207..0000000
--- a/json/remotes/draft-next/nested/string.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "$schema": "https://json-schema.org/draft/next/schema",
-    "type": "string"
-}
diff --git a/json/remotes/draft-next/ref-and-defs.json b/json/remotes/draft-next/ref-and-defs.json
deleted file mode 100644
index 46fafc9..0000000
--- a/json/remotes/draft-next/ref-and-defs.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "$schema": "https://json-schema.org/draft/next/schema",
-    "$id": "http://localhost:1234/draft-next/ref-and-defs.json",
-    "$defs": {
-        "inner": {
-            "properties": {
-                "bar": { "type": "string" }
-            }
-        }
-    },
-    "$ref": "#/$defs/inner"
-}
diff --git a/json/remotes/draft-next/subSchemas-defs.json b/json/remotes/draft-next/subSchemas-defs.json
deleted file mode 100644
index 75b7583..0000000
--- a/json/remotes/draft-next/subSchemas-defs.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-    "$schema": "https://json-schema.org/draft/next/schema",
-    "$defs": {
-        "integer": {
-            "type": "integer"
-        },
-        "refToInteger": {
-            "$ref": "#/$defs/integer"
-        }
-    }
-}
diff --git a/json/remotes/draft-next/subSchemas.json b/json/remotes/draft-next/subSchemas.json
deleted file mode 100644
index 575dd00..0000000
--- a/json/remotes/draft-next/subSchemas.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "$schema": "https://json-schema.org/draft/next/schema",
-    "integer": {
-        "type": "integer"
-    },
-    "refToInteger": {
-        "$ref": "#/integer"
-    }
-}
diff --git a/json/remotes/draft-next/tree.json b/json/remotes/draft-next/tree.json
deleted file mode 100644
index cad332a..0000000
--- a/json/remotes/draft-next/tree.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-    "$schema": "https://json-schema.org/draft/next/schema",
-    "description": "tree schema, extensible",
-    "$id": "http://localhost:1234/draft-next/tree.json",
-    "$dynamicAnchor": "node",
-
-    "type": "object",
-    "properties": {
-        "data": true,
-        "children": {
-            "type": "array",
-            "items": {
-                "$dynamicRef": "#node"
-            }
-        }
-    }
-}
diff --git a/json/remotes/draft2019-09/baseUriChange/folderInteger.json b/json/remotes/draft2019-09/baseUriChange/folderInteger.json
deleted file mode 100644
index bf679e8..0000000
--- a/json/remotes/draft2019-09/baseUriChange/folderInteger.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "$schema": "https://json-schema.org/draft/2019-09/schema",
-    "type": "integer"
-}
diff --git a/json/remotes/draft2019-09/baseUriChangeFolder/folderInteger.json b/json/remotes/draft2019-09/baseUriChangeFolder/folderInteger.json
deleted file mode 100644
index bf679e8..0000000
--- a/json/remotes/draft2019-09/baseUriChangeFolder/folderInteger.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "$schema": "https://json-schema.org/draft/2019-09/schema",
-    "type": "integer"
-}
diff --git a/json/remotes/draft2019-09/baseUriChangeFolderInSubschema/folderInteger.json b/json/remotes/draft2019-09/baseUriChangeFolderInSubschema/folderInteger.json
deleted file mode 100644
index bf679e8..0000000
--- a/json/remotes/draft2019-09/baseUriChangeFolderInSubschema/folderInteger.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "$schema": "https://json-schema.org/draft/2019-09/schema",
-    "type": "integer"
-}
diff --git a/json/remotes/draft2019-09/dependentRequired.json b/json/remotes/draft2019-09/dependentRequired.json
deleted file mode 100644
index 0d691d9..0000000
--- a/json/remotes/draft2019-09/dependentRequired.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "$id": "http://localhost:1234/draft2019-09/dependentRequired.json",
-    "$schema": "https://json-schema.org/draft/2019-09/schema",
-    "dependentRequired": {
-        "foo": ["bar"]
-    }
-}
diff --git a/json/remotes/draft2019-09/extendible-dynamic-ref.json b/json/remotes/draft2019-09/extendible-dynamic-ref.json
deleted file mode 100644
index c11bf0a..0000000
--- a/json/remotes/draft2019-09/extendible-dynamic-ref.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-    "description": "extendible array",
-    "$schema": "https://json-schema.org/draft/2019-09/schema",
-    "$id": "http://localhost:1234/draft2019-09/extendible-dynamic-ref.json",
-    "type": "object",
-    "properties": {
-        "elements": {
-            "type": "array",
-            "items": {
-                "$dynamicRef": "#elements"
-            }
-        }
-    },
-    "required": ["elements"],
-    "additionalProperties": false,
-    "$defs": {
-        "elements": {
-            "$dynamicAnchor": "elements"
-        }
-    }
-}
diff --git a/json/remotes/draft2019-09/ignore-prefixItems.json b/json/remotes/draft2019-09/ignore-prefixItems.json
deleted file mode 100644
index b5ef392..0000000
--- a/json/remotes/draft2019-09/ignore-prefixItems.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "$id": "http://localhost:1234/draft2019-09/ignore-prefixItems.json",
-    "$schema": "https://json-schema.org/draft/2019-09/schema",
-    "prefixItems": [
-        {"type": "string"}
-    ]
-}
diff --git a/json/remotes/draft2019-09/integer.json b/json/remotes/draft2019-09/integer.json
deleted file mode 100644
index bf679e8..0000000
--- a/json/remotes/draft2019-09/integer.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "$schema": "https://json-schema.org/draft/2019-09/schema",
-    "type": "integer"
-}
diff --git a/json/remotes/draft2019-09/locationIndependentIdentifier.json b/json/remotes/draft2019-09/locationIndependentIdentifier.json
deleted file mode 100644
index a0fb9fb..0000000
--- a/json/remotes/draft2019-09/locationIndependentIdentifier.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "$schema": "https://json-schema.org/draft/2019-09/schema",
-    "$defs": {
-        "refToInteger": {
-            "$ref": "#foo"
-        },
-        "A": {
-            "$anchor": "foo",
-            "type": "integer"
-        }
-    }
-}
diff --git a/json/remotes/draft2019-09/metaschema-no-validation.json b/json/remotes/draft2019-09/metaschema-no-validation.json
deleted file mode 100644
index 494f0ab..0000000
--- a/json/remotes/draft2019-09/metaschema-no-validation.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "$schema": "https://json-schema.org/draft/2019-09/schema",
-    "$id": "http://localhost:1234/draft2019-09/metaschema-no-validation.json",
-    "$vocabulary": {
-        "https://json-schema.org/draft/2019-09/vocab/applicator": true,
-        "https://json-schema.org/draft/2019-09/vocab/core": true
-    },
-    "allOf": [
-        { "$ref": "https://json-schema.org/draft/2019-09/meta/applicator" },
-        { "$ref": "https://json-schema.org/draft/2019-09/meta/core" }
-    ]
-}
diff --git a/json/remotes/draft2019-09/name-defs.json b/json/remotes/draft2019-09/name-defs.json
deleted file mode 100644
index 8892f16..0000000
--- a/json/remotes/draft2019-09/name-defs.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "$schema": "https://json-schema.org/draft/2019-09/schema",
-    "$defs": {
-        "orNull": {
-            "anyOf": [
-                {
-                    "type": "null"
-                },
-                {
-                    "$ref": "#"
-                }
-            ]
-        }
-    },
-    "type": "string"
-}
diff --git a/json/remotes/draft2019-09/nested/foo-ref-string.json b/json/remotes/draft2019-09/nested/foo-ref-string.json
deleted file mode 100644
index fe10748..0000000
--- a/json/remotes/draft2019-09/nested/foo-ref-string.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "$schema": "https://json-schema.org/draft/2019-09/schema",
-    "type": "object",
-    "properties": {
-        "foo": {"$ref": "string.json"}
-    }
-}
diff --git a/json/remotes/draft2019-09/nested/string.json b/json/remotes/draft2019-09/nested/string.json
deleted file mode 100644
index 242f713..0000000
--- a/json/remotes/draft2019-09/nested/string.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "$schema": "https://json-schema.org/draft/2019-09/schema",
-    "type": "string"
-}
diff --git a/json/remotes/draft2019-09/ref-and-defs.json b/json/remotes/draft2019-09/ref-and-defs.json
deleted file mode 100644
index 0ad690d..0000000
--- a/json/remotes/draft2019-09/ref-and-defs.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "$schema": "https://json-schema.org/draft/2019-09/schema",
-    "$id": "http://localhost:1234/draft2019-09/ref-and-defs.json",
-    "$defs": {
-        "inner": {
-            "properties": {
-                "bar": { "type": "string" }
-            }
-        }
-    },
-    "$ref": "#/$defs/inner"
-}
diff --git a/json/remotes/draft2019-09/subSchemas-defs.json b/json/remotes/draft2019-09/subSchemas-defs.json
deleted file mode 100644
index fdfee68..0000000
--- a/json/remotes/draft2019-09/subSchemas-defs.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-    "$schema": "https://json-schema.org/draft/2019-09/schema",
-    "$defs": {
-        "integer": {
-            "type": "integer"
-        },
-        "refToInteger": {
-            "$ref": "#/$defs/integer"
-        }
-    }
-}
diff --git a/json/remotes/draft2019-09/subSchemas.json b/json/remotes/draft2019-09/subSchemas.json
deleted file mode 100644
index 6dea225..0000000
--- a/json/remotes/draft2019-09/subSchemas.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "$schema": "https://json-schema.org/draft/2019-09/schema",
-    "integer": {
-        "type": "integer"
-    },
-    "refToInteger": {
-        "$ref": "#/integer"
-    }
-}
diff --git a/json/remotes/draft2019-09/tree.json b/json/remotes/draft2019-09/tree.json
deleted file mode 100644
index fce7941..0000000
--- a/json/remotes/draft2019-09/tree.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-    "description": "tree schema, extensible",
-    "$schema": "https://json-schema.org/draft/2019-09/schema",
-    "$id": "http://localhost:1234/draft2019-09/tree.json",
-    "$dynamicAnchor": "node",
-
-    "type": "object",
-    "properties": {
-        "data": true,
-        "children": {
-            "type": "array",
-            "items": {
-                "$dynamicRef": "#node"
-            }
-        }
-    }
-}
diff --git a/json/remotes/draft2020-12/baseUriChange/folderInteger.json b/json/remotes/draft2020-12/baseUriChange/folderInteger.json
deleted file mode 100644
index 1f44a63..0000000
--- a/json/remotes/draft2020-12/baseUriChange/folderInteger.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "$schema": "https://json-schema.org/draft/2020-12/schema",
-    "type": "integer"
-}
diff --git a/json/remotes/draft2020-12/baseUriChangeFolder/folderInteger.json b/json/remotes/draft2020-12/baseUriChangeFolder/folderInteger.json
deleted file mode 100644
index 1f44a63..0000000
--- a/json/remotes/draft2020-12/baseUriChangeFolder/folderInteger.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "$schema": "https://json-schema.org/draft/2020-12/schema",
-    "type": "integer"
-}
diff --git a/json/remotes/draft2020-12/baseUriChangeFolderInSubschema/folderInteger.json b/json/remotes/draft2020-12/baseUriChangeFolderInSubschema/folderInteger.json
deleted file mode 100644
index 1f44a63..0000000
--- a/json/remotes/draft2020-12/baseUriChangeFolderInSubschema/folderInteger.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "$schema": "https://json-schema.org/draft/2020-12/schema",
-    "type": "integer"
-}
diff --git a/json/remotes/draft2020-12/extendible-dynamic-ref.json b/json/remotes/draft2020-12/extendible-dynamic-ref.json
deleted file mode 100644
index 65bc0c2..0000000
--- a/json/remotes/draft2020-12/extendible-dynamic-ref.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-    "description": "extendible array",
-    "$schema": "https://json-schema.org/draft/2020-12/schema",
-    "$id": "http://localhost:1234/draft2020-12/extendible-dynamic-ref.json",
-    "type": "object",
-    "properties": {
-        "elements": {
-            "type": "array",
-            "items": {
-                "$dynamicRef": "#elements"
-            }
-        }
-    },
-    "required": ["elements"],
-    "additionalProperties": false,
-    "$defs": {
-        "elements": {
-            "$dynamicAnchor": "elements"
-        }
-    }
-}
diff --git a/json/remotes/draft2020-12/format-assertion-false.json b/json/remotes/draft2020-12/format-assertion-false.json
deleted file mode 100644
index d6dd645..0000000
--- a/json/remotes/draft2020-12/format-assertion-false.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "$id": "http://localhost:1234/draft2020-12/format-assertion-false.json",
-    "$schema": "https://json-schema.org/draft/2020-12/schema",
-    "$vocabulary": {
-        "https://json-schema.org/draft/2020-12/vocab/core": true,
-        "https://json-schema.org/draft/2020-12/vocab/format-assertion": false
-    },
-    "allOf": [
-        { "$ref": "https://json-schema.org/draft/2020-12/meta/core" },
-        { "$ref": "https://json-schema.org/draft/2020-12/meta/format-assertion" }
-    ]
-}
diff --git a/json/remotes/draft2020-12/format-assertion-true.json b/json/remotes/draft2020-12/format-assertion-true.json
deleted file mode 100644
index bb16d58..0000000
--- a/json/remotes/draft2020-12/format-assertion-true.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "$id": "http://localhost:1234/draft2020-12/format-assertion-true.json",
-    "$schema": "https://json-schema.org/draft/2020-12/schema",
-    "$vocabulary": {
-        "https://json-schema.org/draft/2020-12/vocab/core": true,
-        "https://json-schema.org/draft/2020-12/vocab/format-assertion": true
-    },
-    "allOf": [
-        { "$ref": "https://json-schema.org/draft/2020-12/meta/core" },
-        { "$ref": "https://json-schema.org/draft/2020-12/meta/format-assertion" }
-    ]
-}
diff --git a/json/remotes/draft2020-12/integer.json b/json/remotes/draft2020-12/integer.json
deleted file mode 100644
index 1f44a63..0000000
--- a/json/remotes/draft2020-12/integer.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "$schema": "https://json-schema.org/draft/2020-12/schema",
-    "type": "integer"
-}
diff --git a/json/remotes/draft2020-12/locationIndependentIdentifier.json b/json/remotes/draft2020-12/locationIndependentIdentifier.json
deleted file mode 100644
index 6565a1e..0000000
--- a/json/remotes/draft2020-12/locationIndependentIdentifier.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "$schema": "https://json-schema.org/draft/2020-12/schema",
-    "$defs": {
-        "refToInteger": {
-            "$ref": "#foo"
-        },
-        "A": {
-            "$anchor": "foo",
-            "type": "integer"
-        }
-    }
-}
diff --git a/json/remotes/draft2020-12/metaschema-no-validation.json b/json/remotes/draft2020-12/metaschema-no-validation.json
deleted file mode 100644
index 85d74b2..0000000
--- a/json/remotes/draft2020-12/metaschema-no-validation.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "$schema": "https://json-schema.org/draft/2020-12/schema",
-    "$id": "http://localhost:1234/draft2020-12/metaschema-no-validation.json",
-    "$vocabulary": {
-        "https://json-schema.org/draft/2020-12/vocab/applicator": true,
-        "https://json-schema.org/draft/2020-12/vocab/core": true
-    },
-    "allOf": [
-        { "$ref": "https://json-schema.org/draft/2020-12/meta/applicator" },
-        { "$ref": "https://json-schema.org/draft/2020-12/meta/core" }
-    ]
-}
diff --git a/json/remotes/draft2020-12/name-defs.json b/json/remotes/draft2020-12/name-defs.json
deleted file mode 100644
index 67bc33c..0000000
--- a/json/remotes/draft2020-12/name-defs.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "$schema": "https://json-schema.org/draft/2020-12/schema",
-    "$defs": {
-        "orNull": {
-            "anyOf": [
-                {
-                    "type": "null"
-                },
-                {
-                    "$ref": "#"
-                }
-            ]
-        }
-    },
-    "type": "string"
-}
diff --git a/json/remotes/draft2020-12/nested/foo-ref-string.json b/json/remotes/draft2020-12/nested/foo-ref-string.json
deleted file mode 100644
index 29661ff..0000000
--- a/json/remotes/draft2020-12/nested/foo-ref-string.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "$schema": "https://json-schema.org/draft/2020-12/schema",
-    "type": "object",
-    "properties": {
-        "foo": {"$ref": "string.json"}
-    }
-}
diff --git a/json/remotes/draft2020-12/nested/string.json b/json/remotes/draft2020-12/nested/string.json
deleted file mode 100644
index 6607ac5..0000000
--- a/json/remotes/draft2020-12/nested/string.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "$schema": "https://json-schema.org/draft/2020-12/schema",
-    "type": "string"
-}
diff --git a/json/remotes/draft2020-12/prefixItems.json b/json/remotes/draft2020-12/prefixItems.json
deleted file mode 100644
index acd8293..0000000
--- a/json/remotes/draft2020-12/prefixItems.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "$id": "http://localhost:1234/draft2020-12/prefixItems.json",
-    "$schema": "https://json-schema.org/draft/2020-12/schema",
-    "prefixItems": [
-        {"type": "string"}
-    ]
-}
diff --git a/json/remotes/draft2020-12/ref-and-defs.json b/json/remotes/draft2020-12/ref-and-defs.json
deleted file mode 100644
index 16d30fa..0000000
--- a/json/remotes/draft2020-12/ref-and-defs.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "$schema": "https://json-schema.org/draft/2020-12/schema",
-    "$id": "http://localhost:1234/draft2020-12/ref-and-defs.json",
-    "$defs": {
-        "inner": {
-            "properties": {
-                "bar": { "type": "string" }
-            }
-        }
-    },
-    "$ref": "#/$defs/inner"
-}
diff --git a/json/remotes/draft2020-12/subSchemas-defs.json b/json/remotes/draft2020-12/subSchemas-defs.json
deleted file mode 100644
index 1bb4846..0000000
--- a/json/remotes/draft2020-12/subSchemas-defs.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-    "$schema": "https://json-schema.org/draft/2020-12/schema",
-    "$defs": {
-        "integer": {
-            "type": "integer"
-        },
-        "refToInteger": {
-            "$ref": "#/$defs/integer"
-        }
-    }
-}
diff --git a/json/remotes/draft2020-12/subSchemas.json b/json/remotes/draft2020-12/subSchemas.json
deleted file mode 100644
index 5fca21d..0000000
--- a/json/remotes/draft2020-12/subSchemas.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "$schema": "https://json-schema.org/draft/2020-12/schema",
-    "integer": {
-        "type": "integer"
-    },
-    "refToInteger": {
-        "$ref": "#/integer"
-    }
-}
diff --git a/json/remotes/draft2020-12/tree.json b/json/remotes/draft2020-12/tree.json
deleted file mode 100644
index b07555f..0000000
--- a/json/remotes/draft2020-12/tree.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-    "description": "tree schema, extensible",
-    "$schema": "https://json-schema.org/draft/2020-12/schema",
-    "$id": "http://localhost:1234/draft2020-12/tree.json",
-    "$dynamicAnchor": "node",
-
-    "type": "object",
-    "properties": {
-        "data": true,
-        "children": {
-            "type": "array",
-            "items": {
-                "$dynamicRef": "#node"
-            }
-        }
-    }
-}
diff --git a/json/remotes/draft7/ignore-dependentRequired.json b/json/remotes/draft7/ignore-dependentRequired.json
deleted file mode 100644
index 0ea927b..0000000
--- a/json/remotes/draft7/ignore-dependentRequired.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "$id": "http://localhost:1234/draft7/integer.json",
-    "$schema": "http://json-schema.org/draft-07/schema#",
-    "dependentRequired": {
-        "foo": ["bar"]
-    }
-}
\ No newline at end of file
diff --git a/json/remotes/extendible-dynamic-ref.json b/json/remotes/extendible-dynamic-ref.json
deleted file mode 100644
index d0bcd37..0000000
--- a/json/remotes/extendible-dynamic-ref.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-    "description": "extendible array",
-    "$id": "http://localhost:1234/extendible-dynamic-ref.json",
-    "type": "object",
-    "properties": {
-        "elements": {
-            "type": "array",
-            "items": {
-                "$dynamicRef": "#elements"
-            }
-        }
-    },
-    "required": ["elements"],
-    "additionalProperties": false,
-    "$defs": {
-        "elements": {
-            "$dynamicAnchor": "elements"
-        }
-    }
-}
diff --git a/json/remotes/integer.json b/json/remotes/integer.json
deleted file mode 100644
index 8b50ea3..0000000
--- a/json/remotes/integer.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "type": "integer"
-}
diff --git a/json/remotes/locationIndependentIdentifier.json b/json/remotes/locationIndependentIdentifier.json
deleted file mode 100644
index 96b17c3..0000000
--- a/json/remotes/locationIndependentIdentifier.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-    "$defs": {
-        "refToInteger": {
-            "$ref": "#foo"
-        },
-        "A": {
-            "$anchor": "foo",
-            "type": "integer"
-        }
-    }
-}
diff --git a/json/remotes/locationIndependentIdentifierDraft4.json b/json/remotes/locationIndependentIdentifierDraft4.json
deleted file mode 100644
index eeff1eb..0000000
--- a/json/remotes/locationIndependentIdentifierDraft4.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-    "definitions": {
-        "refToInteger": {
-            "$ref": "#foo"
-        },
-        "A": {
-            "id": "#foo",
-            "type": "integer"
-        }
-    }
-}
diff --git a/json/remotes/locationIndependentIdentifierPre2019.json b/json/remotes/locationIndependentIdentifierPre2019.json
deleted file mode 100644
index e72815c..0000000
--- a/json/remotes/locationIndependentIdentifierPre2019.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-    "definitions": {
-        "refToInteger": {
-            "$ref": "#foo"
-        },
-        "A": {
-            "$id": "#foo",
-            "type": "integer"
-        }
-    }
-}
diff --git a/json/remotes/name-defs.json b/json/remotes/name-defs.json
deleted file mode 100644
index 1dab4a4..0000000
--- a/json/remotes/name-defs.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-    "$defs": {
-        "orNull": {
-            "anyOf": [
-                {
-                    "type": "null"
-                },
-                {
-                    "$ref": "#"
-                }
-            ]
-        }
-    },
-    "type": "string"
-}
diff --git a/json/remotes/name.json b/json/remotes/name.json
deleted file mode 100644
index fceacb8..0000000
--- a/json/remotes/name.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-    "definitions": {
-        "orNull": {
-            "anyOf": [
-                {
-                    "type": "null"
-                },
-                {
-                    "$ref": "#"
-                }
-            ]
-        }
-    },
-    "type": "string"
-}
diff --git a/json/remotes/nested-absolute-ref-to-string.json b/json/remotes/nested-absolute-ref-to-string.json
deleted file mode 100644
index f46c761..0000000
--- a/json/remotes/nested-absolute-ref-to-string.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "$defs": {
-        "bar": {
-            "$id": "http://localhost:1234/the-nested-id.json",
-            "type": "string"
-        }
-    },
-    "$ref": "http://localhost:1234/the-nested-id.json"
-}
diff --git a/json/remotes/nested/foo-ref-string.json b/json/remotes/nested/foo-ref-string.json
deleted file mode 100644
index 9cd2527..0000000
--- a/json/remotes/nested/foo-ref-string.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "type": "object",
-    "properties": {
-        "foo": {"$ref": "string.json"}
-    }
-}
diff --git a/json/remotes/nested/string.json b/json/remotes/nested/string.json
deleted file mode 100644
index c2d48c0..0000000
--- a/json/remotes/nested/string.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "type": "string"
-}
diff --git a/json/remotes/ref-and-definitions.json b/json/remotes/ref-and-definitions.json
deleted file mode 100644
index e0ee802..0000000
--- a/json/remotes/ref-and-definitions.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-    "$id": "http://localhost:1234/ref-and-definitions.json",
-    "definitions": {
-        "inner": {
-            "properties": {
-                "bar": { "type": "string" }
-            }
-        }
-    },
-    "allOf": [ { "$ref": "#/definitions/inner" } ]
-}
diff --git a/json/remotes/ref-and-defs.json b/json/remotes/ref-and-defs.json
deleted file mode 100644
index 85d06c3..0000000
--- a/json/remotes/ref-and-defs.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-    "$id": "http://localhost:1234/ref-and-defs.json",
-    "$defs": {
-        "inner": {
-            "properties": {
-                "bar": { "type": "string" }
-            }
-        }
-    },
-    "$ref": "#/$defs/inner"
-}
diff --git a/json/remotes/subSchemas-defs.json b/json/remotes/subSchemas-defs.json
deleted file mode 100644
index 50b7b6d..0000000
--- a/json/remotes/subSchemas-defs.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    "$defs": {
-        "integer": {
-            "type": "integer"
-        },
-        "refToInteger": {
-            "$ref": "#/$defs/integer"
-        }
-    }
-}
diff --git a/json/remotes/subSchemas.json b/json/remotes/subSchemas.json
deleted file mode 100644
index 9f8030b..0000000
--- a/json/remotes/subSchemas.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "integer": {
-        "type": "integer"
-    },
-    "refToInteger": {
-        "$ref": "#/integer"
-    }
-}
diff --git a/json/remotes/tree.json b/json/remotes/tree.json
deleted file mode 100644
index a12d98b..0000000
--- a/json/remotes/tree.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "description": "tree schema, extensible",
-    "$id": "http://localhost:1234/tree.json",
-    "$dynamicAnchor": "node",
-
-    "type": "object",
-    "properties": {
-        "data": true,
-        "children": {
-            "type": "array",
-            "items": {
-                "$dynamicRef": "#node"
-            }
-        }
-    }
-}
diff --git a/json/remotes/urn-ref-string.json b/json/remotes/urn-ref-string.json
deleted file mode 100644
index aca2211..0000000
--- a/json/remotes/urn-ref-string.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "$id": "urn:uuid:feebdaed-ffff-0000-ffff-0000deadbeef",
-    "$defs": {"bar": {"type": "string"}},
-    "$ref": "#/$defs/bar"
-}
diff --git a/json/test-schema.json b/json/test-schema.json
deleted file mode 100644
index 8339316..0000000
--- a/json/test-schema.json
+++ /dev/null
@@ -1,61 +0,0 @@
-{
-    "$schema": "https://json-schema.org/draft/2020-12/schema",
-    "$id": "https://json-schema.org/tests/test-schema",
-    "description": "A schema for files contained within this suite",
-
-    "type": "array",
-    "minItems": 1,
-    "items": {
-        "description": "An individual test case, containing multiple tests of a single schema's behavior",
-
-        "type": "object",
-        "required": [ "description", "schema", "tests" ],
-        "properties": {
-            "description": {
-                "description": "The test case description",
-                "type": "string"
-            },
-            "comment": {
-                "description": "Any additional comments about the test case",
-                "type": "string"
-            },
-            "schema": {
-                "description": "A valid JSON Schema (one written for the corresponding version directory that the file sits within)."
-            },
-            "tests": {
-                "description": "A set of related tests all using the same schema",
-                "type": "array",
-                "items": { "$ref": "#/$defs/test" },
-                "minItems": 1
-            }
-        },
-        "additionalProperties": false
-    },
-
-    "$defs": {
-        "test": {
-            "description": "A single test",
-
-            "type": "object",
-            "required": [ "description", "data", "valid" ],
-            "properties": {
-                "description": {
-                    "description": "The test description, briefly explaining which behavior it exercises",
-                    "type": "string"
-                },
-                "comment": {
-                    "description": "Any additional comments about the test",
-                    "type": "string"
-                },
-                "data": {
-                    "description": "The instance which should be validated against the schema in \"schema\"."
-                },
-                "valid": {
-                    "description": "Whether the validation process of this instance should consider the instance valid or not",
-                    "type": "boolean"
-                }
-            },
-            "additionalProperties": false
-        }
-    }
-}
diff --git a/json/tests/draft-next/additionalProperties.json b/json/tests/draft-next/additionalProperties.json
deleted file mode 100644
index 7859fbb..0000000
--- a/json/tests/draft-next/additionalProperties.json
+++ /dev/null
@@ -1,156 +0,0 @@
-[
-    {
-        "description":
-            "additionalProperties being false does not allow other properties",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "properties": {"foo": {}, "bar": {}},
-            "patternProperties": { "^v": {} },
-            "additionalProperties": false
-        },
-        "tests": [
-            {
-                "description": "no additional properties is valid",
-                "data": {"foo": 1},
-                "valid": true
-            },
-            {
-                "description": "an additional property is invalid",
-                "data": {"foo" : 1, "bar" : 2, "quux" : "boom"},
-                "valid": false
-            },
-            {
-                "description": "ignores arrays",
-                "data": [1, 2, 3],
-                "valid": true
-            },
-            {
-                "description": "ignores strings",
-                "data": "foobarbaz",
-                "valid": true
-            },
-            {
-                "description": "ignores other non-objects",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "patternProperties are not additional properties",
-                "data": {"foo":1, "vroom": 2},
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "non-ASCII pattern with additionalProperties",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "patternProperties": {"^á": {}},
-            "additionalProperties": false
-        },
-        "tests": [
-            {
-                "description": "matching the pattern is valid",
-                "data": {"ármányos": 2},
-                "valid": true
-            },
-            {
-                "description": "not matching the pattern is invalid",
-                "data": {"élmény": 2},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "additionalProperties with schema",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "properties": {"foo": {}, "bar": {}},
-            "additionalProperties": {"type": "boolean"}
-        },
-        "tests": [
-            {
-                "description": "no additional properties is valid",
-                "data": {"foo": 1},
-                "valid": true
-            },
-            {
-                "description": "an additional valid property is valid",
-                "data": {"foo" : 1, "bar" : 2, "quux" : true},
-                "valid": true
-            },
-            {
-                "description": "an additional invalid property is invalid",
-                "data": {"foo" : 1, "bar" : 2, "quux" : 12},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description":
-            "additionalProperties can exist by itself",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "additionalProperties": {"type": "boolean"}
-        },
-        "tests": [
-            {
-                "description": "an additional valid property is valid",
-                "data": {"foo" : true},
-                "valid": true
-            },
-            {
-                "description": "an additional invalid property is invalid",
-                "data": {"foo" : 1},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "additionalProperties are allowed by default",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "properties": {"foo": {}, "bar": {}}
-        },
-        "tests": [
-            {
-                "description": "additional properties are allowed",
-                "data": {"foo": 1, "bar": 2, "quux": true},
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "additionalProperties does not look in applicators",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "allOf": [
-                {"properties": {"foo": {}}}
-            ],
-            "additionalProperties": {"type": "boolean"}
-        },
-        "tests": [
-            {
-                "description": "properties defined in allOf are not examined",
-                "data": {"foo": 1, "bar": true},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "additionalProperties with null valued instance properties",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "additionalProperties": {
-                "type": "null"
-            }
-        },
-        "tests": [
-            {
-                "description": "allows null values",
-                "data": {"foo": null},
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft-next/allOf.json b/json/tests/draft-next/allOf.json
deleted file mode 100644
index 86745da..0000000
--- a/json/tests/draft-next/allOf.json
+++ /dev/null
@@ -1,312 +0,0 @@
-[
-    {
-        "description": "allOf",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "allOf": [
-                {
-                    "properties": {
-                        "bar": {"type": "integer"}
-                    },
-                    "required": ["bar"]
-                },
-                {
-                    "properties": {
-                        "foo": {"type": "string"}
-                    },
-                    "required": ["foo"]
-                }
-            ]
-        },
-        "tests": [
-            {
-                "description": "allOf",
-                "data": {"foo": "baz", "bar": 2},
-                "valid": true
-            },
-            {
-                "description": "mismatch second",
-                "data": {"foo": "baz"},
-                "valid": false
-            },
-            {
-                "description": "mismatch first",
-                "data": {"bar": 2},
-                "valid": false
-            },
-            {
-                "description": "wrong type",
-                "data": {"foo": "baz", "bar": "quux"},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "allOf with base schema",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "properties": {"bar": {"type": "integer"}},
-            "required": ["bar"],
-            "allOf" : [
-                {
-                    "properties": {
-                        "foo": {"type": "string"}
-                    },
-                    "required": ["foo"]
-                },
-                {
-                    "properties": {
-                        "baz": {"type": "null"}
-                    },
-                    "required": ["baz"]
-                }
-            ]
-        },
-        "tests": [
-            {
-                "description": "valid",
-                "data": {"foo": "quux", "bar": 2, "baz": null},
-                "valid": true
-            },
-            {
-                "description": "mismatch base schema",
-                "data": {"foo": "quux", "baz": null},
-                "valid": false
-            },
-            {
-                "description": "mismatch first allOf",
-                "data": {"bar": 2, "baz": null},
-                "valid": false
-            },
-            {
-                "description": "mismatch second allOf",
-                "data": {"foo": "quux", "bar": 2},
-                "valid": false
-            },
-            {
-                "description": "mismatch both",
-                "data": {"bar": 2},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "allOf simple types",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "allOf": [
-                {"maximum": 30},
-                {"minimum": 20}
-            ]
-        },
-        "tests": [
-            {
-                "description": "valid",
-                "data": 25,
-                "valid": true
-            },
-            {
-                "description": "mismatch one",
-                "data": 35,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "allOf with boolean schemas, all true",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "allOf": [true, true]
-        },
-        "tests": [
-            {
-                "description": "any value is valid",
-                "data": "foo",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "allOf with boolean schemas, some false",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "allOf": [true, false]
-        },
-        "tests": [
-            {
-                "description": "any value is invalid",
-                "data": "foo",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "allOf with boolean schemas, all false",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "allOf": [false, false]
-        },
-        "tests": [
-            {
-                "description": "any value is invalid",
-                "data": "foo",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "allOf with one empty schema",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "allOf": [
-                {}
-            ]
-        },
-        "tests": [
-            {
-                "description": "any data is valid",
-                "data": 1,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "allOf with two empty schemas",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "allOf": [
-                {},
-                {}
-            ]
-        },
-        "tests": [
-            {
-                "description": "any data is valid",
-                "data": 1,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "allOf with the first empty schema",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "allOf": [
-                {},
-                { "type": "number" }
-            ]
-        },
-        "tests": [
-            {
-                "description": "number is valid",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "string is invalid",
-                "data": "foo",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "allOf with the last empty schema",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "allOf": [
-                { "type": "number" },
-                {}
-            ]
-        },
-        "tests": [
-            {
-                "description": "number is valid",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "string is invalid",
-                "data": "foo",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "nested allOf, to check validation semantics",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "allOf": [
-                {
-                    "allOf": [
-                        {
-                            "type": "null"
-                        }
-                    ]
-                }
-            ]
-        },
-        "tests": [
-            {
-                "description": "null is valid",
-                "data": null,
-                "valid": true
-            },
-            {
-                "description": "anything non-null is invalid",
-                "data": 123,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "allOf combined with anyOf, oneOf",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "allOf": [ { "multipleOf": 2 } ],
-            "anyOf": [ { "multipleOf": 3 } ],
-            "oneOf": [ { "multipleOf": 5 } ]
-        },
-        "tests": [
-            {
-                "description": "allOf: false, anyOf: false, oneOf: false",
-                "data": 1,
-                "valid": false
-            },
-            {
-                "description": "allOf: false, anyOf: false, oneOf: true",
-                "data": 5,
-                "valid": false
-            },
-            {
-                "description": "allOf: false, anyOf: true, oneOf: false",
-                "data": 3,
-                "valid": false
-            },
-            {
-                "description": "allOf: false, anyOf: true, oneOf: true",
-                "data": 15,
-                "valid": false
-            },
-            {
-                "description": "allOf: true, anyOf: false, oneOf: false",
-                "data": 2,
-                "valid": false
-            },
-            {
-                "description": "allOf: true, anyOf: false, oneOf: true",
-                "data": 10,
-                "valid": false
-            },
-            {
-                "description": "allOf: true, anyOf: true, oneOf: false",
-                "data": 6,
-                "valid": false
-            },
-            {
-                "description": "allOf: true, anyOf: true, oneOf: true",
-                "data": 30,
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft-next/anchor.json b/json/tests/draft-next/anchor.json
deleted file mode 100644
index 321d844..0000000
--- a/json/tests/draft-next/anchor.json
+++ /dev/null
@@ -1,234 +0,0 @@
-[
-    {
-        "description": "Location-independent identifier",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "$ref": "#foo",
-            "$defs": {
-                "A": {
-                    "$anchor": "foo",
-                    "type": "integer"
-                }
-            }
-        },
-        "tests": [
-            {
-                "data": 1,
-                "description": "match",
-                "valid": true
-            },
-            {
-                "data": "a",
-                "description": "mismatch",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "Location-independent identifier with absolute URI",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "$ref": "http://localhost:1234/draft-next/bar#foo",
-            "$defs": {
-                "A": {
-                    "$id": "http://localhost:1234/draft-next/bar",
-                    "$anchor": "foo",
-                    "type": "integer"
-                }
-            }
-        },
-        "tests": [
-            {
-                "data": 1,
-                "description": "match",
-                "valid": true
-            },
-            {
-                "data": "a",
-                "description": "mismatch",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "Location-independent identifier with base URI change in subschema",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "$id": "http://localhost:1234/draft-next/root",
-            "$ref": "http://localhost:1234/draft-next/nested.json#foo",
-            "$defs": {
-                "A": {
-                    "$id": "nested.json",
-                    "$defs": {
-                        "B": {
-                            "$anchor": "foo",
-                            "type": "integer"
-                        }
-                    }
-                }
-            }
-        },
-        "tests": [
-            {
-                "data": 1,
-                "description": "match",
-                "valid": true
-            },
-            {
-                "data": "a",
-                "description": "mismatch",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "$anchor inside an enum is not a real identifier",
-        "comment": "the implementation must not be confused by an $anchor buried in the enum",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "$defs": {
-                "anchor_in_enum": {
-                    "enum": [
-                        {
-                            "$anchor": "my_anchor",
-                            "type": "null"
-                        }
-                    ]
-                },
-                "real_identifier_in_schema": {
-                    "$anchor": "my_anchor",
-                    "type": "string"
-                },
-                "zzz_anchor_in_const": {
-                    "const": {
-                        "$anchor": "my_anchor",
-                        "type": "null"
-                    }
-                }
-            },
-            "anyOf": [
-                { "$ref": "#/$defs/anchor_in_enum" },
-                { "$ref": "#my_anchor" }
-            ]
-        },
-        "tests": [
-            {
-                "description": "exact match to enum, and type matches",
-                "data": {
-                    "$anchor": "my_anchor",
-                    "type": "null"
-                },
-                "valid": true
-            },
-            {
-                "description": "in implementations that strip $anchor, this may match either $def",
-                "data": {
-                    "type": "null"
-                },
-                "valid": false
-            },
-            {
-                "description": "match $ref to $anchor",
-                "data": "a string to match #/$defs/anchor_in_enum",
-                "valid": true
-            },
-            {
-                "description": "no match on enum or $ref to $anchor",
-                "data": 1,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "same $anchor with different base uri",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "$id": "http://localhost:1234/draft-next/foobar",
-            "$defs": {
-                "A": {
-                    "$id": "child1",
-                    "allOf": [
-                        {
-                            "$id": "child2",
-                            "$anchor": "my_anchor",
-                            "type": "number"
-                        },
-                        {
-                            "$anchor": "my_anchor",
-                            "type": "string"
-                        }
-                    ]
-                }
-            },
-            "$ref": "child1#my_anchor"
-        },
-        "tests": [
-            {
-                "description": "$ref resolves to /$defs/A/allOf/1",
-                "data": "a",
-                "valid": true
-            },
-            {
-                "description": "$ref does not resolve to /$defs/A/allOf/0",
-                "data": 1,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "non-schema object containing an $anchor property",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "$defs": {
-                "const_not_anchor": {
-                    "const": {
-                        "$anchor": "not_a_real_anchor"
-                    }
-                }
-            },
-            "if": {
-                "const": "skip not_a_real_anchor"
-            },
-            "then": true,
-            "else" : {
-                "$ref": "#/$defs/const_not_anchor"
-            }
-        },
-        "tests": [
-            {
-                "description": "skip traversing definition for a valid result",
-                "data": "skip not_a_real_anchor",
-                "valid": true
-            },
-            {
-                "description": "const at const_not_anchor does not match",
-                "data": 1,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "invalid anchors",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "$ref": "https://json-schema.org/draft/next/schema"
-        },
-        "tests": [
-            {
-                "description": "MUST start with a letter (and not #)",
-                "data": { "$anchor" : "#foo" },
-                "valid": false
-            },
-            {
-                "description": "JSON pointers are not valid",
-                "data": { "$anchor" : "/a/b" },
-                "valid": false
-            },
-            {
-                "description": "invalid with valid beginning",
-                "data": { "$anchor" : "foo#something" },
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft-next/anyOf.json b/json/tests/draft-next/anyOf.json
deleted file mode 100644
index a97267c..0000000
--- a/json/tests/draft-next/anyOf.json
+++ /dev/null
@@ -1,203 +0,0 @@
-[
-    {
-        "description": "anyOf",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "anyOf": [
-                {
-                    "type": "integer"
-                },
-                {
-                    "minimum": 2
-                }
-            ]
-        },
-        "tests": [
-            {
-                "description": "first anyOf valid",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "second anyOf valid",
-                "data": 2.5,
-                "valid": true
-            },
-            {
-                "description": "both anyOf valid",
-                "data": 3,
-                "valid": true
-            },
-            {
-                "description": "neither anyOf valid",
-                "data": 1.5,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "anyOf with base schema",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "type": "string",
-            "anyOf" : [
-                {
-                    "maxLength": 2
-                },
-                {
-                    "minLength": 4
-                }
-            ]
-        },
-        "tests": [
-            {
-                "description": "mismatch base schema",
-                "data": 3,
-                "valid": false
-            },
-            {
-                "description": "one anyOf valid",
-                "data": "foobar",
-                "valid": true
-            },
-            {
-                "description": "both anyOf invalid",
-                "data": "foo",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "anyOf with boolean schemas, all true",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "anyOf": [true, true]
-        },
-        "tests": [
-            {
-                "description": "any value is valid",
-                "data": "foo",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "anyOf with boolean schemas, some true",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "anyOf": [true, false]
-        },
-        "tests": [
-            {
-                "description": "any value is valid",
-                "data": "foo",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "anyOf with boolean schemas, all false",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "anyOf": [false, false]
-        },
-        "tests": [
-            {
-                "description": "any value is invalid",
-                "data": "foo",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "anyOf complex types",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "anyOf": [
-                {
-                    "properties": {
-                        "bar": {"type": "integer"}
-                    },
-                    "required": ["bar"]
-                },
-                {
-                    "properties": {
-                        "foo": {"type": "string"}
-                    },
-                    "required": ["foo"]
-                }
-            ]
-        },
-        "tests": [
-            {
-                "description": "first anyOf valid (complex)",
-                "data": {"bar": 2},
-                "valid": true
-            },
-            {
-                "description": "second anyOf valid (complex)",
-                "data": {"foo": "baz"},
-                "valid": true
-            },
-            {
-                "description": "both anyOf valid (complex)",
-                "data": {"foo": "baz", "bar": 2},
-                "valid": true
-            },
-            {
-                "description": "neither anyOf valid (complex)",
-                "data": {"foo": 2, "bar": "quux"},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "anyOf with one empty schema",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "anyOf": [
-                { "type": "number" },
-                {}
-            ]
-        },
-        "tests": [
-            {
-                "description": "string is valid",
-                "data": "foo",
-                "valid": true
-            },
-            {
-                "description": "number is valid",
-                "data": 123,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "nested anyOf, to check validation semantics",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "anyOf": [
-                {
-                    "anyOf": [
-                        {
-                            "type": "null"
-                        }
-                    ]
-                }
-            ]
-        },
-        "tests": [
-            {
-                "description": "null is valid",
-                "data": null,
-                "valid": true
-            },
-            {
-                "description": "anything non-null is invalid",
-                "data": 123,
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft-next/boolean_schema.json b/json/tests/draft-next/boolean_schema.json
deleted file mode 100644
index 6d40f23..0000000
--- a/json/tests/draft-next/boolean_schema.json
+++ /dev/null
@@ -1,104 +0,0 @@
-[
-    {
-        "description": "boolean schema 'true'",
-        "schema": true,
-        "tests": [
-            {
-                "description": "number is valid",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "string is valid",
-                "data": "foo",
-                "valid": true
-            },
-            {
-                "description": "boolean true is valid",
-                "data": true,
-                "valid": true
-            },
-            {
-                "description": "boolean false is valid",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "null is valid",
-                "data": null,
-                "valid": true
-            },
-            {
-                "description": "object is valid",
-                "data": {"foo": "bar"},
-                "valid": true
-            },
-            {
-                "description": "empty object is valid",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "array is valid",
-                "data": ["foo"],
-                "valid": true
-            },
-            {
-                "description": "empty array is valid",
-                "data": [],
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "boolean schema 'false'",
-        "schema": false,
-        "tests": [
-            {
-                "description": "number is invalid",
-                "data": 1,
-                "valid": false
-            },
-            {
-                "description": "string is invalid",
-                "data": "foo",
-                "valid": false
-            },
-            {
-                "description": "boolean true is invalid",
-                "data": true,
-                "valid": false
-            },
-            {
-                "description": "boolean false is invalid",
-                "data": false,
-                "valid": false
-            },
-            {
-                "description": "null is invalid",
-                "data": null,
-                "valid": false
-            },
-            {
-                "description": "object is invalid",
-                "data": {"foo": "bar"},
-                "valid": false
-            },
-            {
-                "description": "empty object is invalid",
-                "data": {},
-                "valid": false
-            },
-            {
-                "description": "array is invalid",
-                "data": ["foo"],
-                "valid": false
-            },
-            {
-                "description": "empty array is invalid",
-                "data": [],
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft-next/const.json b/json/tests/draft-next/const.json
deleted file mode 100644
index 61fbd83..0000000
--- a/json/tests/draft-next/const.json
+++ /dev/null
@@ -1,387 +0,0 @@
-[
-    {
-        "description": "const validation",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "const": 2
-        },
-        "tests": [
-            {
-                "description": "same value is valid",
-                "data": 2,
-                "valid": true
-            },
-            {
-                "description": "another value is invalid",
-                "data": 5,
-                "valid": false
-            },
-            {
-                "description": "another type is invalid",
-                "data": "a",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "const with object",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "const": {"foo": "bar", "baz": "bax"}
-        },
-        "tests": [
-            {
-                "description": "same object is valid",
-                "data": {"foo": "bar", "baz": "bax"},
-                "valid": true
-            },
-            {
-                "description": "same object with different property order is valid",
-                "data": {"baz": "bax", "foo": "bar"},
-                "valid": true
-            },
-            {
-                "description": "another object is invalid",
-                "data": {"foo": "bar"},
-                "valid": false
-            },
-            {
-                "description": "another type is invalid",
-                "data": [1, 2],
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "const with array",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "const": [{ "foo": "bar" }]
-        },
-        "tests": [
-            {
-                "description": "same array is valid",
-                "data": [{"foo": "bar"}],
-                "valid": true
-            },
-            {
-                "description": "another array item is invalid",
-                "data": [2],
-                "valid": false
-            },
-            {
-                "description": "array with additional items is invalid",
-                "data": [1, 2, 3],
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "const with null",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "const": null
-        },
-        "tests": [
-            {
-                "description": "null is valid",
-                "data": null,
-                "valid": true
-            },
-            {
-                "description": "not null is invalid",
-                "data": 0,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "const with false does not match 0",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "const": false
-        },
-        "tests": [
-            {
-                "description": "false is valid",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "integer zero is invalid",
-                "data": 0,
-                "valid": false
-            },
-            {
-                "description": "float zero is invalid",
-                "data": 0.0,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "const with true does not match 1",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "const": true
-        },
-        "tests": [
-            {
-                "description": "true is valid",
-                "data": true,
-                "valid": true
-            },
-            {
-                "description": "integer one is invalid",
-                "data": 1,
-                "valid": false
-            },
-            {
-                "description": "float one is invalid",
-                "data": 1.0,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "const with [false] does not match [0]",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "const": [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": "const with [true] does not match [1]",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "const": [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": "const with {\"a\": false} does not match {\"a\": 0}",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "const": {"a": false}
-        },
-        "tests": [
-            {
-                "description": "{\"a\": false} is valid",
-                "data": {"a": false},
-                "valid": true
-            },
-            {
-                "description": "{\"a\": 0} is invalid",
-                "data": {"a": 0},
-                "valid": false
-            },
-            {
-                "description": "{\"a\": 0.0} is invalid",
-                "data": {"a": 0.0},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "const with {\"a\": true} does not match {\"a\": 1}",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "const": {"a": true}
-        },
-        "tests": [
-            {
-                "description": "{\"a\": true} is valid",
-                "data": {"a": true},
-                "valid": true
-            },
-            {
-                "description": "{\"a\": 1} is invalid",
-                "data": {"a": 1},
-                "valid": false
-            },
-            {
-                "description": "{\"a\": 1.0} is invalid",
-                "data": {"a": 1.0},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "const with 0 does not match other zero-like types",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "const": 0
-        },
-        "tests": [
-            {
-                "description": "false is invalid",
-                "data": false,
-                "valid": false
-            },
-            {
-                "description": "integer zero is valid",
-                "data": 0,
-                "valid": true
-            },
-            {
-                "description": "float zero is valid",
-                "data": 0.0,
-                "valid": true
-            },
-            {
-                "description": "empty object is invalid",
-                "data": {},
-                "valid": false
-            },
-            {
-                "description": "empty array is invalid",
-                "data": [],
-                "valid": false
-            },
-            {
-                "description": "empty string is invalid",
-                "data": "",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "const with 1 does not match true",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "const": 1
-        },
-        "tests": [
-            {
-                "description": "true is invalid",
-                "data": true,
-                "valid": false
-            },
-            {
-                "description": "integer one is valid",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "float one is valid",
-                "data": 1.0,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "const with -2.0 matches integer and float types",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "const": -2.0
-        },
-        "tests": [
-            {
-                "description": "integer -2 is valid",
-                "data": -2,
-                "valid": true
-            },
-            {
-                "description": "integer 2 is invalid",
-                "data": 2,
-                "valid": false
-            },
-            {
-                "description": "float -2.0 is valid",
-                "data": -2.0,
-                "valid": true
-            },
-            {
-                "description": "float 2.0 is invalid",
-                "data": 2.0,
-                "valid": false
-            },
-            {
-                "description": "float -2.00001 is invalid",
-                "data": -2.00001,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "float and integers are equal up to 64-bit representation limits",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "const": 9007199254740992
-        },
-        "tests": [
-            {
-                "description": "integer is valid",
-                "data": 9007199254740992,
-                "valid": true
-            },
-            {
-                "description": "integer minus one is invalid",
-                "data": 9007199254740991,
-                "valid": false
-            },
-            {
-                "description": "float is valid",
-                "data": 9007199254740992.0,
-                "valid": true
-            },
-            {
-                "description": "float minus one is invalid",
-                "data": 9007199254740991.0,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "nul characters in strings",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "const": "hello\u0000there"
-        },
-        "tests": [
-            {
-                "description": "match string with nul",
-                "data": "hello\u0000there",
-                "valid": true
-            },
-            {
-                "description": "do not match string lacking nul",
-                "data": "hellothere",
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft-next/contains.json b/json/tests/draft-next/contains.json
deleted file mode 100644
index c17f55e..0000000
--- a/json/tests/draft-next/contains.json
+++ /dev/null
@@ -1,267 +0,0 @@
-[
-    {
-        "description": "contains keyword validation",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "contains": { "minimum": 5 }
-        },
-        "tests": [
-            {
-                "description": "array with item matching schema (5) is valid",
-                "data": [3, 4, 5],
-                "valid": true
-            },
-            {
-                "description": "array with item matching schema (6) is valid",
-                "data": [3, 4, 6],
-                "valid": true
-            },
-            {
-                "description": "array with two items matching schema (5, 6) is valid",
-                "data": [3, 4, 5, 6],
-                "valid": true
-            },
-            {
-                "description": "array without items matching schema is invalid",
-                "data": [2, 3, 4],
-                "valid": false
-            },
-            {
-                "description": "empty array is invalid",
-                "data": [],
-                "valid": false
-            },
-            {
-                "description": "object with property matching schema (5) is valid",
-                "data": { "a": 3, "b": 4, "c": 5 },
-                "valid": true
-            },
-            {
-                "description": "object with property matching schema (6) is valid",
-                "data": { "a": 3, "b": 4, "c": 6 },
-                "valid": true
-            },
-            {
-                "description": "object with two properties matching schema (5, 6) is valid",
-                "data": { "a": 3, "b": 4, "c": 5, "d": 6 },
-                "valid": true
-            },
-            {
-                "description": "object without properties matching schema is invalid",
-                "data": { "a": 2, "b": 3, "c": 4 },
-                "valid": false
-            },
-            {
-                "description": "empty object is invalid",
-                "data": {},
-                "valid": false
-            },
-            {
-                "description": "not array or object is valid",
-                "data": 42,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "contains keyword with const keyword",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "contains": { "const": 5 }
-        },
-        "tests": [
-            {
-                "description": "array with item 5 is valid",
-                "data": [3, 4, 5],
-                "valid": true
-            },
-            {
-                "description": "array with two items 5 is valid",
-                "data": [3, 4, 5, 5],
-                "valid": true
-            },
-            {
-                "description": "array without item 5 is invalid",
-                "data": [1, 2, 3, 4],
-                "valid": false
-            },
-            {
-                "description": "object with property 5 is valid",
-                "data": { "a": 3, "b": 4, "c": 5 },
-                "valid": true
-            },
-            {
-                "description": "object with two properties 5 is valid",
-                "data": { "a": 3, "b": 4, "c": 5, "d": 5 },
-                "valid": true
-            },
-            {
-                "description": "object without property 5 is invalid",
-                "data": { "a": 1, "b": 2, "c": 3, "d": 4 },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "contains keyword with boolean schema true",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "contains": true
-        },
-        "tests": [
-            {
-                "description": "any non-empty array is valid",
-                "data": ["foo"],
-                "valid": true
-            },
-            {
-                "description": "empty array is invalid",
-                "data": [],
-                "valid": false
-            },
-            {
-                "description": "any non-empty object is valid",
-                "data": { "a": "foo" },
-                "valid": true
-            },
-            {
-                "description": "empty object is invalid",
-                "data": {},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "contains keyword with boolean schema false",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "contains": false
-        },
-        "tests": [
-            {
-                "description": "any non-empty array is invalid",
-                "data": ["foo"],
-                "valid": false
-            },
-            {
-                "description": "empty array is invalid",
-                "data": [],
-                "valid": false
-            },
-            {
-                "description": "any non-empty object is invalid",
-                "data": ["foo"],
-                "valid": false
-            },
-            {
-                "description": "empty object is invalid",
-                "data": {},
-                "valid": false
-            },
-            {
-                "description": "non-arrays/objects are valid",
-                "data": "contains does not apply to strings",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "items + contains",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "additionalProperties": { "multipleOf": 2 },
-            "items": { "multipleOf": 2 },
-            "contains": { "multipleOf": 3 }
-        },
-        "tests": [
-            {
-                "description": "matches items, does not match contains",
-                "data": [2, 4, 8],
-                "valid": false
-            },
-            {
-                "description": "does not match items, matches contains",
-                "data": [3, 6, 9],
-                "valid": false
-            },
-            {
-                "description": "matches both items and contains",
-                "data": [6, 12],
-                "valid": true
-            },
-            {
-                "description": "matches neither items nor contains",
-                "data": [1, 5],
-                "valid": false
-            },
-            {
-                "description": "matches additionalProperties, does not match contains",
-                "data": { "a": 2, "b": 4, "c": 8 },
-                "valid": false
-            },
-            {
-                "description": "does not match additionalProperties, matches contains",
-                "data": { "a": 3, "b": 6, "c": 9 },
-                "valid": false
-            },
-            {
-                "description": "matches both additionalProperties and contains",
-                "data": { "a": 6, "b": 12 },
-                "valid": true
-            },
-            {
-                "description": "matches neither additionalProperties nor contains",
-                "data": { "a": 1, "b": 5 },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "contains with false if subschema",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "contains": {
-                "if": false,
-                "else": true
-            }
-        },
-        "tests": [
-            {
-                "description": "any non-empty array is valid",
-                "data": ["foo"],
-                "valid": true
-            },
-            {
-                "description": "empty array is invalid",
-                "data": [],
-                "valid": false
-            },
-            {
-                "description": "any non-empty object is valid",
-                "data": { "a": "foo" },
-                "valid": true
-            },
-            {
-                "description": "empty object is invalid",
-                "data": {},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "contains with null instance elements",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "contains": {
-                "type": "null"
-            }
-        },
-        "tests": [
-            {
-                "description": "allows null items",
-                "data": [ null ],
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft-next/content.json b/json/tests/draft-next/content.json
deleted file mode 100644
index 37e1f09..0000000
--- a/json/tests/draft-next/content.json
+++ /dev/null
@@ -1,131 +0,0 @@
-[
-    {
-        "description": "validation of string-encoded content based on media type",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "contentMediaType": "application/json"
-        },
-        "tests": [
-            {
-                "description": "a valid JSON document",
-                "data": "{\"foo\": \"bar\"}",
-                "valid": true
-            },
-            {
-                "description": "an invalid JSON document; validates true",
-                "data": "{:}",
-                "valid": true
-            },
-            {
-                "description": "ignores non-strings",
-                "data": 100,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "validation of binary string-encoding",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "contentEncoding": "base64"
-        },
-        "tests": [
-            {
-                "description": "a valid base64 string",
-                "data": "eyJmb28iOiAiYmFyIn0K",
-                "valid": true
-            },
-            {
-                "description": "an invalid base64 string (% is not a valid character); validates true",
-                "data": "eyJmb28iOi%iYmFyIn0K",
-                "valid": true
-            },
-            {
-                "description": "ignores non-strings",
-                "data": 100,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "validation of binary-encoded media type documents",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "contentMediaType": "application/json",
-            "contentEncoding": "base64"
-        },
-        "tests": [
-            {
-                "description": "a valid base64-encoded JSON document",
-                "data": "eyJmb28iOiAiYmFyIn0K",
-                "valid": true
-            },
-            {
-                "description": "a validly-encoded invalid JSON document; validates true",
-                "data": "ezp9Cg==",
-                "valid": true
-            },
-            {
-                "description": "an invalid base64 string that is valid JSON; validates true",
-                "data": "{}",
-                "valid": true
-            },
-            {
-                "description": "ignores non-strings",
-                "data": 100,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "validation of binary-encoded media type documents with schema",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "contentMediaType": "application/json",
-            "contentEncoding": "base64",
-            "contentSchema": { "type": "object", "required": ["foo"], "properties": { "foo": { "type": "string" } } }
-        },
-        "tests": [
-            {
-                "description": "a valid base64-encoded JSON document",
-                "data": "eyJmb28iOiAiYmFyIn0K",
-                "valid": true
-            },
-            {
-                "description": "another valid base64-encoded JSON document",
-                "data": "eyJib28iOiAyMCwgImZvbyI6ICJiYXoifQ==",
-                "valid": true
-            },
-            {
-                "description": "an invalid base64-encoded JSON document; validates true",
-                "data": "eyJib28iOiAyMH0=",
-                "valid": true
-            },
-            {
-                "description": "an empty object as a base64-encoded JSON document; validates true",
-                "data": "e30=",
-                "valid": true
-            },
-            {
-                "description": "an empty array as a base64-encoded JSON document",
-                "data": "W10=",
-                "valid": true
-            },
-            {
-                "description": "a validly-encoded invalid JSON document; validates true",
-                "data": "ezp9Cg==",
-                "valid": true
-            },
-            {
-                "description": "an invalid base64 string that is valid JSON; validates true",
-                "data": "{}",
-                "valid": true
-            },
-            {
-                "description": "ignores non-strings",
-                "data": 100,
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft-next/default.json b/json/tests/draft-next/default.json
deleted file mode 100644
index 689b68e..0000000
--- a/json/tests/draft-next/default.json
+++ /dev/null
@@ -1,82 +0,0 @@
-[
-    {
-        "description": "invalid type for default",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "properties": {
-                "foo": {
-                    "type": "integer",
-                    "default": []
-                }
-            }
-        },
-        "tests": [
-            {
-                "description": "valid when property is specified",
-                "data": {"foo": 13},
-                "valid": true
-            },
-            {
-                "description": "still valid when the invalid default is used",
-                "data": {},
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "invalid string value for default",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "properties": {
-                "bar": {
-                    "type": "string",
-                    "minLength": 4,
-                    "default": "bad"
-                }
-            }
-        },
-        "tests": [
-            {
-                "description": "valid when property is specified",
-                "data": {"bar": "good"},
-                "valid": true
-            },
-            {
-                "description": "still valid when the invalid default is used",
-                "data": {},
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "the default keyword does not do anything if the property is missing",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "type": "object",
-            "properties": {
-                "alpha": {
-                    "type": "number",
-                    "maximum": 3,
-                    "default": 5
-                }
-            }
-        },
-        "tests": [
-            {
-                "description": "an explicit property value is checked against maximum (passing)",
-                "data": { "alpha": 1 },
-                "valid": true
-            },
-            {
-                "description": "an explicit property value is checked against maximum (failing)",
-                "data": { "alpha": 5 },
-                "valid": false
-            },
-            {
-                "description": "missing properties are not filled in with the default",
-                "data": {},
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft-next/defs.json b/json/tests/draft-next/defs.json
deleted file mode 100644
index 7bda825..0000000
--- a/json/tests/draft-next/defs.json
+++ /dev/null
@@ -1,21 +0,0 @@
-[
-    {
-        "description": "validate definition against metaschema",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "$ref": "https://json-schema.org/draft/next/schema"
-        },
-        "tests": [
-            {
-                "description": "valid definition schema",
-                "data": {"$defs": {"foo": {"type": "integer"}}},
-                "valid": true
-            },
-            {
-                "description": "invalid definition schema",
-                "data": {"$defs": {"foo": {"type": 1}}},
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft-next/dependentRequired.json b/json/tests/draft-next/dependentRequired.json
deleted file mode 100644
index 2344724..0000000
--- a/json/tests/draft-next/dependentRequired.json
+++ /dev/null
@@ -1,152 +0,0 @@
-[
-    {
-        "description": "single dependency",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "dependentRequired": {"bar": ["foo"]}
-        },
-        "tests": [
-            {
-                "description": "neither",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "nondependant",
-                "data": {"foo": 1},
-                "valid": true
-            },
-            {
-                "description": "with dependency",
-                "data": {"foo": 1, "bar": 2},
-                "valid": true
-            },
-            {
-                "description": "missing dependency",
-                "data": {"bar": 2},
-                "valid": false
-            },
-            {
-                "description": "ignores arrays",
-                "data": ["bar"],
-                "valid": true
-            },
-            {
-                "description": "ignores strings",
-                "data": "foobar",
-                "valid": true
-            },
-            {
-                "description": "ignores other non-objects",
-                "data": 12,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "empty dependents",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "dependentRequired": {"bar": []}
-        },
-        "tests": [
-            {
-                "description": "empty object",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "object with one property",
-                "data": {"bar": 2},
-                "valid": true
-            },
-            {
-                "description": "non-object is valid",
-                "data": 1,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "multiple dependents required",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "dependentRequired": {"quux": ["foo", "bar"]}
-        },
-        "tests": [
-            {
-                "description": "neither",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "nondependants",
-                "data": {"foo": 1, "bar": 2},
-                "valid": true
-            },
-            {
-                "description": "with dependencies",
-                "data": {"foo": 1, "bar": 2, "quux": 3},
-                "valid": true
-            },
-            {
-                "description": "missing dependency",
-                "data": {"foo": 1, "quux": 2},
-                "valid": false
-            },
-            {
-                "description": "missing other dependency",
-                "data": {"bar": 1, "quux": 2},
-                "valid": false
-            },
-            {
-                "description": "missing both dependencies",
-                "data": {"quux": 1},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "dependencies with escaped characters",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "dependentRequired": {
-                "foo\nbar": ["foo\rbar"],
-                "foo\"bar": ["foo'bar"]
-            }
-        },
-        "tests": [
-            {
-                "description": "CRLF",
-                "data": {
-                    "foo\nbar": 1,
-                    "foo\rbar": 2
-                },
-                "valid": true
-            },
-            {
-                "description": "quoted quotes",
-                "data": {
-                    "foo'bar": 1,
-                    "foo\"bar": 2
-                },
-                "valid": true
-            },
-            {
-                "description": "CRLF missing dependent",
-                "data": {
-                    "foo\nbar": 1,
-                    "foo": 2
-                },
-                "valid": false
-            },
-            {
-                "description": "quoted quotes missing dependent",
-                "data": {
-                    "foo\"bar": 2
-                },
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft-next/dependentSchemas.json b/json/tests/draft-next/dependentSchemas.json
deleted file mode 100644
index 67c7979..0000000
--- a/json/tests/draft-next/dependentSchemas.json
+++ /dev/null
@@ -1,132 +0,0 @@
-[
-    {
-        "description": "single dependency",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "dependentSchemas": {
-                "bar": {
-                    "properties": {
-                        "foo": {"type": "integer"},
-                        "bar": {"type": "integer"}
-                    }
-                }
-            }
-        },
-        "tests": [
-            {
-                "description": "valid",
-                "data": {"foo": 1, "bar": 2},
-                "valid": true
-            },
-            {
-                "description": "no dependency",
-                "data": {"foo": "quux"},
-                "valid": true
-            },
-            {
-                "description": "wrong type",
-                "data": {"foo": "quux", "bar": 2},
-                "valid": false
-            },
-            {
-                "description": "wrong type other",
-                "data": {"foo": 2, "bar": "quux"},
-                "valid": false
-            },
-            {
-                "description": "wrong type both",
-                "data": {"foo": "quux", "bar": "quux"},
-                "valid": false
-            },
-            {
-                "description": "ignores arrays",
-                "data": ["bar"],
-                "valid": true
-            },
-            {
-                "description": "ignores strings",
-                "data": "foobar",
-                "valid": true
-            },
-            {
-                "description": "ignores other non-objects",
-                "data": 12,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "boolean subschemas",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "dependentSchemas": {
-                "foo": true,
-                "bar": false
-            }
-        },
-        "tests": [
-            {
-                "description": "object with property having schema true is valid",
-                "data": {"foo": 1},
-                "valid": true
-            },
-            {
-                "description": "object with property having schema false is invalid",
-                "data": {"bar": 2},
-                "valid": false
-            },
-            {
-                "description": "object with both properties is invalid",
-                "data": {"foo": 1, "bar": 2},
-                "valid": false
-            },
-            {
-                "description": "empty object is valid",
-                "data": {},
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "dependencies with escaped characters",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "dependentSchemas": {
-                "foo\tbar": {"minProperties": 4},
-                "foo'bar": {"required": ["foo\"bar"]}
-            }
-        },
-        "tests": [
-            {
-                "description": "quoted tab",
-                "data": {
-                    "foo\tbar": 1,
-                    "a": 2,
-                    "b": 3,
-                    "c": 4
-                },
-                "valid": true
-            },
-            {
-                "description": "quoted quote",
-                "data": {
-                    "foo'bar": {"foo\"bar": 1}
-                },
-                "valid": false
-            },
-            {
-                "description": "quoted tab invalid under dependent schema",
-                "data": {
-                    "foo\tbar": 1,
-                    "a": 2
-                },
-                "valid": false
-            },
-            {
-                "description": "quoted quote invalid under dependent schema",
-                "data": {"foo'bar": 1},
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft-next/dynamicRef.json b/json/tests/draft-next/dynamicRef.json
deleted file mode 100644
index a4a7c44..0000000
--- a/json/tests/draft-next/dynamicRef.json
+++ /dev/null
@@ -1,568 +0,0 @@
-[
-    {
-        "description": "A $dynamicRef to a $dynamicAnchor in the same schema resource behaves like a normal $ref to an $anchor",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "$id": "https://test.json-schema.org/dynamicRef-dynamicAnchor-same-schema/root",
-            "type": "array",
-            "items": { "$dynamicRef": "#items" },
-            "$defs": {
-                "foo": {
-                    "$dynamicAnchor": "items",
-                    "type": "string"
-                }
-            }
-        },
-        "tests": [
-            {
-                "description": "An array of strings is valid",
-                "data": ["foo", "bar"],
-                "valid": true
-            },
-            {
-                "description": "An array containing non-strings is invalid",
-                "data": ["foo", 42],
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "A $ref to a $dynamicAnchor in the same schema resource behaves like a normal $ref to an $anchor",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "$id": "https://test.json-schema.org/ref-dynamicAnchor-same-schema/root",
-            "type": "array",
-            "items": { "$ref": "#items" },
-            "$defs": {
-                "foo": {
-                    "$dynamicAnchor": "items",
-                    "type": "string"
-                }
-            }
-        },
-        "tests": [
-            {
-                "description": "An array of strings is valid",
-                "data": ["foo", "bar"],
-                "valid": true
-            },
-            {
-                "description": "An array containing non-strings is invalid",
-                "data": ["foo", 42],
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "A $dynamicRef resolves to the first $dynamicAnchor still in scope that is encountered when the schema is evaluated",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "$id": "https://test.json-schema.org/typical-dynamic-resolution/root",
-            "$ref": "list",
-            "$defs": {
-                "foo": {
-                    "$dynamicAnchor": "items",
-                    "type": "string"
-                },
-                "list": {
-                    "$id": "list",
-                    "type": "array",
-                    "items": { "$dynamicRef": "#items" }
-                }
-            }
-        },
-        "tests": [
-            {
-                "description": "An array of strings is valid",
-                "data": ["foo", "bar"],
-                "valid": true
-            },
-            {
-                "description": "An array containing non-strings is invalid",
-                "data": ["foo", 42],
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "A $dynamicRef with intermediate scopes that don't include a matching $dynamicAnchor does not affect dynamic scope resolution",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "$id": "https://test.json-schema.org/dynamic-resolution-with-intermediate-scopes/root",
-            "$ref": "intermediate-scope",
-            "$defs": {
-                "foo": {
-                    "$dynamicAnchor": "items",
-                    "type": "string"
-                },
-                "intermediate-scope": {
-                    "$id": "intermediate-scope",
-                    "$ref": "list"
-                },
-                "list": {
-                    "$id": "list",
-                    "type": "array",
-                    "items": { "$dynamicRef": "#items" }
-                }
-            }
-        },
-        "tests": [
-            {
-                "description": "An array of strings is valid",
-                "data": ["foo", "bar"],
-                "valid": true
-            },
-            {
-                "description": "An array containing non-strings is invalid",
-                "data": ["foo", 42],
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "An $anchor with the same name as a $dynamicAnchor is not used for dynamic scope resolution",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "$id": "https://test.json-schema.org/dynamic-resolution-ignores-anchors/root",
-            "$ref": "list",
-            "$defs": {
-                "foo": {
-                    "$anchor": "items",
-                    "type": "string"
-                },
-                "list": {
-                    "$id": "list",
-                    "type": "array",
-                    "items": { "$dynamicRef": "#items" },
-                    "$defs": {
-                      "items": {
-                          "$dynamicAnchor": "items"
-                      }
-                    }
-                }
-            }
-        },
-        "tests": [
-            {
-                "description": "Any array is valid",
-                "data": ["foo", 42],
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "A $dynamicRef that initially resolves to a schema with a matching $dynamicAnchor resolves to the first $dynamicAnchor in the dynamic scope",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "$id": "https://test.json-schema.org/relative-dynamic-reference/root",
-            "$dynamicAnchor": "meta",
-            "type": "object",
-            "properties": {
-                "foo": { "const": "pass" }
-            },
-            "$ref": "extended",
-            "$defs": {
-                "extended": {
-                    "$id": "extended",
-                    "$dynamicAnchor": "meta",
-                    "type": "object",
-                    "properties": {
-                        "bar": { "$ref": "bar" }
-                    }
-                },
-                "bar": {
-                    "$id": "bar",
-                    "type": "object",
-                    "properties": {
-                        "baz": { "$dynamicRef": "extended#meta" }
-                    }
-                }
-            }
-        },
-        "tests": [
-            {
-                "description": "The recursive part is valid against the root",
-                "data": {
-                    "foo": "pass",
-                    "bar": {
-                        "baz": { "foo": "pass" }
-                    }
-                },
-                "valid": true
-            },
-            {
-                "description": "The recursive part is not valid against the root",
-                "data": {
-                    "foo": "pass",
-                    "bar": {
-                        "baz": { "foo": "fail" }
-                    }
-                },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "multiple dynamic paths to the $dynamicRef keyword",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "$id": "https://test.json-schema.org/dynamic-ref-with-multiple-paths/main",
-            "$defs": {
-                "inner": {
-                    "$id": "inner",
-                    "$dynamicAnchor": "foo",
-                    "title": "inner",
-                    "additionalProperties": {
-                        "$dynamicRef": "#foo"
-                    }
-                }
-            },
-            "if": {
-                "propertyNames": {
-                    "pattern": "^[a-m]"
-                }
-            },
-            "then": {
-                "title": "any type of node",
-                "$id": "anyLeafNode",
-                "$dynamicAnchor": "foo",
-                "$ref": "inner"
-            },
-            "else": {
-                "title": "integer node",
-                "$id": "integerNode",
-                "$dynamicAnchor": "foo",
-                "type": [ "object", "integer" ],
-                "$ref": "inner"
-            }
-        },
-        "tests": [
-            {
-                "description": "recurse to anyLeafNode - floats are allowed",
-                "data": { "alpha": 1.1 },
-                "valid": true
-            },
-            {
-                "description": "recurse to integerNode - floats are not allowed",
-                "data": { "november": 1.1 },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "after leaving a dynamic scope, it is not used by a $dynamicRef",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "$id": "https://test.json-schema.org/dynamic-ref-leaving-dynamic-scope/main",
-            "if": {
-                "$id": "first_scope",
-                "$defs": {
-                    "thingy": {
-                        "$comment": "this is first_scope#thingy",
-                        "$dynamicAnchor": "thingy",
-                        "type": "number"
-                    }
-                }
-            },
-            "then": {
-                "$id": "second_scope",
-                "$ref": "start",
-                "$defs": {
-                    "thingy": {
-                        "$comment": "this is second_scope#thingy, the final destination of the $dynamicRef",
-                        "$dynamicAnchor": "thingy",
-                        "type": "null"
-                    }
-                }
-            },
-            "$defs": {
-                "start": {
-                    "$comment": "this is the landing spot from $ref",
-                    "$id": "start",
-                    "$dynamicRef": "inner_scope#thingy"
-                },
-                "thingy": {
-                    "$comment": "this is the first stop for the $dynamicRef",
-                    "$id": "inner_scope",
-                    "$dynamicAnchor": "thingy",
-                    "type": "string"
-                }
-            }
-        },
-        "tests": [
-            {
-                "description": "string matches /$defs/thingy, but the $dynamicRef does not stop here",
-                "data": "a string",
-                "valid": false
-            },
-            {
-                "description": "first_scope is not in dynamic scope for the $dynamicRef",
-                "data": 42,
-                "valid": false
-            },
-            {
-                "description": "/then/$defs/thingy is the final stop for the $dynamicRef",
-                "data": null,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "strict-tree schema, guards against misspelled properties",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "$id": "http://localhost:1234/draft-next/strict-tree.json",
-            "$dynamicAnchor": "node",
-
-            "$ref": "tree.json",
-            "unevaluatedProperties": false
-        },
-        "tests": [
-            {
-                "description": "instance with misspelled field",
-                "data": {
-                    "children": [{
-                            "daat": 1
-                        }]
-                },
-                "valid": false
-            },
-            {
-                "description": "instance with correct field",
-                "data": {
-                    "children": [{
-                            "data": 1
-                        }]
-                },
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "tests for implementation dynamic anchor and reference link",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "$id": "http://localhost:1234/draft-next/strict-extendible.json",
-            "$ref": "extendible-dynamic-ref.json",
-            "$defs": {
-                "elements": {
-                    "$dynamicAnchor": "elements",
-                    "properties": {
-                        "a": true
-                    },
-                    "required": ["a"],
-                    "additionalProperties": false
-                }
-            }
-        },
-        "tests": [
-            {
-                "description": "incorrect parent schema",
-                "data": {
-                    "a": true
-                },
-                "valid": false
-            },
-            {
-                "description": "incorrect extended schema",
-                "data": {
-                    "elements": [
-                        { "b": 1 }
-                    ]
-                },
-                "valid": false
-            },
-            {
-                "description": "correct extended schema",
-                "data": {
-                    "elements": [
-                        { "a": 1 }
-                    ]
-                },
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "$ref and $dynamicAnchor are independent of order - $defs first",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "$id": "http://localhost:1234/draft-next/strict-extendible-allof-defs-first.json",
-            "allOf": [
-                {
-                    "$ref": "extendible-dynamic-ref.json"
-                },
-                {
-                    "$defs": {
-                        "elements": {
-                            "$dynamicAnchor": "elements",
-                            "properties": {
-                                "a": true
-                            },
-                            "required": ["a"],
-                            "additionalProperties": false
-                        }
-                    }
-                }
-            ]
-        },
-        "tests": [
-            {
-                "description": "incorrect parent schema",
-                "data": {
-                    "a": true
-                },
-                "valid": false
-            },
-            {
-                "description": "incorrect extended schema",
-                "data": {
-                    "elements": [
-                        { "b": 1 }
-                    ]
-                },
-                "valid": false
-            },
-            {
-                "description": "correct extended schema",
-                "data": {
-                    "elements": [
-                        { "a": 1 }
-                    ]
-                },
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "$ref and $dynamicAnchor are independent of order - $ref first",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "$id": "http://localhost:1234/draft-next/strict-extendible-allof-ref-first.json",
-            "allOf": [
-                {
-                    "$defs": {
-                        "elements": {
-                            "$dynamicAnchor": "elements",
-                            "properties": {
-                                "a": true
-                            },
-                            "required": ["a"],
-                            "additionalProperties": false
-                        }
-                    }
-                },
-                {
-                    "$ref": "extendible-dynamic-ref.json"
-                }
-            ]
-        },
-        "tests": [
-            {
-                "description": "incorrect parent schema",
-                "data": {
-                    "a": true
-                },
-                "valid": false
-            },
-            {
-                "description": "incorrect extended schema",
-                "data": {
-                    "elements": [
-                        { "b": 1 }
-                    ]
-                },
-                "valid": false
-            },
-            {
-                "description": "correct extended schema",
-                "data": {
-                    "elements": [
-                        { "a": 1 }
-                    ]
-                },
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "$dynamicAnchor inside propertyDependencies",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "$id": "http://localhost:1234/draft-next/dynamicanchor-in-propertydependencies.json",
-            "$defs": {
-                "inner": {
-                    "$id": "inner",
-                    "$dynamicAnchor": "foo",
-                    "type": "object",
-                    "properties": {
-                        "expectedTypes": {
-                            "type": "string"
-                        }
-                    },
-                    "additionalProperties": {
-                        "$dynamicRef": "#foo"
-                    }
-                }
-            },
-            "propertyDependencies": {
-                "expectedTypes": {
-                    "strings": {
-                        "$id": "east",
-                        "$ref": "inner",
-                        "$defs": {
-                            "foo": {
-                                "$dynamicAnchor": "foo",
-                                "type": "string"
-                            }
-                        }
-                    },
-                    "integers": {
-                        "$id": "west",
-                        "$ref": "inner",
-                        "$defs": {
-                            "foo": {
-                                "$dynamicAnchor": "foo",
-                                "type": "integer"
-                            }
-                        }
-                    }
-                }
-            }
-        },
-        "tests": [
-            {
-                "description": "expected strings - additional property as string is valid",
-                "data": {
-                    "expectedTypes": "strings",
-                    "anotherProperty": "also a string"
-                },
-                "valid": true
-            },
-            {
-                "description": "expected strings - additional property as not string is invalid",
-                "data": {
-                    "expectedTypes": "strings",
-                    "anotherProperty": 42
-                },
-                "valid": false
-            },
-            {
-                "description": "expected integers - additional property as integer is valid",
-                "data": {
-                    "expectedTypes": "integers",
-                    "anotherProperty": 42
-                },
-                "valid": true
-            },
-            {
-                "description": "expected integers - additional property as not integer is invalid",
-                "data": {
-                    "expectedTypes": "integers",
-                    "anotherProperty": "a string"
-                },
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft-next/enum.json b/json/tests/draft-next/enum.json
deleted file mode 100644
index 32e5af0..0000000
--- a/json/tests/draft-next/enum.json
+++ /dev/null
@@ -1,262 +0,0 @@
-[
-    {
-        "description": "simple enum validation",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "enum": [1, 2, 3]
-        },
-        "tests": [
-            {
-                "description": "one of the enum is valid",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "something else is invalid",
-                "data": 4,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "heterogeneous enum validation",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "enum": [6, "foo", [], true, {"foo": 12}]
-        },
-        "tests": [
-            {
-                "description": "one of the enum is valid",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "something else is invalid",
-                "data": null,
-                "valid": false
-            },
-            {
-                "description": "objects are deep compared",
-                "data": {"foo": false},
-                "valid": false
-            },
-            {
-                "description": "valid object matches",
-                "data": {"foo": 12},
-                "valid": true
-            },
-            {
-                "description": "extra properties in object is invalid",
-                "data": {"foo": 12, "boo": 42},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "heterogeneous enum-with-null validation",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "enum": [6, null]
-        },
-        "tests": [
-            {
-                "description": "null is valid",
-                "data": null,
-                "valid": true
-            },
-            {
-                "description": "number is valid",
-                "data": 6,
-                "valid": true
-            },
-            {
-                "description": "something else is invalid",
-                "data": "test",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "enums in properties",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "type":"object",
-            "properties": {
-                "foo": {"enum":["foo"]},
-                "bar": {"enum":["bar"]}
-            },
-            "required": ["bar"]
-        },
-        "tests": [
-            {
-                "description": "both properties are valid",
-                "data": {"foo":"foo", "bar":"bar"},
-                "valid": true
-            },
-            {
-                "description": "wrong foo value",
-                "data": {"foo":"foot", "bar":"bar"},
-                "valid": false
-            },
-            {
-                "description": "wrong bar value",
-                "data": {"foo":"foo", "bar":"bart"},
-                "valid": false
-            },
-            {
-                "description": "missing optional property is valid",
-                "data": {"bar":"bar"},
-                "valid": true
-            },
-            {
-                "description": "missing required property is invalid",
-                "data": {"foo":"foo"},
-                "valid": false
-            },
-            {
-                "description": "missing all properties is invalid",
-                "data": {},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "enum with escaped characters",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "enum": ["foo\nbar", "foo\rbar"]
-        },
-        "tests": [
-            {
-                "description": "member 1 is valid",
-                "data": "foo\nbar",
-                "valid": true
-            },
-            {
-                "description": "member 2 is valid",
-                "data": "foo\rbar",
-                "valid": true
-            },
-            {
-                "description": "another string is invalid",
-                "data": "abc",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "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": "integer zero is invalid",
-                "data": 0,
-                "valid": false
-            },
-            {
-                "description": "float zero is invalid",
-                "data": 0.0,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "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": "integer one is invalid",
-                "data": 1,
-                "valid": false
-            },
-            {
-                "description": "float one is invalid",
-                "data": 1.0,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "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": "integer zero is valid",
-                "data": 0,
-                "valid": true
-            },
-            {
-                "description": "float zero is valid",
-                "data": 0.0,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "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": "integer one is valid",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "float one is valid",
-                "data": 1.0,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "nul characters in strings",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "enum": [ "hello\u0000there" ]
-        },
-        "tests": [
-            {
-                "description": "match string with nul",
-                "data": "hello\u0000there",
-                "valid": true
-            },
-            {
-                "description": "do not match string lacking nul",
-                "data": "hellothere",
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft-next/exclusiveMaximum.json b/json/tests/draft-next/exclusiveMaximum.json
deleted file mode 100644
index 6ec4752..0000000
--- a/json/tests/draft-next/exclusiveMaximum.json
+++ /dev/null
@@ -1,31 +0,0 @@
-[
-    {
-        "description": "exclusiveMaximum validation",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "exclusiveMaximum": 3.0
-        },
-        "tests": [
-            {
-                "description": "below the exclusiveMaximum is valid",
-                "data": 2.2,
-                "valid": true
-            },
-            {
-                "description": "boundary point is invalid",
-                "data": 3.0,
-                "valid": false
-            },
-            {
-                "description": "above the exclusiveMaximum is invalid",
-                "data": 3.5,
-                "valid": false
-            },
-            {
-                "description": "ignores non-numbers",
-                "data": "x",
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft-next/exclusiveMinimum.json b/json/tests/draft-next/exclusiveMinimum.json
deleted file mode 100644
index 9026298..0000000
--- a/json/tests/draft-next/exclusiveMinimum.json
+++ /dev/null
@@ -1,31 +0,0 @@
-[
-    {
-        "description": "exclusiveMinimum validation",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "exclusiveMinimum": 1.1
-        },
-        "tests": [
-            {
-                "description": "above the exclusiveMinimum is valid",
-                "data": 1.2,
-                "valid": true
-            },
-            {
-                "description": "boundary point is invalid",
-                "data": 1.1,
-                "valid": false
-            },
-            {
-                "description": "below the exclusiveMinimum is invalid",
-                "data": 0.6,
-                "valid": false
-            },
-            {
-                "description": "ignores non-numbers",
-                "data": "x",
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft-next/format.json b/json/tests/draft-next/format.json
deleted file mode 100644
index 43a8bd6..0000000
--- a/json/tests/draft-next/format.json
+++ /dev/null
@@ -1,743 +0,0 @@
-[
-    {
-        "description": "email format",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "format": "email"
-        },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "idn-email format",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "format": "idn-email"
-        },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "regex format",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "format": "regex"
-        },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "ipv4 format",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "format": "ipv4"
-        },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "ipv6 format",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "format": "ipv6"
-        },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "idn-hostname format",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "format": "idn-hostname"
-        },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "hostname format",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "format": "hostname"
-        },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "date format",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "format": "date"
-        },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "date-time format",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "format": "date-time"
-        },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "time format",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "format": "time"
-        },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "json-pointer format",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "format": "json-pointer"
-        },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "relative-json-pointer format",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "format": "relative-json-pointer"
-        },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "iri format",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "format": "iri"
-        },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "iri-reference format",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "format": "iri-reference"
-        },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "uri format",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "format": "uri"
-        },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "uri-reference format",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "format": "uri-reference"
-        },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "uri-template format",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "format": "uri-template"
-        },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "uuid format",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "format": "uuid"
-        },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "duration format",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "format": "duration"
-        },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft-next/id.json b/json/tests/draft-next/id.json
deleted file mode 100644
index 9b3a591..0000000
--- a/json/tests/draft-next/id.json
+++ /dev/null
@@ -1,294 +0,0 @@
-[
-    {
-        "description": "Invalid use of fragments in location-independent $id",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "$ref": "https://json-schema.org/draft/next/schema"
-        },
-        "tests": [
-            {
-                "description": "Identifier name",
-                "data": {
-                    "$ref": "#foo",
-                    "$defs": {
-                        "A": {
-                            "$id": "#foo",
-                            "type": "integer"
-                        }
-                    }
-                },
-                "valid": false
-            },
-            {
-                "description": "Identifier name and no ref",
-                "data": {
-                    "$defs": {
-                        "A": { "$id": "#foo" }
-                    }
-                },
-                "valid": false
-            },
-            {
-                "description": "Identifier path",
-                "data": {
-                    "$ref": "#/a/b",
-                    "$defs": {
-                        "A": {
-                            "$id": "#/a/b",
-                            "type": "integer"
-                        }
-                    }
-                },
-                "valid": false
-            },
-            {
-                "description": "Identifier name with absolute URI",
-                "data": {
-                    "$ref": "http://localhost:1234/draft-next/bar#foo",
-                    "$defs": {
-                        "A": {
-                            "$id": "http://localhost:1234/draft-next/bar#foo",
-                            "type": "integer"
-                        }
-                    }
-                },
-                "valid": false
-            },
-            {
-                "description": "Identifier path with absolute URI",
-                "data": {
-                    "$ref": "http://localhost:1234/draft-next/bar#/a/b",
-                    "$defs": {
-                        "A": {
-                            "$id": "http://localhost:1234/draft-next/bar#/a/b",
-                            "type": "integer"
-                        }
-                    }
-                },
-                "valid": false
-            },
-            {
-                "description": "Identifier name with base URI change in subschema",
-                "data": {
-                    "$id": "http://localhost:1234/draft-next/root",
-                    "$ref": "http://localhost:1234/draft-next/nested.json#foo",
-                    "$defs": {
-                        "A": {
-                            "$id": "nested.json",
-                            "$defs": {
-                                "B": {
-                                    "$id": "#foo",
-                                    "type": "integer"
-                                }
-                            }
-                        }
-                    }
-                },
-                "valid": false
-            },
-            {
-                "description": "Identifier path with base URI change in subschema",
-                "data": {
-                    "$id": "http://localhost:1234/draft-next/root",
-                    "$ref": "http://localhost:1234/draft-next/nested.json#/a/b",
-                    "$defs": {
-                        "A": {
-                            "$id": "nested.json",
-                            "$defs": {
-                                "B": {
-                                    "$id": "#/a/b",
-                                    "type": "integer"
-                                }
-                            }
-                        }
-                    }
-                },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "Valid use of empty fragments in location-independent $id",
-        "comment": "These are allowed but discouraged",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "$ref": "https://json-schema.org/draft/next/schema"
-        },
-        "tests": [
-            {
-                "description": "Identifier name with absolute URI",
-                "data": {
-                    "$ref": "http://localhost:1234/draft-next/bar",
-                    "$defs": {
-                        "A": {
-                            "$id": "http://localhost:1234/draft-next/bar#",
-                            "type": "integer"
-                        }
-                    }
-                },
-                "valid": true
-            },
-            {
-                "description": "Identifier name with base URI change in subschema",
-                "data": {
-                    "$id": "http://localhost:1234/draft-next/root",
-                    "$ref": "http://localhost:1234/draft-next/nested.json#/$defs/B",
-                    "$defs": {
-                        "A": {
-                            "$id": "nested.json",
-                            "$defs": {
-                                "B": {
-                                    "$id": "#",
-                                    "type": "integer"
-                                }
-                            }
-                        }
-                    }
-                },
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "Unnormalized $ids are allowed but discouraged",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "$ref": "https://json-schema.org/draft/next/schema"
-        },
-        "tests": [
-            {
-                "description": "Unnormalized identifier",
-                "data": {
-                    "$ref": "http://localhost:1234/draft-next/foo/baz",
-                    "$defs": {
-                        "A": {
-                            "$id": "http://localhost:1234/draft-next/foo/bar/../baz",
-                            "type": "integer"
-                        }
-                    }
-                },
-                "valid": true
-            },
-            {
-                "description": "Unnormalized identifier and no ref",
-                "data": {
-                    "$defs": {
-                        "A": {
-                            "$id": "http://localhost:1234/draft-next/foo/bar/../baz",
-                            "type": "integer"
-                        }
-                    }
-                },
-                "valid": true
-            },
-            {
-                "description": "Unnormalized identifier with empty fragment",
-                "data": {
-                    "$ref": "http://localhost:1234/draft-next/foo/baz",
-                    "$defs": {
-                        "A": {
-                            "$id": "http://localhost:1234/draft-next/foo/bar/../baz#",
-                            "type": "integer"
-                        }
-                    }
-                },
-                "valid": true
-            },
-            {
-                "description": "Unnormalized identifier with empty fragment and no ref",
-                "data": {
-                    "$defs": {
-                        "A": {
-                            "$id": "http://localhost:1234/draft-next/foo/bar/../baz#",
-                            "type": "integer"
-                        }
-                    }
-                },
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "$id inside an enum is not a real identifier",
-        "comment": "the implementation must not be confused by an $id buried in the enum",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "$defs": {
-                "id_in_enum": {
-                    "enum": [
-                        {
-                          "$id": "https://localhost:1234/draft-next/id/my_identifier.json",
-                          "type": "null"
-                        }
-                    ]
-                },
-                "real_id_in_schema": {
-                    "$id": "https://localhost:1234/draft-next/id/my_identifier.json",
-                    "type": "string"
-                },
-                "zzz_id_in_const": {
-                    "const": {
-                        "$id": "https://localhost:1234/draft-next/id/my_identifier.json",
-                        "type": "null"
-                    }
-                }
-            },
-            "anyOf": [
-                { "$ref": "#/$defs/id_in_enum" },
-                { "$ref": "https://localhost:1234/draft-next/id/my_identifier.json" }
-            ]
-        },
-        "tests": [
-            {
-                "description": "exact match to enum, and type matches",
-                "data": {
-                    "$id": "https://localhost:1234/draft-next/id/my_identifier.json",
-                    "type": "null"
-                },
-                "valid": true
-            },
-            {
-                "description": "match $ref to $id",
-                "data": "a string to match #/$defs/id_in_enum",
-                "valid": true
-            },
-            {
-                "description": "no match on enum or $ref to $id",
-                "data": 1,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "non-schema object containing an $id property",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "$defs": {
-                "const_not_id": {
-                    "const": {
-                        "$id": "not_a_real_id"
-                    }
-                }
-            },
-            "if": {
-                "const": "skip not_a_real_id"
-            },
-            "then": true,
-            "else" : {
-                "$ref": "#/$defs/const_not_id"
-            }
-        },
-        "tests": [
-            {
-                "description": "skip traversing definition for a valid result",
-                "data": "skip not_a_real_id",
-                "valid": true
-            },
-            {
-                "description": "const at const_not_id does not match",
-                "data": 1,
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft-next/if-then-else.json b/json/tests/draft-next/if-then-else.json
deleted file mode 100644
index 70576c4..0000000
--- a/json/tests/draft-next/if-then-else.json
+++ /dev/null
@@ -1,268 +0,0 @@
-[
-    {
-        "description": "ignore if without then or else",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "if": {
-                "const": 0
-            }
-        },
-        "tests": [
-            {
-                "description": "valid when valid against lone if",
-                "data": 0,
-                "valid": true
-            },
-            {
-                "description": "valid when invalid against lone if",
-                "data": "hello",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "ignore then without if",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "then": {
-                "const": 0
-            }
-        },
-        "tests": [
-            {
-                "description": "valid when valid against lone then",
-                "data": 0,
-                "valid": true
-            },
-            {
-                "description": "valid when invalid against lone then",
-                "data": "hello",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "ignore else without if",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "else": {
-                "const": 0
-            }
-        },
-        "tests": [
-            {
-                "description": "valid when valid against lone else",
-                "data": 0,
-                "valid": true
-            },
-            {
-                "description": "valid when invalid against lone else",
-                "data": "hello",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "if and then without else",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "if": {
-                "exclusiveMaximum": 0
-            },
-            "then": {
-                "minimum": -10
-            }
-        },
-        "tests": [
-            {
-                "description": "valid through then",
-                "data": -1,
-                "valid": true
-            },
-            {
-                "description": "invalid through then",
-                "data": -100,
-                "valid": false
-            },
-            {
-                "description": "valid when if test fails",
-                "data": 3,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "if and else without then",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "if": {
-                "exclusiveMaximum": 0
-            },
-            "else": {
-                "multipleOf": 2
-            }
-        },
-        "tests": [
-            {
-                "description": "valid when if test passes",
-                "data": -1,
-                "valid": true
-            },
-            {
-                "description": "valid through else",
-                "data": 4,
-                "valid": true
-            },
-            {
-                "description": "invalid through else",
-                "data": 3,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "validate against correct branch, then vs else",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "if": {
-                "exclusiveMaximum": 0
-            },
-            "then": {
-                "minimum": -10
-            },
-            "else": {
-                "multipleOf": 2
-            }
-        },
-        "tests": [
-            {
-                "description": "valid through then",
-                "data": -1,
-                "valid": true
-            },
-            {
-                "description": "invalid through then",
-                "data": -100,
-                "valid": false
-            },
-            {
-                "description": "valid through else",
-                "data": 4,
-                "valid": true
-            },
-            {
-                "description": "invalid through else",
-                "data": 3,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "non-interference across combined schemas",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "allOf": [
-                {
-                    "if": {
-                        "exclusiveMaximum": 0
-                    }
-                },
-                {
-                    "then": {
-                        "minimum": -10
-                    }
-                },
-                {
-                    "else": {
-                        "multipleOf": 2
-                    }
-                }
-            ]
-        },
-        "tests": [
-            {
-                "description": "valid, but would have been invalid through then",
-                "data": -100,
-                "valid": true
-            },
-            {
-                "description": "valid, but would have been invalid through else",
-                "data": 3,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "if with boolean schema true",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "if": true,
-            "then": { "const": "then" },
-            "else": { "const": "else" }
-        },
-        "tests": [
-            {
-                "description": "boolean schema true in if always chooses the then path (valid)",
-                "data": "then",
-                "valid": true
-            },
-            {
-                "description": "boolean schema true in if always chooses the then path (invalid)",
-                "data": "else",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "if with boolean schema false",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "if": false,
-            "then": { "const": "then" },
-            "else": { "const": "else" }
-        },
-        "tests": [
-            {
-                "description": "boolean schema false in if always chooses the else path (invalid)",
-                "data": "then",
-                "valid": false
-            },
-            {
-                "description": "boolean schema false in if always chooses the else path (valid)",
-                "data": "else",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "if appears at the end when serialized (keyword processing sequence)",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "then": { "const": "yes" },
-            "else": { "const": "other" },
-            "if": { "maxLength": 4 }
-        },
-        "tests": [
-            {
-                "description": "yes redirects to then and passes",
-                "data": "yes",
-                "valid": true
-            },
-            {
-                "description": "other redirects to else and passes",
-                "data": "other",
-                "valid": true
-            },
-            {
-                "description": "no redirects to then and fails",
-                "data": "no",
-                "valid": false
-            },
-            {
-                "description": "invalid redirects to else and fails",
-                "data": "invalid",
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft-next/infinite-loop-detection.json b/json/tests/draft-next/infinite-loop-detection.json
deleted file mode 100644
index fa66743..0000000
--- a/json/tests/draft-next/infinite-loop-detection.json
+++ /dev/null
@@ -1,37 +0,0 @@
-[
-    {
-        "description": "evaluating the same schema location against the same data location twice is not a sign of an infinite loop",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "$defs": {
-                "int": { "type": "integer" }
-            },
-            "allOf": [
-                {
-                    "properties": {
-                        "foo": {
-                            "$ref": "#/$defs/int"
-                        }
-                    }
-                },
-                {
-                    "additionalProperties": {
-                        "$ref": "#/$defs/int"
-                    }
-                }
-            ]
-        },
-        "tests": [
-            {
-                "description": "passing case",
-                "data": { "foo": 1 },
-                "valid": true
-            },
-            {
-                "description": "failing case",
-                "data": { "foo": "a string" },
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft-next/items.json b/json/tests/draft-next/items.json
deleted file mode 100644
index 459943b..0000000
--- a/json/tests/draft-next/items.json
+++ /dev/null
@@ -1,284 +0,0 @@
-[
-    {
-        "description": "a schema given for items",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "items": {"type": "integer"}
-        },
-        "tests": [
-            {
-                "description": "valid items",
-                "data": [ 1, 2, 3 ],
-                "valid": true
-            },
-            {
-                "description": "wrong type of items",
-                "data": [1, "x"],
-                "valid": false
-            },
-            {
-                "description": "ignores non-arrays",
-                "data": {"foo" : "bar"},
-                "valid": true
-            },
-            {
-                "description": "JavaScript pseudo-array is valid",
-                "data": {
-                    "0": "invalid",
-                    "length": 1
-                },
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "items with boolean schema (true)",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "items": true
-        },
-        "tests": [
-            {
-                "description": "any array is valid",
-                "data": [ 1, "foo", true ],
-                "valid": true
-            },
-            {
-                "description": "empty array is valid",
-                "data": [],
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "items with boolean schema (false)",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "items": false
-        },
-        "tests": [
-            {
-                "description": "any non-empty array is invalid",
-                "data": [ 1, "foo", true ],
-                "valid": false
-            },
-            {
-                "description": "empty array is valid",
-                "data": [],
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "items and subitems",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "$defs": {
-                "item": {
-                    "type": "array",
-                    "items": false,
-                    "prefixItems": [
-                        { "$ref": "#/$defs/sub-item" },
-                        { "$ref": "#/$defs/sub-item" }
-                    ]
-                },
-                "sub-item": {
-                    "type": "object",
-                    "required": ["foo"]
-                }
-            },
-            "type": "array",
-            "items": false,
-            "prefixItems": [
-                { "$ref": "#/$defs/item" },
-                { "$ref": "#/$defs/item" },
-                { "$ref": "#/$defs/item" }
-            ]
-        },
-        "tests": [
-            {
-                "description": "valid items",
-                "data": [
-                    [ {"foo": null}, {"foo": null} ],
-                    [ {"foo": null}, {"foo": null} ],
-                    [ {"foo": null}, {"foo": null} ]
-                ],
-                "valid": true
-            },
-            {
-                "description": "too many items",
-                "data": [
-                    [ {"foo": null}, {"foo": null} ],
-                    [ {"foo": null}, {"foo": null} ],
-                    [ {"foo": null}, {"foo": null} ],
-                    [ {"foo": null}, {"foo": null} ]
-                ],
-                "valid": false
-            },
-            {
-                "description": "too many sub-items",
-                "data": [
-                    [ {"foo": null}, {"foo": null}, {"foo": null} ],
-                    [ {"foo": null}, {"foo": null} ],
-                    [ {"foo": null}, {"foo": null} ]
-                ],
-                "valid": false
-            },
-            {
-                "description": "wrong item",
-                "data": [
-                    {"foo": null},
-                    [ {"foo": null}, {"foo": null} ],
-                    [ {"foo": null}, {"foo": null} ]
-                ],
-                "valid": false
-            },
-            {
-                "description": "wrong sub-item",
-                "data": [
-                    [ {}, {"foo": null} ],
-                    [ {"foo": null}, {"foo": null} ],
-                    [ {"foo": null}, {"foo": null} ]
-                ],
-                "valid": false
-            },
-            {
-                "description": "fewer items is valid",
-                "data": [
-                    [ {"foo": null} ],
-                    [ {"foo": null} ]
-                ],
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "nested items",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "type": "array",
-            "items": {
-                "type": "array",
-                "items": {
-                    "type": "array",
-                    "items": {
-                        "type": "array",
-                        "items": {
-                            "type": "number"
-                        }
-                    }
-                }
-            }
-        },
-        "tests": [
-            {
-                "description": "valid nested array",
-                "data": [[[[1]], [[2],[3]]], [[[4], [5], [6]]]],
-                "valid": true
-            },
-            {
-                "description": "nested array with invalid type",
-                "data": [[[["1"]], [[2],[3]]], [[[4], [5], [6]]]],
-                "valid": false
-            },
-            {
-                "description": "not deep enough",
-                "data": [[[1], [2],[3]], [[4], [5], [6]]],
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "prefixItems with no additional items allowed",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "prefixItems": [{}, {}, {}],
-            "items": false
-        },
-        "tests": [
-            {
-                "description": "empty array",
-                "data": [ ],
-                "valid": true
-            },
-            {
-                "description": "fewer number of items present (1)",
-                "data": [ 1 ],
-                "valid": true
-            },
-            {
-                "description": "fewer number of items present (2)",
-                "data": [ 1, 2 ],
-                "valid": true
-            },
-            {
-                "description": "equal number of items present",
-                "data": [ 1, 2, 3 ],
-                "valid": true
-            },
-            {
-                "description": "additional items are not permitted",
-                "data": [ 1, 2, 3, 4 ],
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "items does not look in applicators, valid case",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "allOf": [
-                { "prefixItems": [ { "minimum": 3 } ] }
-            ],
-            "items": { "minimum": 5 }
-        },
-        "tests": [
-            {
-                "description": "prefixItems in allOf does not constrain items, invalid case",
-                "data": [ 3, 5 ],
-                "valid": false
-            },
-            {
-                "description": "prefixItems in allOf does not constrain items, valid case",
-                "data": [ 5, 5 ],
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "prefixItems validation adjusts the starting index for items",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "prefixItems": [ { "type": "string" } ],
-            "items": { "type": "integer" }
-        },
-        "tests": [
-            {
-                "description": "valid items",
-                "data": [ "x", 2, 3 ],
-                "valid": true
-            },
-            {
-                "description": "wrong type of second item",
-                "data": [ "x", "y" ],
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "items with null instance elements",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "items": {
-                "type": "null"
-            }
-        },
-        "tests": [
-            {
-                "description": "allows null elements",
-                "data": [ null ],
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft-next/maxContains.json b/json/tests/draft-next/maxContains.json
deleted file mode 100644
index 7c15157..0000000
--- a/json/tests/draft-next/maxContains.json
+++ /dev/null
@@ -1,152 +0,0 @@
-[
-    {
-        "description": "maxContains without contains is ignored",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "maxContains": 1
-        },
-        "tests": [
-            {
-                "description": "one item valid against lone maxContains",
-                "data": [1],
-                "valid": true
-            },
-            {
-                "description": "two items still valid against lone maxContains",
-                "data": [1, 2],
-                "valid": true
-            },
-            {
-                "description": "one property valid against lone maxContains",
-                "data": { "a": 1 },
-                "valid": true
-            },
-            {
-                "description": "two properties still valid against lone maxContains",
-                "data": { "a": 1, "b": 2 },
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "maxContains with contains",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "contains": { "const": 1 },
-            "maxContains": 1
-        },
-        "tests": [
-            {
-                "description": "empty array",
-                "data": [],
-                "valid": false
-            },
-            {
-                "description": "all elements match, valid maxContains",
-                "data": [1],
-                "valid": true
-            },
-            {
-                "description": "all elements match, invalid maxContains",
-                "data": [1, 1],
-                "valid": false
-            },
-            {
-                "description": "some elements match, valid maxContains",
-                "data": [1, 2],
-                "valid": true
-            },
-            {
-                "description": "some elements match, invalid maxContains",
-                "data": [1, 2, 1],
-                "valid": false
-            },
-            {
-                "description": "empty object",
-                "data": {},
-                "valid": false
-            },
-            {
-                "description": "all properties match, valid maxContains",
-                "data": { "a": 1 },
-                "valid": true
-            },
-            {
-                "description": "all properties match, invalid maxContains",
-                "data": { "a": 1, "b": 1 },
-                "valid": false
-            },
-            {
-                "description": "some properties match, valid maxContains",
-                "data": { "a": 1, "b": 2 },
-                "valid": true
-            },
-            {
-                "description": "some properties match, invalid maxContains",
-                "data": { "a": 1, "b": 2, "c": 1 },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "maxContains with contains, value with a decimal",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "contains": {"const": 1},
-            "maxContains": 1.0
-        },
-        "tests": [
-            {
-                "description": "one element matches, valid maxContains",
-                "data": [ 1 ],
-                "valid": true
-            },
-            {
-                "description": "too many elements match, invalid maxContains",
-                "data": [ 1, 1 ],
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "minContains < maxContains",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "contains": { "const": 1 },
-            "minContains": 1,
-            "maxContains": 3
-        },
-        "tests": [
-            {
-                "description": "array with actual < minContains < maxContains",
-                "data": [],
-                "valid": false
-            },
-            {
-                "description": "array with minContains < actual < maxContains",
-                "data": [1, 1],
-                "valid": true
-            },
-            {
-                "description": "array with minContains < maxContains < actual",
-                "data": [1, 1, 1, 1],
-                "valid": false
-            },
-            {
-                "description": "object with actual < minContains < maxContains",
-                "data": {},
-                "valid": false
-            },
-            {
-                "description": "object with minContains < actual < maxContains",
-                "data": { "a": 1, "b": 1 },
-                "valid": true
-            },
-            {
-                "description": "object with minContains < maxContains < actual",
-                "data": { "a": 1, "b": 1, "c": 1, "d": 1 },
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft-next/maxItems.json b/json/tests/draft-next/maxItems.json
deleted file mode 100644
index b215850..0000000
--- a/json/tests/draft-next/maxItems.json
+++ /dev/null
@@ -1,50 +0,0 @@
-[
-    {
-        "description": "maxItems validation",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "maxItems": 2
-        },
-        "tests": [
-            {
-                "description": "shorter is valid",
-                "data": [1],
-                "valid": true
-            },
-            {
-                "description": "exact length is valid",
-                "data": [1, 2],
-                "valid": true
-            },
-            {
-                "description": "too long is invalid",
-                "data": [1, 2, 3],
-                "valid": false
-            },
-            {
-                "description": "ignores non-arrays",
-                "data": "foobar",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "maxItems validation with a decimal",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "maxItems": 2.0
-        },
-        "tests": [
-            {
-                "description": "shorter is valid",
-                "data": [1],
-                "valid": true
-            },
-            {
-                "description": "too long is invalid",
-                "data": [1, 2, 3],
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft-next/maxLength.json b/json/tests/draft-next/maxLength.json
deleted file mode 100644
index e09e44a..0000000
--- a/json/tests/draft-next/maxLength.json
+++ /dev/null
@@ -1,55 +0,0 @@
-[
-    {
-        "description": "maxLength validation",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "maxLength": 2
-        },
-        "tests": [
-            {
-                "description": "shorter is valid",
-                "data": "f",
-                "valid": true
-            },
-            {
-                "description": "exact length is valid",
-                "data": "fo",
-                "valid": true
-            },
-            {
-                "description": "too long is invalid",
-                "data": "foo",
-                "valid": false
-            },
-            {
-                "description": "ignores non-strings",
-                "data": 100,
-                "valid": true
-            },
-            {
-                "description": "two supplementary Unicode code points is long enough",
-                "data": "\uD83D\uDCA9\uD83D\uDCA9",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "maxLength validation with a decimal",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "maxLength": 2.0
-        },
-        "tests": [
-            {
-                "description": "shorter is valid",
-                "data": "f",
-                "valid": true
-            },
-            {
-                "description": "too long is invalid",
-                "data": "foo",
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft-next/maxProperties.json b/json/tests/draft-next/maxProperties.json
deleted file mode 100644
index 5eec9da..0000000
--- a/json/tests/draft-next/maxProperties.json
+++ /dev/null
@@ -1,79 +0,0 @@
-[
-    {
-        "description": "maxProperties validation",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "maxProperties": 2
-        },
-        "tests": [
-            {
-                "description": "shorter is valid",
-                "data": {"foo": 1},
-                "valid": true
-            },
-            {
-                "description": "exact length is valid",
-                "data": {"foo": 1, "bar": 2},
-                "valid": true
-            },
-            {
-                "description": "too long is invalid",
-                "data": {"foo": 1, "bar": 2, "baz": 3},
-                "valid": false
-            },
-            {
-                "description": "ignores arrays",
-                "data": [1, 2, 3],
-                "valid": true
-            },
-            {
-                "description": "ignores strings",
-                "data": "foobar",
-                "valid": true
-            },
-            {
-                "description": "ignores other non-objects",
-                "data": 12,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "maxProperties validation with a decimal",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "maxProperties": 2.0
-        },
-        "tests": [
-            {
-                "description": "shorter is valid",
-                "data": {"foo": 1},
-                "valid": true
-            },
-            {
-                "description": "too long is invalid",
-                "data": {"foo": 1, "bar": 2, "baz": 3},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "maxProperties = 0 means the object is empty",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "maxProperties": 0
-        },
-        "tests": [
-            {
-                "description": "no properties is valid",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "one property is invalid",
-                "data": { "foo": 1 },
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft-next/maximum.json b/json/tests/draft-next/maximum.json
deleted file mode 100644
index 656ce81..0000000
--- a/json/tests/draft-next/maximum.json
+++ /dev/null
@@ -1,60 +0,0 @@
-[
-    {
-        "description": "maximum validation",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "maximum": 3.0
-        },
-        "tests": [
-            {
-                "description": "below the maximum is valid",
-                "data": 2.6,
-                "valid": true
-            },
-            {
-                "description": "boundary point is valid",
-                "data": 3.0,
-                "valid": true
-            },
-            {
-                "description": "above the maximum is invalid",
-                "data": 3.5,
-                "valid": false
-            },
-            {
-                "description": "ignores non-numbers",
-                "data": "x",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "maximum validation with unsigned integer",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "maximum": 300
-        },
-        "tests":  [
-            {
-                "description": "below the maximum is invalid",
-                "data": 299.97,
-                "valid": true
-            },
-            {
-                "description": "boundary point integer is valid",
-                "data": 300,
-                "valid": true
-            },
-            {
-                "description": "boundary point float is valid",
-                "data": 300.00,
-                "valid": true
-            },
-            {
-                "description": "above the maximum is invalid",
-                "data": 300.5,
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft-next/minContains.json b/json/tests/draft-next/minContains.json
deleted file mode 100644
index a6ad212..0000000
--- a/json/tests/draft-next/minContains.json
+++ /dev/null
@@ -1,224 +0,0 @@
-[
-    {
-        "description": "minContains without contains is ignored",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "minContains": 1
-        },
-        "tests": [
-            {
-                "description": "one item valid against lone minContains",
-                "data": [1],
-                "valid": true
-            },
-            {
-                "description": "zero items still valid against lone minContains",
-                "data": [],
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "minContains=1 with contains",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "contains": { "const": 1 },
-            "minContains": 1
-        },
-        "tests": [
-            {
-                "description": "empty data",
-                "data": [],
-                "valid": false
-            },
-            {
-                "description": "no elements match",
-                "data": [2],
-                "valid": false
-            },
-            {
-                "description": "single element matches, valid minContains",
-                "data": [1],
-                "valid": true
-            },
-            {
-                "description": "some elements match, valid minContains",
-                "data": [1, 2],
-                "valid": true
-            },
-            {
-                "description": "all elements match, valid minContains",
-                "data": [1, 1],
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "minContains=2 with contains",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "contains": { "const": 1 },
-            "minContains": 2
-        },
-        "tests": [
-            {
-                "description": "empty data",
-                "data": [],
-                "valid": false
-            },
-            {
-                "description": "all elements match, invalid minContains",
-                "data": [1],
-                "valid": false
-            },
-            {
-                "description": "some elements match, invalid minContains",
-                "data": [1, 2],
-                "valid": false
-            },
-            {
-                "description": "all elements match, valid minContains (exactly as needed)",
-                "data": [1, 1],
-                "valid": true
-            },
-            {
-                "description": "all elements match, valid minContains (more than needed)",
-                "data": [1, 1, 1],
-                "valid": true
-            },
-            {
-                "description": "some elements match, valid minContains",
-                "data": [1, 2, 1],
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "minContains=2 with contains with a decimal value",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "contains": {"const": 1},
-            "minContains": 2.0
-        },
-        "tests": [
-            {
-                "description": "one element matches, invalid minContains",
-                "data": [ 1 ],
-                "valid": false
-            },
-            {
-                "description": "both elements match, valid minContains",
-                "data": [ 1, 1 ],
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "maxContains = minContains",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "contains": { "const": 1 },
-            "maxContains": 2,
-            "minContains": 2
-        },
-        "tests": [
-            {
-                "description": "empty data",
-                "data": [],
-                "valid": false
-            },
-            {
-                "description": "all elements match, invalid minContains",
-                "data": [1],
-                "valid": false
-            },
-            {
-                "description": "all elements match, invalid maxContains",
-                "data": [1, 1, 1],
-                "valid": false
-            },
-            {
-                "description": "all elements match, valid maxContains and minContains",
-                "data": [1, 1],
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "maxContains < minContains",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "contains": { "const": 1 },
-            "maxContains": 1,
-            "minContains": 3
-        },
-        "tests": [
-            {
-                "description": "empty data",
-                "data": [],
-                "valid": false
-            },
-            {
-                "description": "invalid minContains",
-                "data": [1],
-                "valid": false
-            },
-            {
-                "description": "invalid maxContains",
-                "data": [1, 1, 1],
-                "valid": false
-            },
-            {
-                "description": "invalid maxContains and minContains",
-                "data": [1, 1],
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "minContains = 0",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "contains": { "const": 1 },
-            "minContains": 0
-        },
-        "tests": [
-            {
-                "description": "empty data",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "minContains = 0 makes contains always pass",
-                "data": [2],
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "minContains = 0 with maxContains",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "contains": {"const": 1},
-            "minContains": 0,
-            "maxContains": 1
-        },
-        "tests": [
-            {
-                "description": "empty data",
-                "data": [ ],
-                "valid": true
-            },
-            {
-                "description": "not more than maxContains",
-                "data": [ 1 ],
-                "valid": true
-            },
-            {
-                "description": "too many",
-                "data": [ 1, 1 ],
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft-next/minItems.json b/json/tests/draft-next/minItems.json
deleted file mode 100644
index b0e1c72..0000000
--- a/json/tests/draft-next/minItems.json
+++ /dev/null
@@ -1,50 +0,0 @@
-[
-    {
-        "description": "minItems validation",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "minItems": 1
-        },
-        "tests": [
-            {
-                "description": "longer is valid",
-                "data": [1, 2],
-                "valid": true
-            },
-            {
-                "description": "exact length is valid",
-                "data": [1],
-                "valid": true
-            },
-            {
-                "description": "too short is invalid",
-                "data": [],
-                "valid": false
-            },
-            {
-                "description": "ignores non-arrays",
-                "data": "",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "minItems validation with a decimal",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "minItems": 1.0
-        },
-        "tests": [
-            {
-                "description": "longer is valid",
-                "data": [1, 2],
-                "valid": true
-            },
-            {
-                "description": "too short is invalid",
-                "data": [],
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft-next/minLength.json b/json/tests/draft-next/minLength.json
deleted file mode 100644
index 16022ac..0000000
--- a/json/tests/draft-next/minLength.json
+++ /dev/null
@@ -1,55 +0,0 @@
-[
-    {
-        "description": "minLength validation",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "minLength": 2
-        },
-        "tests": [
-            {
-                "description": "longer is valid",
-                "data": "foo",
-                "valid": true
-            },
-            {
-                "description": "exact length is valid",
-                "data": "fo",
-                "valid": true
-            },
-            {
-                "description": "too short is invalid",
-                "data": "f",
-                "valid": false
-            },
-            {
-                "description": "ignores non-strings",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "one supplementary Unicode code point is not long enough",
-                "data": "\uD83D\uDCA9",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "minLength validation with a decimal",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "minLength": 2.0
-        },
-        "tests": [
-            {
-                "description": "longer is valid",
-                "data": "foo",
-                "valid": true
-            },
-            {
-                "description": "too short is invalid",
-                "data": "f",
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft-next/minProperties.json b/json/tests/draft-next/minProperties.json
deleted file mode 100644
index 434c0f1..0000000
--- a/json/tests/draft-next/minProperties.json
+++ /dev/null
@@ -1,60 +0,0 @@
-[
-    {
-        "description": "minProperties validation",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "minProperties": 1
-        },
-        "tests": [
-            {
-                "description": "longer is valid",
-                "data": {"foo": 1, "bar": 2},
-                "valid": true
-            },
-            {
-                "description": "exact length is valid",
-                "data": {"foo": 1},
-                "valid": true
-            },
-            {
-                "description": "too short is invalid",
-                "data": {},
-                "valid": false
-            },
-            {
-                "description": "ignores arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "ignores strings",
-                "data": "",
-                "valid": true
-            },
-            {
-                "description": "ignores other non-objects",
-                "data": 12,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "minProperties validation with a decimal",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "minProperties": 1.0
-        },
-        "tests": [
-            {
-                "description": "longer is valid",
-                "data": {"foo": 1, "bar": 2},
-                "valid": true
-            },
-            {
-                "description": "too short is invalid",
-                "data": {},
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft-next/minimum.json b/json/tests/draft-next/minimum.json
deleted file mode 100644
index 2c6f71f..0000000
--- a/json/tests/draft-next/minimum.json
+++ /dev/null
@@ -1,75 +0,0 @@
-[
-    {
-        "description": "minimum validation",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "minimum": 1.1
-        },
-        "tests": [
-            {
-                "description": "above the minimum is valid",
-                "data": 2.6,
-                "valid": true
-            },
-            {
-                "description": "boundary point is valid",
-                "data": 1.1,
-                "valid": true
-            },
-            {
-                "description": "below the minimum is invalid",
-                "data": 0.6,
-                "valid": false
-            },
-            {
-                "description": "ignores non-numbers",
-                "data": "x",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "minimum validation with signed integer",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "minimum": -2
-        },
-        "tests": [
-            {
-                "description": "negative above the minimum is valid",
-                "data": -1,
-                "valid": true
-            },
-            {
-                "description": "positive above the minimum is valid",
-                "data": 0,
-                "valid": true
-            },
-            {
-                "description": "boundary point is valid",
-                "data": -2,
-                "valid": true
-            },
-            {
-                "description": "boundary point with float is valid",
-                "data": -2.0,
-                "valid": true
-            },
-            {
-                "description": "float below the minimum is invalid",
-                "data": -2.0001,
-                "valid": false
-            },
-            {
-                "description": "int below the minimum is invalid",
-                "data": -3,
-                "valid": false
-            },
-            {
-                "description": "ignores non-numbers",
-                "data": "x",
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft-next/multipleOf.json b/json/tests/draft-next/multipleOf.json
deleted file mode 100644
index d640b3b..0000000
--- a/json/tests/draft-next/multipleOf.json
+++ /dev/null
@@ -1,84 +0,0 @@
-[
-    {
-        "description": "by int",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "multipleOf": 2
-        },
-        "tests": [
-            {
-                "description": "int by int",
-                "data": 10,
-                "valid": true
-            },
-            {
-                "description": "int by int fail",
-                "data": 7,
-                "valid": false
-            },
-            {
-                "description": "ignores non-numbers",
-                "data": "foo",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "by number",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "multipleOf": 1.5
-        },
-        "tests": [
-            {
-                "description": "zero is multiple of anything",
-                "data": 0,
-                "valid": true
-            },
-            {
-                "description": "4.5 is multiple of 1.5",
-                "data": 4.5,
-                "valid": true
-            },
-            {
-                "description": "35 is not multiple of 1.5",
-                "data": 35,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "by small number",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "multipleOf": 0.0001
-        },
-        "tests": [
-            {
-                "description": "0.0075 is multiple of 0.0001",
-                "data": 0.0075,
-                "valid": true
-            },
-            {
-                "description": "0.00751 is not multiple of 0.0001",
-                "data": 0.00751,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "float division = inf",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "type": "integer",
-            "multipleOf": 0.123456789
-        },
-        "tests": [
-            {
-                "description": "always invalid, but naive implementations may raise an overflow error",
-                "data": 1e308,
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft-next/not.json b/json/tests/draft-next/not.json
deleted file mode 100644
index 9c9c3f2..0000000
--- a/json/tests/draft-next/not.json
+++ /dev/null
@@ -1,127 +0,0 @@
-[
-    {
-        "description": "not",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "not": {"type": "integer"}
-        },
-        "tests": [
-            {
-                "description": "allowed",
-                "data": "foo",
-                "valid": true
-            },
-            {
-                "description": "disallowed",
-                "data": 1,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "not multiple types",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "not": {"type": ["integer", "boolean"]}
-        },
-        "tests": [
-            {
-                "description": "valid",
-                "data": "foo",
-                "valid": true
-            },
-            {
-                "description": "mismatch",
-                "data": 1,
-                "valid": false
-            },
-            {
-                "description": "other mismatch",
-                "data": true,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "not more complex schema",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "not": {
-                "type": "object",
-                "properties": {
-                    "foo": {
-                        "type": "string"
-                    }
-                }
-             }
-        },
-        "tests": [
-            {
-                "description": "match",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "other match",
-                "data": {"foo": 1},
-                "valid": true
-            },
-            {
-                "description": "mismatch",
-                "data": {"foo": "bar"},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "forbidden property",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "properties": {
-                "foo": { 
-                    "not": {}
-                }
-            }
-        },
-        "tests": [
-            {
-                "description": "property present",
-                "data": {"foo": 1, "bar": 2},
-                "valid": false
-            },
-            {
-                "description": "property absent",
-                "data": {"bar": 1, "baz": 2},
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "not with boolean schema true",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "not": true
-        },
-        "tests": [
-            {
-                "description": "any value is invalid",
-                "data": "foo",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "not with boolean schema false",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "not": false
-        },
-        "tests": [
-            {
-                "description": "any value is valid",
-                "data": "foo",
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft-next/oneOf.json b/json/tests/draft-next/oneOf.json
deleted file mode 100644
index e8c0771..0000000
--- a/json/tests/draft-next/oneOf.json
+++ /dev/null
@@ -1,293 +0,0 @@
-[
-    {
-        "description": "oneOf",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "oneOf": [
-                {
-                    "type": "integer"
-                },
-                {
-                    "minimum": 2
-                }
-            ]
-        },
-        "tests": [
-            {
-                "description": "first oneOf valid",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "second oneOf valid",
-                "data": 2.5,
-                "valid": true
-            },
-            {
-                "description": "both oneOf valid",
-                "data": 3,
-                "valid": false
-            },
-            {
-                "description": "neither oneOf valid",
-                "data": 1.5,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "oneOf with base schema",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "type": "string",
-            "oneOf" : [
-                {
-                    "minLength": 2
-                },
-                {
-                    "maxLength": 4
-                }
-            ]
-        },
-        "tests": [
-            {
-                "description": "mismatch base schema",
-                "data": 3,
-                "valid": false
-            },
-            {
-                "description": "one oneOf valid",
-                "data": "foobar",
-                "valid": true
-            },
-            {
-                "description": "both oneOf valid",
-                "data": "foo",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "oneOf with boolean schemas, all true",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "oneOf": [true, true, true]
-        },
-        "tests": [
-            {
-                "description": "any value is invalid",
-                "data": "foo",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "oneOf with boolean schemas, one true",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "oneOf": [true, false, false]
-        },
-        "tests": [
-            {
-                "description": "any value is valid",
-                "data": "foo",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "oneOf with boolean schemas, more than one true",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "oneOf": [true, true, false]
-        },
-        "tests": [
-            {
-                "description": "any value is invalid",
-                "data": "foo",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "oneOf with boolean schemas, all false",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "oneOf": [false, false, false]
-        },
-        "tests": [
-            {
-                "description": "any value is invalid",
-                "data": "foo",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "oneOf complex types",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "oneOf": [
-                {
-                    "properties": {
-                        "bar": {"type": "integer"}
-                    },
-                    "required": ["bar"]
-                },
-                {
-                    "properties": {
-                        "foo": {"type": "string"}
-                    },
-                    "required": ["foo"]
-                }
-            ]
-        },
-        "tests": [
-            {
-                "description": "first oneOf valid (complex)",
-                "data": {"bar": 2},
-                "valid": true
-            },
-            {
-                "description": "second oneOf valid (complex)",
-                "data": {"foo": "baz"},
-                "valid": true
-            },
-            {
-                "description": "both oneOf valid (complex)",
-                "data": {"foo": "baz", "bar": 2},
-                "valid": false
-            },
-            {
-                "description": "neither oneOf valid (complex)",
-                "data": {"foo": 2, "bar": "quux"},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "oneOf with empty schema",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "oneOf": [
-                { "type": "number" },
-                {}
-            ]
-        },
-        "tests": [
-            {
-                "description": "one valid - valid",
-                "data": "foo",
-                "valid": true
-            },
-            {
-                "description": "both valid - invalid",
-                "data": 123,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "oneOf with required",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "type": "object",
-            "oneOf": [
-                { "required": ["foo", "bar"] },
-                { "required": ["foo", "baz"] }
-            ]
-        },
-        "tests": [
-            {
-                "description": "both invalid - invalid",
-                "data": {"bar": 2},
-                "valid": false
-            },
-            {
-                "description": "first valid - valid",
-                "data": {"foo": 1, "bar": 2},
-                "valid": true
-            },
-            {
-                "description": "second valid - valid",
-                "data": {"foo": 1, "baz": 3},
-                "valid": true
-            },
-            {
-                "description": "both valid - invalid",
-                "data": {"foo": 1, "bar": 2, "baz" : 3},
-                "valid": false
-            }
-        ]
-    },
-	{
-        "description": "oneOf with missing optional property",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "oneOf": [
-                {
-                    "properties": {
-                        "bar": true,
-                        "baz": true
-                    },
-                    "required": ["bar"]
-                },
-                {
-                    "properties": {
-                        "foo": true
-                    },
-                    "required": ["foo"]
-                }
-            ]
-        },
-        "tests": [
-            {
-                "description": "first oneOf valid",
-                "data": {"bar": 8},
-                "valid": true
-            },
-            {
-                "description": "second oneOf valid",
-                "data": {"foo": "foo"},
-                "valid": true
-            },
-            {
-                "description": "both oneOf valid",
-                "data": {"foo": "foo", "bar": 8},
-                "valid": false
-            },
-            {
-                "description": "neither oneOf valid",
-                "data": {"baz": "quux"},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "nested oneOf, to check validation semantics",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "oneOf": [
-                {
-                    "oneOf": [
-                        {
-                            "type": "null"
-                        }
-                    ]
-                }
-            ]
-        },
-        "tests": [
-            {
-                "description": "null is valid",
-                "data": null,
-                "valid": true
-            },
-            {
-                "description": "anything non-null is invalid",
-                "data": 123,
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft-next/optional/bignum.json b/json/tests/draft-next/optional/bignum.json
deleted file mode 100644
index 9f4f707..0000000
--- a/json/tests/draft-next/optional/bignum.json
+++ /dev/null
@@ -1,110 +0,0 @@
-[
-    {
-        "description": "integer",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "type": "integer"
-        },
-        "tests": [
-            {
-                "description": "a bignum is an integer",
-                "data": 12345678910111213141516171819202122232425262728293031,
-                "valid": true
-            },
-            {
-                "description": "a negative bignum is an integer",
-                "data": -12345678910111213141516171819202122232425262728293031,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "number",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "type": "number"
-        },
-        "tests": [
-            {
-                "description": "a bignum is a number",
-                "data": 98249283749234923498293171823948729348710298301928331,
-                "valid": true
-            },
-            {
-                "description": "a negative bignum is a number",
-                "data": -98249283749234923498293171823948729348710298301928331,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "string",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "type": "string"
-        },
-        "tests": [
-            {
-                "description": "a bignum is not a string",
-                "data": 98249283749234923498293171823948729348710298301928331,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "maximum integer comparison",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "maximum": 18446744073709551615
-        },
-        "tests": [
-            {
-                "description": "comparison works for high numbers",
-                "data": 18446744073709551600,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "float comparison with high precision",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "exclusiveMaximum": 972783798187987123879878123.18878137
-        },
-        "tests": [
-            {
-                "description": "comparison works for high numbers",
-                "data": 972783798187987123879878123.188781371,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "minimum integer comparison",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "minimum": -18446744073709551615
-        },
-        "tests": [
-            {
-                "description": "comparison works for very negative numbers",
-                "data": -18446744073709551600,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "float comparison with high precision on negative numbers",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "exclusiveMinimum": -972783798187987123879878123.18878137
-        },
-        "tests": [
-            {
-                "description": "comparison works for very negative numbers",
-                "data": -972783798187987123879878123.188781371,
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft-next/optional/dependencies-compatibility.json b/json/tests/draft-next/optional/dependencies-compatibility.json
deleted file mode 100644
index 1fe384c..0000000
--- a/json/tests/draft-next/optional/dependencies-compatibility.json
+++ /dev/null
@@ -1,282 +0,0 @@
-[
-    {
-        "description": "single dependency",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "dependencies": {"bar": ["foo"]}
-        },
-        "tests": [
-            {
-                "description": "neither",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "nondependant",
-                "data": {"foo": 1},
-                "valid": true
-            },
-            {
-                "description": "with dependency",
-                "data": {"foo": 1, "bar": 2},
-                "valid": true
-            },
-            {
-                "description": "missing dependency",
-                "data": {"bar": 2},
-                "valid": false
-            },
-            {
-                "description": "ignores arrays",
-                "data": ["bar"],
-                "valid": true
-            },
-            {
-                "description": "ignores strings",
-                "data": "foobar",
-                "valid": true
-            },
-            {
-                "description": "ignores other non-objects",
-                "data": 12,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "empty dependents",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "dependencies": {"bar": []}
-        },
-        "tests": [
-            {
-                "description": "empty object",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "object with one property",
-                "data": {"bar": 2},
-                "valid": true
-            },
-            {
-                "description": "non-object is valid",
-                "data": 1,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "multiple dependents required",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "dependencies": {"quux": ["foo", "bar"]}
-        },
-        "tests": [
-            {
-                "description": "neither",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "nondependants",
-                "data": {"foo": 1, "bar": 2},
-                "valid": true
-            },
-            {
-                "description": "with dependencies",
-                "data": {"foo": 1, "bar": 2, "quux": 3},
-                "valid": true
-            },
-            {
-                "description": "missing dependency",
-                "data": {"foo": 1, "quux": 2},
-                "valid": false
-            },
-            {
-                "description": "missing other dependency",
-                "data": {"bar": 1, "quux": 2},
-                "valid": false
-            },
-            {
-                "description": "missing both dependencies",
-                "data": {"quux": 1},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "dependencies with escaped characters",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "dependencies": {
-                "foo\nbar": ["foo\rbar"],
-                "foo\"bar": ["foo'bar"]
-            }
-        },
-        "tests": [
-            {
-                "description": "CRLF",
-                "data": {
-                    "foo\nbar": 1,
-                    "foo\rbar": 2
-                },
-                "valid": true
-            },
-            {
-                "description": "quoted quotes",
-                "data": {
-                    "foo'bar": 1,
-                    "foo\"bar": 2
-                },
-                "valid": true
-            },
-            {
-                "description": "CRLF missing dependent",
-                "data": {
-                    "foo\nbar": 1,
-                    "foo": 2
-                },
-                "valid": false
-            },
-            {
-                "description": "quoted quotes missing dependent",
-                "data": {
-                    "foo\"bar": 2
-                },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "single schema dependency",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "dependencies": {
-                "bar": {
-                    "properties": {
-                        "foo": {"type": "integer"},
-                        "bar": {"type": "integer"}
-                    }
-                }
-            }
-        },
-        "tests": [
-            {
-                "description": "valid",
-                "data": {"foo": 1, "bar": 2},
-                "valid": true
-            },
-            {
-                "description": "no dependency",
-                "data": {"foo": "quux"},
-                "valid": true
-            },
-            {
-                "description": "wrong type",
-                "data": {"foo": "quux", "bar": 2},
-                "valid": false
-            },
-            {
-                "description": "wrong type other",
-                "data": {"foo": 2, "bar": "quux"},
-                "valid": false
-            },
-            {
-                "description": "wrong type both",
-                "data": {"foo": "quux", "bar": "quux"},
-                "valid": false
-            },
-            {
-                "description": "ignores arrays",
-                "data": ["bar"],
-                "valid": true
-            },
-            {
-                "description": "ignores strings",
-                "data": "foobar",
-                "valid": true
-            },
-            {
-                "description": "ignores other non-objects",
-                "data": 12,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "boolean subschemas",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "dependencies": {
-                "foo": true,
-                "bar": false
-            }
-        },
-        "tests": [
-            {
-                "description": "object with property having schema true is valid",
-                "data": {"foo": 1},
-                "valid": true
-            },
-            {
-                "description": "object with property having schema false is invalid",
-                "data": {"bar": 2},
-                "valid": false
-            },
-            {
-                "description": "object with both properties is invalid",
-                "data": {"foo": 1, "bar": 2},
-                "valid": false
-            },
-            {
-                "description": "empty object is valid",
-                "data": {},
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "schema dependencies with escaped characters",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "dependencies": {
-                "foo\tbar": {"minProperties": 4},
-                "foo'bar": {"required": ["foo\"bar"]}
-            }
-        },
-        "tests": [
-            {
-                "description": "quoted tab",
-                "data": {
-                    "foo\tbar": 1,
-                    "a": 2,
-                    "b": 3,
-                    "c": 4
-                },
-                "valid": true
-            },
-            {
-                "description": "quoted quote",
-                "data": {
-                    "foo'bar": {"foo\"bar": 1}
-                },
-                "valid": false
-            },
-            {
-                "description": "quoted tab invalid under dependent schema",
-                "data": {
-                    "foo\tbar": 1,
-                    "a": 2
-                },
-                "valid": false
-            },
-            {
-                "description": "quoted quote invalid under dependent schema",
-                "data": {"foo'bar": 1},
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft-next/optional/ecmascript-regex.json b/json/tests/draft-next/optional/ecmascript-regex.json
deleted file mode 100644
index 2721145..0000000
--- a/json/tests/draft-next/optional/ecmascript-regex.json
+++ /dev/null
@@ -1,596 +0,0 @@
-[
-    {
-        "description": "ECMA 262 regex $ does not match trailing newline",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "type": "string",
-            "pattern": "^abc$"
-        },
-        "tests": [
-            {
-                "description": "matches in Python, but not in ECMA 262",
-                "data": "abc\\n",
-                "valid": false
-            },
-            {
-                "description": "matches",
-                "data": "abc",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "ECMA 262 regex converts \\t to horizontal tab",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "type": "string",
-            "pattern": "^\\t$"
-        },
-        "tests": [
-            {
-                "description": "does not match",
-                "data": "\\t",
-                "valid": false
-            },
-            {
-                "description": "matches",
-                "data": "\u0009",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "ECMA 262 regex escapes control codes with \\c and upper letter",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "type": "string",
-            "pattern": "^\\cC$"
-        },
-        "tests": [
-            {
-                "description": "does not match",
-                "data": "\\cC",
-                "valid": false
-            },
-            {
-                "description": "matches",
-                "data": "\u0003",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "ECMA 262 regex escapes control codes with \\c and lower letter",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "type": "string",
-            "pattern": "^\\cc$"
-        },
-        "tests": [
-            {
-                "description": "does not match",
-                "data": "\\cc",
-                "valid": false
-            },
-            {
-                "description": "matches",
-                "data": "\u0003",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "ECMA 262 \\d matches ascii digits only",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "type": "string",
-            "pattern": "^\\d$"
-        },
-        "tests": [
-            {
-                "description": "ASCII zero matches",
-                "data": "0",
-                "valid": true
-            },
-            {
-                "description": "NKO DIGIT ZERO does not match (unlike e.g. Python)",
-                "data": "߀",
-                "valid": false
-            },
-            {
-                "description": "NKO DIGIT ZERO (as \\u escape) does not match",
-                "data": "\u07c0",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "ECMA 262 \\D matches everything but ascii digits",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "type": "string",
-            "pattern": "^\\D$"
-        },
-        "tests": [
-            {
-                "description": "ASCII zero does not match",
-                "data": "0",
-                "valid": false
-            },
-            {
-                "description": "NKO DIGIT ZERO matches (unlike e.g. Python)",
-                "data": "߀",
-                "valid": true
-            },
-            {
-                "description": "NKO DIGIT ZERO (as \\u escape) matches",
-                "data": "\u07c0",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "ECMA 262 \\w matches ascii letters only",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "type": "string",
-            "pattern": "^\\w$"
-        },
-        "tests": [
-            {
-                "description": "ASCII 'a' matches",
-                "data": "a",
-                "valid": true
-            },
-            {
-                "description": "latin-1 e-acute does not match (unlike e.g. Python)",
-                "data": "é",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "ECMA 262 \\W matches everything but ascii letters",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "type": "string",
-            "pattern": "^\\W$"
-        },
-        "tests": [
-            {
-                "description": "ASCII 'a' does not match",
-                "data": "a",
-                "valid": false
-            },
-            {
-                "description": "latin-1 e-acute matches (unlike e.g. Python)",
-                "data": "é",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "ECMA 262 \\s matches whitespace",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "type": "string",
-            "pattern": "^\\s$"
-        },
-        "tests": [
-            {
-                "description": "ASCII space matches",
-                "data": " ",
-                "valid": true
-            },
-            {
-                "description": "Character tabulation matches",
-                "data": "\t",
-                "valid": true
-            },
-            {
-                "description": "Line tabulation matches",
-                "data": "\u000b",
-                "valid": true
-            },
-            {
-                "description": "Form feed matches",
-                "data": "\u000c",
-                "valid": true
-            },
-            {
-                "description": "latin-1 non-breaking-space matches",
-                "data": "\u00a0",
-                "valid": true
-            },
-            {
-                "description": "zero-width whitespace matches",
-                "data": "\ufeff",
-                "valid": true
-            },
-            {
-                "description": "line feed matches (line terminator)",
-                "data": "\u000a",
-                "valid": true
-            },
-            {
-                "description": "paragraph separator matches (line terminator)",
-                "data": "\u2029",
-                "valid": true
-            },
-            {
-                "description": "EM SPACE matches (Space_Separator)",
-                "data": "\u2003",
-                "valid": true
-            },
-            {
-                "description": "Non-whitespace control does not match",
-                "data": "\u0001",
-                "valid": false
-            },
-            {
-                "description": "Non-whitespace does not match",
-                "data": "\u2013",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "ECMA 262 \\S matches everything but whitespace",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "type": "string",
-            "pattern": "^\\S$"
-        },
-        "tests": [
-            {
-                "description": "ASCII space does not match",
-                "data": " ",
-                "valid": false
-            },
-            {
-                "description": "Character tabulation does not match",
-                "data": "\t",
-                "valid": false
-            },
-            {
-                "description": "Line tabulation does not match",
-                "data": "\u000b",
-                "valid": false
-            },
-            {
-                "description": "Form feed does not match",
-                "data": "\u000c",
-                "valid": false
-            },
-            {
-                "description": "latin-1 non-breaking-space does not match",
-                "data": "\u00a0",
-                "valid": false
-            },
-            {
-                "description": "zero-width whitespace does not match",
-                "data": "\ufeff",
-                "valid": false
-            },
-            {
-                "description": "line feed does not match (line terminator)",
-                "data": "\u000a",
-                "valid": false
-            },
-            {
-                "description": "paragraph separator does not match (line terminator)",
-                "data": "\u2029",
-                "valid": false
-            },
-            {
-                "description": "EM SPACE does not match (Space_Separator)",
-                "data": "\u2003",
-                "valid": false
-            },
-            {
-                "description": "Non-whitespace control matches",
-                "data": "\u0001",
-                "valid": true
-            },
-            {
-                "description": "Non-whitespace matches",
-                "data": "\u2013",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "patterns always use unicode semantics with pattern",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "pattern": "\\p{Letter}cole"
-        },
-        "tests": [
-            {
-                "description": "ascii character in json string",
-                "data": "Les hivers de mon enfance etaient des saisons longues, longues. Nous vivions en trois lieux: l'ecole, l'eglise et la patinoire; mais la vraie vie etait sur la patinoire.",
-                "valid": true
-            },
-            {
-                "description": "literal unicode character in json string",
-                "data": "Les hivers de mon enfance étaient des saisons longues, longues. Nous vivions en trois lieux: l'école, l'église et la patinoire; mais la vraie vie était sur la patinoire.",
-                "valid": true
-            },
-            {
-                "description": "unicode character in hex format in string",
-                "data": "Les hivers de mon enfance étaient des saisons longues, longues. Nous vivions en trois lieux: l'\u00e9cole, l'église et la patinoire; mais la vraie vie était sur la patinoire.",
-                "valid": true
-            },
-            {
-                "description": "unicode matching is case-sensitive",
-                "data": "LES HIVERS DE MON ENFANCE ÉTAIENT DES SAISONS LONGUES, LONGUES. NOUS VIVIONS EN TROIS LIEUX: L'ÉCOLE, L'ÉGLISE ET LA PATINOIRE; MAIS LA VRAIE VIE ÉTAIT SUR LA PATINOIRE.",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "\\w in patterns matches [A-Za-z0-9_], not unicode letters",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "pattern": "\\wcole"
-        },
-        "tests": [
-            {
-                "description": "ascii character in json string",
-                "data": "Les hivers de mon enfance etaient des saisons longues, longues. Nous vivions en trois lieux: l'ecole, l'eglise et la patinoire; mais la vraie vie etait sur la patinoire.",
-                "valid": true
-            },
-            {
-                "description": "literal unicode character in json string",
-                "data": "Les hivers de mon enfance étaient des saisons longues, longues. Nous vivions en trois lieux: l'école, l'église et la patinoire; mais la vraie vie était sur la patinoire.",
-                "valid": false
-            },
-            {
-                "description": "unicode character in hex format in string",
-                "data": "Les hivers de mon enfance étaient des saisons longues, longues. Nous vivions en trois lieux: l'\u00e9cole, l'église et la patinoire; mais la vraie vie était sur la patinoire.",
-                "valid": false
-            },
-            {
-                "description": "unicode matching is case-sensitive",
-                "data": "LES HIVERS DE MON ENFANCE ÉTAIENT DES SAISONS LONGUES, LONGUES. NOUS VIVIONS EN TROIS LIEUX: L'ÉCOLE, L'ÉGLISE ET LA PATINOIRE; MAIS LA VRAIE VIE ÉTAIT SUR LA PATINOIRE.",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "pattern with ASCII ranges",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "pattern": "[a-z]cole"
-        },
-        "tests": [
-            {
-                "description": "literal unicode character in json string",
-                "data": "Les hivers de mon enfance étaient des saisons longues, longues. Nous vivions en trois lieux: l'école, l'église et la patinoire; mais la vraie vie était sur la patinoire.",
-                "valid": false
-            },
-            {
-                "description": "unicode character in hex format in string",
-                "data": "Les hivers de mon enfance étaient des saisons longues, longues. Nous vivions en trois lieux: l'\u00e9cole, l'église et la patinoire; mais la vraie vie était sur la patinoire.",
-                "valid": false
-            },
-            {
-                "description": "ascii characters match",
-                "data": "Les hivers de mon enfance etaient des saisons longues, longues. Nous vivions en trois lieux: l'ecole, l'eglise et la patinoire; mais la vraie vie etait sur la patinoire.",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "\\d in pattern matches [0-9], not unicode digits",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "pattern": "^\\d+$"
-        },
-        "tests": [
-            {
-                "description": "ascii digits",
-                "data": "42",
-                "valid": true
-            },
-            {
-                "description": "ascii non-digits",
-                "data": "-%#",
-                "valid": false
-            },
-            {
-                "description": "non-ascii digits (BENGALI DIGIT FOUR, BENGALI DIGIT TWO)",
-                "data": "৪২",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "\\a is not an ECMA 262 control escape",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "$ref": "https://json-schema.org/draft/next/schema"
-        },
-        "tests": [
-            {
-                "description": "when used as a pattern",
-                "data": { "pattern": "\\a" },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "pattern with non-ASCII digits",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "pattern": "^\\p{digit}+$"
-        },
-        "tests": [
-            {
-                "description": "ascii digits",
-                "data": "42",
-                "valid": true
-            },
-            {
-                "description": "ascii non-digits",
-                "data": "-%#",
-                "valid": false
-            },
-            {
-                "description": "non-ascii digits (BENGALI DIGIT FOUR, BENGALI DIGIT TWO)",
-                "data": "৪২",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "patterns always use unicode semantics with patternProperties",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "type": "object",
-            "patternProperties": {
-                "\\p{Letter}cole": true
-            },
-            "additionalProperties": false
-        },
-        "tests": [
-            {
-                "description": "ascii character in json string",
-                "data": { "l'ecole": "pas de vraie vie" },
-                "valid": true
-            },
-            {
-                "description": "literal unicode character in json string",
-                "data": { "l'école": "pas de vraie vie" },
-                "valid": true
-            },
-            {
-                "description": "unicode character in hex format in string",
-                "data": { "l'\u00e9cole": "pas de vraie vie" },
-                "valid": true
-            },
-            {
-                "description": "unicode matching is case-sensitive",
-                "data": { "L'ÉCOLE": "PAS DE VRAIE VIE" },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "\\w in patternProperties matches [A-Za-z0-9_], not unicode letters",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "type": "object",
-            "patternProperties": {
-                "\\wcole": true
-            },
-            "additionalProperties": false
-        },
-        "tests": [
-            {
-                "description": "ascii character in json string",
-                "data": { "l'ecole": "pas de vraie vie" },
-                "valid": true
-            },
-            {
-                "description": "literal unicode character in json string",
-                "data": { "l'école": "pas de vraie vie" },
-                "valid": false
-            },
-            {
-                "description": "unicode character in hex format in string",
-                "data": { "l'\u00e9cole": "pas de vraie vie" },
-                "valid": false
-            },
-            {
-                "description": "unicode matching is case-sensitive",
-                "data": { "L'ÉCOLE": "PAS DE VRAIE VIE" },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "patternProperties with ASCII ranges",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "type": "object",
-            "patternProperties": {
-                "[a-z]cole": true
-            },
-            "additionalProperties": false
-        },
-        "tests": [
-            {
-                "description": "literal unicode character in json string",
-                "data": { "l'école": "pas de vraie vie" },
-                "valid": false
-            },
-            {
-                "description": "unicode character in hex format in string",
-                "data": { "l'\u00e9cole": "pas de vraie vie" },
-                "valid": false
-            },
-            {
-                "description": "ascii characters match",
-                "data": { "l'ecole": "pas de vraie vie" },
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "\\d in patternProperties matches [0-9], not unicode digits",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "type": "object",
-            "patternProperties": {
-                "^\\d+$": true
-            },
-            "additionalProperties": false
-        },
-        "tests": [
-            {
-                "description": "ascii digits",
-                "data": { "42": "life, the universe, and everything" },
-                "valid": true
-            },
-            {
-                "description": "ascii non-digits",
-                "data": { "-%#": "spending the year dead for tax reasons" },
-                "valid": false
-            },
-            {
-                "description": "non-ascii digits (BENGALI DIGIT FOUR, BENGALI DIGIT TWO)",
-                "data": { "৪২": "khajit has wares if you have coin" },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "patternProperties with non-ASCII digits",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "type": "object",
-            "patternProperties": {
-                "^\\p{digit}+$": true
-            },
-            "additionalProperties": false
-        },
-        "tests": [
-            {
-                "description": "ascii digits",
-                "data": { "42": "life, the universe, and everything" },
-                "valid": true
-            },
-            {
-                "description": "ascii non-digits",
-                "data": { "-%#": "spending the year dead for tax reasons" },
-                "valid": false
-            },
-            {
-                "description": "non-ascii digits (BENGALI DIGIT FOUR, BENGALI DIGIT TWO)",
-                "data": { "৪২": "khajit has wares if you have coin" },
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft-next/optional/float-overflow.json b/json/tests/draft-next/optional/float-overflow.json
deleted file mode 100644
index a4fcca6..0000000
--- a/json/tests/draft-next/optional/float-overflow.json
+++ /dev/null
@@ -1,17 +0,0 @@
-[
-    {
-        "description": "all integers are multiples of 0.5, if overflow is handled",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "type": "integer",
-            "multipleOf": 0.5
-        },
-        "tests": [
-            {
-                "description": "valid if optional overflow handling is implemented",
-                "data": 1e308,
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft-next/optional/format-assertion.json b/json/tests/draft-next/optional/format-assertion.json
deleted file mode 100644
index ede922a..0000000
--- a/json/tests/draft-next/optional/format-assertion.json
+++ /dev/null
@@ -1,42 +0,0 @@
-[
-    {
-        "description": "schema that uses custom metaschema with format-assertion: false",
-        "schema": {
-            "$id": "https://schema/using/format-assertion/false",
-            "$schema": "http://localhost:1234/draft-next/format-assertion-false.json",
-            "format": "ipv4"
-        },
-        "tests": [
-            {
-                "description": "format-assertion: false: valid string",
-                "data": "127.0.0.1",
-                "valid": true
-            },
-            {
-                "description": "format-assertion: false: invalid string",
-                "data": "not-an-ipv4",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "schema that uses custom metaschema with format-assertion: true",
-        "schema": {
-            "$id": "https://schema/using/format-assertion/true",
-            "$schema": "http://localhost:1234/draft-next/format-assertion-true.json",
-            "format": "ipv4"
-        },
-        "tests": [
-            {
-                "description": "format-assertion: true: valid string",
-                "data": "127.0.0.1",
-                "valid": true
-            },
-            {
-                "description": "format-assertion: true: invalid string",
-                "data": "not-an-ipv4",
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft-next/optional/format/date-time.json b/json/tests/draft-next/optional/format/date-time.json
deleted file mode 100644
index e25845b..0000000
--- a/json/tests/draft-next/optional/format/date-time.json
+++ /dev/null
@@ -1,136 +0,0 @@
-[
-    {
-        "description": "validation of date-time strings",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "format": "date-time"
-        },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            },
-            {
-                "description": "a valid date-time string",
-                "data": "1963-06-19T08:30:06.283185Z",
-                "valid": true
-            },
-            {
-                "description": "a valid date-time string without second fraction",
-                "data": "1963-06-19T08:30:06Z",
-                "valid": true
-            },
-            {
-                "description": "a valid date-time string with plus offset",
-                "data": "1937-01-01T12:00:27.87+00:20",
-                "valid": true
-            },
-            {
-                "description": "a valid date-time string with minus offset",
-                "data": "1990-12-31T15:59:50.123-08:00",
-                "valid": true
-            },
-            {
-                "description": "a valid date-time with a leap second, UTC",
-                "data": "1998-12-31T23:59:60Z",
-                "valid": true
-            },
-            {
-                "description": "a valid date-time with a leap second, with minus offset",
-                "data": "1998-12-31T15:59:60.123-08:00",
-                "valid": true
-            },
-            {
-                "description": "an invalid date-time past leap second, UTC",
-                "data": "1998-12-31T23:59:61Z",
-                "valid": false
-            },
-            {
-                "description": "an invalid date-time with leap second on a wrong minute, UTC",
-                "data": "1998-12-31T23:58:60Z",
-                "valid": false
-            },
-            {
-                "description": "an invalid date-time with leap second on a wrong hour, UTC",
-                "data": "1998-12-31T22:59:60Z",
-                "valid": false
-            },
-            {
-                "description": "an invalid day in date-time string",
-                "data": "1990-02-31T15:59:59.123-08:00",
-                "valid": false
-            },
-            {
-                "description": "an invalid offset in date-time string",
-                "data": "1990-12-31T15:59:59-24:00",
-                "valid": false
-            },
-            {
-                "description": "an invalid closing Z after time-zone offset",
-                "data": "1963-06-19T08:30:06.28123+01:00Z",
-                "valid": false
-            },
-            {
-                "description": "an invalid date-time string",
-                "data": "06/19/1963 08:30:06 PST",
-                "valid": false
-            },
-            {
-                "description": "case-insensitive T and Z",
-                "data": "1963-06-19t08:30:06.283185z",
-                "valid": true
-            },
-            {
-                "description": "only RFC3339 not all of ISO 8601 are valid",
-                "data": "2013-350T01:01:01",
-                "valid": false
-            },
-            {
-                "description": "invalid non-padded month dates",
-                "data": "1963-6-19T08:30:06.283185Z",
-                "valid": false
-            },
-            {
-                "description": "invalid non-padded day dates",
-                "data": "1963-06-1T08:30:06.283185Z",
-                "valid": false
-            },
-            {
-                "description": "invalid non-ASCII '৪' (a Bengali 4) in date portion",
-                "data": "1963-06-1৪T00:00:00Z",
-                "valid": false
-            },
-            {
-                "description": "invalid non-ASCII '৪' (a Bengali 4) in time portion",
-                "data": "1963-06-11T0৪:00:00Z",
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft-next/optional/format/date.json b/json/tests/draft-next/optional/format/date.json
deleted file mode 100644
index 75c6146..0000000
--- a/json/tests/draft-next/optional/format/date.json
+++ /dev/null
@@ -1,226 +0,0 @@
-[
-    {
-        "description": "validation of date strings",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "format": "date"
-        },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            },
-            {
-                "description": "a valid date string",
-                "data": "1963-06-19",
-                "valid": true
-            },
-            {
-                "description": "a valid date string with 31 days in January",
-                "data": "2020-01-31",
-                "valid": true
-            },
-            {
-                "description": "a invalid date string with 32 days in January",
-                "data": "2020-01-32",
-                "valid": false
-            },
-            {
-                "description": "a valid date string with 28 days in February (normal)",
-                "data": "2021-02-28",
-                "valid": true
-            },
-            {
-                "description": "a invalid date string with 29 days in February (normal)",
-                "data": "2021-02-29",
-                "valid": false
-            },
-            {
-                "description": "a valid date string with 29 days in February (leap)",
-                "data": "2020-02-29",
-                "valid": true
-            },
-            {
-                "description": "a invalid date string with 30 days in February (leap)",
-                "data": "2020-02-30",
-                "valid": false
-            },
-            {
-                "description": "a valid date string with 31 days in March",
-                "data": "2020-03-31",
-                "valid": true
-            },
-            {
-                "description": "a invalid date string with 32 days in March",
-                "data": "2020-03-32",
-                "valid": false
-            },
-            {
-                "description": "a valid date string with 30 days in April",
-                "data": "2020-04-30",
-                "valid": true
-            },
-            {
-                "description": "a invalid date string with 31 days in April",
-                "data": "2020-04-31",
-                "valid": false
-            },
-            {
-                "description": "a valid date string with 31 days in May",
-                "data": "2020-05-31",
-                "valid": true
-            },
-            {
-                "description": "a invalid date string with 32 days in May",
-                "data": "2020-05-32",
-                "valid": false
-            },
-            {
-                "description": "a valid date string with 30 days in June",
-                "data": "2020-06-30",
-                "valid": true
-            },
-            {
-                "description": "a invalid date string with 31 days in June",
-                "data": "2020-06-31",
-                "valid": false
-            },
-            {
-                "description": "a valid date string with 31 days in July",
-                "data": "2020-07-31",
-                "valid": true
-            },
-            {
-                "description": "a invalid date string with 32 days in July",
-                "data": "2020-07-32",
-                "valid": false
-            },
-            {
-                "description": "a valid date string with 31 days in August",
-                "data": "2020-08-31",
-                "valid": true
-            },
-            {
-                "description": "a invalid date string with 32 days in August",
-                "data": "2020-08-32",
-                "valid": false
-            },
-            {
-                "description": "a valid date string with 30 days in September",
-                "data": "2020-09-30",
-                "valid": true
-            },
-            {
-                "description": "a invalid date string with 31 days in September",
-                "data": "2020-09-31",
-                "valid": false
-            },
-            {
-                "description": "a valid date string with 31 days in October",
-                "data": "2020-10-31",
-                "valid": true
-            },
-            {
-                "description": "a invalid date string with 32 days in October",
-                "data": "2020-10-32",
-                "valid": false
-            },
-            {
-                "description": "a valid date string with 30 days in November",
-                "data": "2020-11-30",
-                "valid": true
-            },
-            {
-                "description": "a invalid date string with 31 days in November",
-                "data": "2020-11-31",
-                "valid": false
-            },
-            {
-                "description": "a valid date string with 31 days in December",
-                "data": "2020-12-31",
-                "valid": true
-            },
-            {
-                "description": "a invalid date string with 32 days in December",
-                "data": "2020-12-32",
-                "valid": false
-            },
-            {
-                "description": "a invalid date string with invalid month",
-                "data": "2020-13-01",
-                "valid": false
-            },
-            {
-                "description": "an invalid date string",
-                "data": "06/19/1963",
-                "valid": false
-            },
-            {
-                "description": "only RFC3339 not all of ISO 8601 are valid",
-                "data": "2013-350",
-                "valid": false
-            },
-            {
-                "description": "non-padded month dates are not valid",
-                "data": "1998-1-20",
-                "valid": false
-            },
-            {
-                "description": "non-padded day dates are not valid",
-                "data": "1998-01-1",
-                "valid": false
-            },
-            {
-                "description": "invalid month",
-                "data": "1998-13-01",
-                "valid": false
-            },
-            {
-                "description": "invalid month-day combination",
-                "data": "1998-04-31",
-                "valid": false
-            },
-            {
-                "description": "2021 is not a leap year",
-                "data": "2021-02-29",
-                "valid": false
-            },
-            {
-                "description": "2020 is a leap year",
-                "data": "2020-02-29",
-                "valid": true
-            },
-            {
-                "description": "invalid non-ASCII '৪' (a Bengali 4)",
-                "data": "1963-06-1৪",
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft-next/optional/format/duration.json b/json/tests/draft-next/optional/format/duration.json
deleted file mode 100644
index d5adca2..0000000
--- a/json/tests/draft-next/optional/format/duration.json
+++ /dev/null
@@ -1,136 +0,0 @@
-[
-    {
-        "description": "validation of duration strings",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "format": "duration"
-        },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            },
-            {
-                "description": "a valid duration string",
-                "data": "P4DT12H30M5S",
-                "valid": true
-            },
-            {
-                "description": "an invalid duration string",
-                "data": "PT1D",
-                "valid": false
-            },
-            {
-                "description": "no elements present",
-                "data": "P",
-                "valid": false
-            },
-            {
-                "description": "no time elements present",
-                "data": "P1YT",
-                "valid": false
-            },
-            {
-                "description": "no date or time elements present",
-                "data": "PT",
-                "valid": false
-            },
-            {
-                "description": "elements out of order",
-                "data": "P2D1Y",
-                "valid": false
-            },
-            {
-                "description": "missing time separator",
-                "data": "P1D2H",
-                "valid": false
-            },
-            {
-                "description": "time element in the date position",
-                "data": "P2S",
-                "valid": false
-            },
-            {
-                "description": "four years duration",
-                "data": "P4Y",
-                "valid": true
-            },
-            {
-                "description": "zero time, in seconds",
-                "data": "PT0S",
-                "valid": true
-            },
-            {
-                "description": "zero time, in days",
-                "data": "P0D",
-                "valid": true
-            },
-            {
-                "description": "one month duration",
-                "data": "P1M",
-                "valid": true
-            },
-            {
-                "description": "one minute duration",
-                "data": "PT1M",
-                "valid": true
-            },
-            {
-                "description": "one and a half days, in hours",
-                "data": "PT36H",
-                "valid": true
-            },
-            {
-                "description": "one and a half days, in days and hours",
-                "data": "P1DT12H",
-                "valid": true
-            },
-            {
-                "description": "two weeks",
-                "data": "P2W",
-                "valid": true
-            },
-            {
-                "description": "weeks cannot be combined with other units",
-                "data": "P1Y2W",
-                "valid": false
-            },
-            {
-                "description": "invalid non-ASCII '২' (a Bengali 2)",
-                "data": "P২Y",
-                "valid": false
-            },
-            {
-                "description": "element without unit",
-                "data": "P1",
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft-next/optional/format/email.json b/json/tests/draft-next/optional/format/email.json
deleted file mode 100644
index 5948ebd..0000000
--- a/json/tests/draft-next/optional/format/email.json
+++ /dev/null
@@ -1,121 +0,0 @@
-[
-    {
-        "description": "validation of e-mail addresses",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "format": "email"
-        },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            },
-            {
-                "description": "a valid e-mail address",
-                "data": "joe.bloggs@example.com",
-                "valid": true
-            },
-            {
-                "description": "an invalid e-mail address",
-                "data": "2962",
-                "valid": false
-            },
-            {
-                "description": "tilde in local part is valid",
-                "data": "te~st@example.com",
-                "valid": true
-            },
-            {
-                "description": "tilde before local part is valid",
-                "data": "~test@example.com",
-                "valid": true
-            },
-            {
-                "description": "tilde after local part is valid",
-                "data": "test~@example.com",
-                "valid": true
-            },
-            {
-                "description": "a quoted string with a space in the local part is valid",
-                "data": "\"joe bloggs\"@example.com",
-                "valid": true
-            },
-            {
-                "description": "a quoted string with a double dot in the local part is valid",
-                "data": "\"joe..bloggs\"@example.com",
-                "valid": true
-            },
-            {
-                "description": "a quoted string with a @ in the local part is valid",
-                "data": "\"joe@bloggs\"@example.com",
-                "valid": true
-            },
-            {
-                "description": "an IPv4-address-literal after the @ is valid",
-                "data": "joe.bloggs@[127.0.0.1]",
-                "valid": true
-            },
-            {
-                "description": "an IPv6-address-literal after the @ is valid",
-                "data": "joe.bloggs@[IPv6:::1]",
-                "valid": true
-            },
-            {
-                "description": "dot before local part is not valid",
-                "data": ".test@example.com",
-                "valid": false
-            },
-            {
-                "description": "dot after local part is not valid",
-                "data": "test.@example.com",
-                "valid": false
-            },
-            {
-                "description": "two separated dots inside local part are valid",
-                "data": "te.s.t@example.com",
-                "valid": true
-            },
-            {
-                "description": "two subsequent dots inside local part are not valid",
-                "data": "te..st@example.com",
-                "valid": false
-            },
-            {
-                "description": "an invalid domain",
-                "data": "joe.bloggs@invalid=domain.com",
-                "valid": false
-            },
-            {
-                "description": "an invalid IPv4-address-literal",
-                "data": "joe.bloggs@[127.0.0.300]",
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft-next/optional/format/hostname.json b/json/tests/draft-next/optional/format/hostname.json
deleted file mode 100644
index 9678486..0000000
--- a/json/tests/draft-next/optional/format/hostname.json
+++ /dev/null
@@ -1,101 +0,0 @@
-[
-    {
-        "description": "validation of host names",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "format": "hostname"
-        },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            },
-            {
-                "description": "a valid host name",
-                "data": "www.example.com",
-                "valid": true
-            },
-            {
-                "description": "a valid punycoded IDN hostname",
-                "data": "xn--4gbwdl.xn--wgbh1c",
-                "valid": true
-            },
-            {
-                "description": "a host name starting with an illegal character",
-                "data": "-a-host-name-that-starts-with--",
-                "valid": false
-            },
-            {
-                "description": "a host name containing illegal characters",
-                "data": "not_a_valid_host_name",
-                "valid": false
-            },
-            {
-                "description": "a host name with a component too long",
-                "data": "a-vvvvvvvvvvvvvvvveeeeeeeeeeeeeeeerrrrrrrrrrrrrrrryyyyyyyyyyyyyyyy-long-host-name-component",
-                "valid": false
-            },
-            {
-                "description": "starts with hyphen",
-                "data": "-hostname",
-                "valid": false
-            },
-            {
-                "description": "ends with hyphen",
-                "data": "hostname-",
-                "valid": false
-            },
-            {
-                "description": "starts with underscore",
-                "data": "_hostname",
-                "valid": false
-            },
-            {
-                "description": "ends with underscore",
-                "data": "hostname_",
-                "valid": false
-            },
-            {
-                "description": "contains underscore",
-                "data": "host_name",
-                "valid": false
-            },
-            {
-                "description": "maximum label length",
-                "data": "abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijk.com",
-                "valid": true
-            },
-            {
-                "description": "exceeds maximum label length",
-                "data": "abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijkl.com",
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft-next/optional/format/idn-email.json b/json/tests/draft-next/optional/format/idn-email.json
deleted file mode 100644
index 1f35367..0000000
--- a/json/tests/draft-next/optional/format/idn-email.json
+++ /dev/null
@@ -1,61 +0,0 @@
-[
-    {
-        "description": "validation of an internationalized e-mail addresses",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "format": "idn-email"
-        },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            },
-            {
-                "description": "a valid idn e-mail (example@example.test in Hangul)",
-                "data": "실례@실례.테스트",
-                "valid": true
-            },
-            {
-                "description": "an invalid idn e-mail address",
-                "data": "2962",
-                "valid": false
-            },
-            {
-                "description": "a valid e-mail address",
-                "data": "joe.bloggs@example.com",
-                "valid": true
-            },
-            {
-                "description": "an invalid e-mail address",
-                "data": "2962",
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft-next/optional/format/idn-hostname.json b/json/tests/draft-next/optional/format/idn-hostname.json
deleted file mode 100644
index ee2e792..0000000
--- a/json/tests/draft-next/optional/format/idn-hostname.json
+++ /dev/null
@@ -1,307 +0,0 @@
-[
-    {
-        "description": "validation of internationalized host names",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "format": "idn-hostname"
-        },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            },
-            {
-                "description": "a valid host name (example.test in Hangul)",
-                "data": "실례.테스트",
-                "valid": true
-            },
-            {
-                "description": "illegal first char U+302E Hangul single dot tone mark",
-                "data": "〮실례.테스트",
-                "valid": false
-            },
-            {
-                "description": "contains illegal char U+302E Hangul single dot tone mark",
-                "data": "실〮례.테스트",
-                "valid": false
-            },
-            {
-                "description": "a host name with a component too long",
-                "data": "실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실례례테스트례례례례례례례례례례례례례례례례례테스트례례례례례례례례례례례례례례례례례례례테스트례례례례례례례례례례례례테스트례례실례.테스트",
-                "valid": false
-            },
-            {
-                "description": "invalid label, correct Punycode",
-                "comment": "https://tools.ietf.org/html/rfc5890#section-2.3.2.1 https://tools.ietf.org/html/rfc5891#section-4.4 https://tools.ietf.org/html/rfc3492#section-7.1",
-                "data": "-> $1.00 <--",
-                "valid": false
-            },
-            {
-                "description": "valid Chinese Punycode",
-                "comment": "https://tools.ietf.org/html/rfc5890#section-2.3.2.1 https://tools.ietf.org/html/rfc5891#section-4.4",
-                "data": "xn--ihqwcrb4cv8a8dqg056pqjye",
-                "valid": true
-            },
-            {
-                "description": "invalid Punycode",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.4 https://tools.ietf.org/html/rfc5890#section-2.3.2.1",
-                "data": "xn--X",
-                "valid": false
-            },
-            {
-                "description": "U-label contains \"--\" in the 3rd and 4th position",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.2.3.1 https://tools.ietf.org/html/rfc5890#section-2.3.2.1",
-                "data": "XN--aa---o47jg78q",
-                "valid": false
-            },
-            {
-                "description": "U-label starts with a dash",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.2.3.1",
-                "data": "-hello",
-                "valid": false
-            },
-            {
-                "description": "U-label ends with a dash",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.2.3.1",
-                "data": "hello-",
-                "valid": false
-            },
-            {
-                "description": "U-label starts and ends with a dash",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.2.3.1",
-                "data": "-hello-",
-                "valid": false
-            },
-            {
-                "description": "Begins with a Spacing Combining Mark",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.2.3.2",
-                "data": "\u0903hello",
-                "valid": false
-            },
-            {
-                "description": "Begins with a Nonspacing Mark",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.2.3.2",
-                "data": "\u0300hello",
-                "valid": false
-            },
-            {
-                "description": "Begins with an Enclosing Mark",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.2.3.2",
-                "data": "\u0488hello",
-                "valid": false
-            },
-            {
-                "description": "Exceptions that are PVALID, left-to-right chars",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.2.2 https://tools.ietf.org/html/rfc5892#section-2.6",
-                "data": "\u00df\u03c2\u0f0b\u3007",
-                "valid": true
-            },
-            {
-                "description": "Exceptions that are PVALID, right-to-left chars",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.2.2 https://tools.ietf.org/html/rfc5892#section-2.6",
-                "data": "\u06fd\u06fe",
-                "valid": true
-            },
-            {
-                "description": "Exceptions that are DISALLOWED, right-to-left chars",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.2.2 https://tools.ietf.org/html/rfc5892#section-2.6",
-                "data": "\u0640\u07fa",
-                "valid": false
-            },
-            {
-                "description": "Exceptions that are DISALLOWED, left-to-right chars",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.2.2 https://tools.ietf.org/html/rfc5892#section-2.6 Note: The two combining marks (U+302E and U+302F) are in the middle and not at the start",
-                "data": "\u3031\u3032\u3033\u3034\u3035\u302e\u302f\u303b",
-                "valid": false
-            },
-            {
-                "description": "MIDDLE DOT with no preceding 'l'",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.2.3.3 https://tools.ietf.org/html/rfc5892#appendix-A.3",
-                "data": "a\u00b7l",
-                "valid": false
-            },
-            {
-                "description": "MIDDLE DOT with nothing preceding",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.2.3.3 https://tools.ietf.org/html/rfc5892#appendix-A.3",
-                "data": "\u00b7l",
-                "valid": false
-            },
-            {
-                "description": "MIDDLE DOT with no following 'l'",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.2.3.3 https://tools.ietf.org/html/rfc5892#appendix-A.3",
-                "data": "l\u00b7a",
-                "valid": false
-            },
-            {
-                "description": "MIDDLE DOT with nothing following",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.2.3.3 https://tools.ietf.org/html/rfc5892#appendix-A.3",
-                "data": "l\u00b7",
-                "valid": false
-            },
-            {
-                "description": "MIDDLE DOT with surrounding 'l's",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.2.3.3 https://tools.ietf.org/html/rfc5892#appendix-A.3",
-                "data": "l\u00b7l",
-                "valid": true
-            },
-            {
-                "description": "Greek KERAIA not followed by Greek",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.2.3.3 https://tools.ietf.org/html/rfc5892#appendix-A.4",
-                "data": "\u03b1\u0375S",
-                "valid": false
-            },
-            {
-                "description": "Greek KERAIA not followed by anything",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.2.3.3 https://tools.ietf.org/html/rfc5892#appendix-A.4",
-                "data": "\u03b1\u0375",
-                "valid": false
-            },
-            {
-                "description": "Greek KERAIA followed by Greek",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.2.3.3 https://tools.ietf.org/html/rfc5892#appendix-A.4",
-                "data": "\u03b1\u0375\u03b2",
-                "valid": true
-            },
-            {
-                "description": "Hebrew GERESH not preceded by Hebrew",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.2.3.3 https://tools.ietf.org/html/rfc5892#appendix-A.5",
-                "data": "A\u05f3\u05d1",
-                "valid": false
-            },
-            {
-                "description": "Hebrew GERESH not preceded by anything",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.2.3.3 https://tools.ietf.org/html/rfc5892#appendix-A.5",
-                "data": "\u05f3\u05d1",
-                "valid": false
-            },
-            {
-                "description": "Hebrew GERESH preceded by Hebrew",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.2.3.3 https://tools.ietf.org/html/rfc5892#appendix-A.5",
-                "data": "\u05d0\u05f3\u05d1",
-                "valid": true
-            },
-            {
-                "description": "Hebrew GERSHAYIM not preceded by Hebrew",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.2.3.3 https://tools.ietf.org/html/rfc5892#appendix-A.6",
-                "data": "A\u05f4\u05d1",
-                "valid": false
-            },
-            {
-                "description": "Hebrew GERSHAYIM not preceded by anything",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.2.3.3 https://tools.ietf.org/html/rfc5892#appendix-A.6",
-                "data": "\u05f4\u05d1",
-                "valid": false
-            },
-            {
-                "description": "Hebrew GERSHAYIM preceded by Hebrew",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.2.3.3 https://tools.ietf.org/html/rfc5892#appendix-A.6",
-                "data": "\u05d0\u05f4\u05d1",
-                "valid": true
-            },
-            {
-                "description": "KATAKANA MIDDLE DOT with no Hiragana, Katakana, or Han",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.2.3.3 https://tools.ietf.org/html/rfc5892#appendix-A.7",
-                "data": "def\u30fbabc",
-                "valid": false
-            },
-            {
-                "description": "KATAKANA MIDDLE DOT with no other characters",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.2.3.3 https://tools.ietf.org/html/rfc5892#appendix-A.7",
-                "data": "\u30fb",
-                "valid": false
-            },
-            {
-                "description": "KATAKANA MIDDLE DOT with Hiragana",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.2.3.3 https://tools.ietf.org/html/rfc5892#appendix-A.7",
-                "data": "\u30fb\u3041",
-                "valid": true
-            },
-            {
-                "description": "KATAKANA MIDDLE DOT with Katakana",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.2.3.3 https://tools.ietf.org/html/rfc5892#appendix-A.7",
-                "data": "\u30fb\u30a1",
-                "valid": true
-            },
-            {
-                "description": "KATAKANA MIDDLE DOT with Han",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.2.3.3 https://tools.ietf.org/html/rfc5892#appendix-A.7",
-                "data": "\u30fb\u4e08",
-                "valid": true
-            },
-            {
-                "description": "Arabic-Indic digits mixed with Extended Arabic-Indic digits",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.2.3.3 https://tools.ietf.org/html/rfc5892#appendix-A.8",
-                "data": "\u0660\u06f0",
-                "valid": false
-            },
-            {
-                "description": "Arabic-Indic digits not mixed with Extended Arabic-Indic digits",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.2.3.3 https://tools.ietf.org/html/rfc5892#appendix-A.8",
-                "data": "\u0628\u0660\u0628",
-                "valid": true
-            },
-            {
-                "description": "Extended Arabic-Indic digits not mixed with Arabic-Indic digits",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.2.3.3 https://tools.ietf.org/html/rfc5892#appendix-A.9",
-                "data": "\u06f00",
-                "valid": true
-            },
-            {
-                "description": "ZERO WIDTH JOINER not preceded by Virama",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.2.3.3 https://tools.ietf.org/html/rfc5892#appendix-A.2 https://www.unicode.org/review/pr-37.pdf",
-                "data": "\u0915\u200d\u0937",
-                "valid": false
-            },
-            {
-                "description": "ZERO WIDTH JOINER not preceded by anything",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.2.3.3 https://tools.ietf.org/html/rfc5892#appendix-A.2 https://www.unicode.org/review/pr-37.pdf",
-                "data": "\u200d\u0937",
-                "valid": false
-            },
-            {
-                "description": "ZERO WIDTH JOINER preceded by Virama",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.2.3.3 https://tools.ietf.org/html/rfc5892#appendix-A.2 https://www.unicode.org/review/pr-37.pdf",
-                "data": "\u0915\u094d\u200d\u0937",
-                "valid": true
-            },
-            {
-                "description": "ZERO WIDTH NON-JOINER preceded by Virama",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.2.3.3 https://tools.ietf.org/html/rfc5892#appendix-A.1",
-                "data": "\u0915\u094d\u200c\u0937",
-                "valid": true
-            },
-            {
-                "description": "ZERO WIDTH NON-JOINER not preceded by Virama but matches regexp",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.2.3.3 https://tools.ietf.org/html/rfc5892#appendix-A.1 https://www.w3.org/TR/alreq/#h_disjoining_enforcement",
-                "data": "\u0628\u064a\u200c\u0628\u064a",
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft-next/optional/format/ipv4.json b/json/tests/draft-next/optional/format/ipv4.json
deleted file mode 100644
index e3e9440..0000000
--- a/json/tests/draft-next/optional/format/ipv4.json
+++ /dev/null
@@ -1,87 +0,0 @@
-[
-    {
-        "description": "validation of IP addresses",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "format": "ipv4"
-        },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            },
-            {
-                "description": "a valid IP address",
-                "data": "192.168.0.1",
-                "valid": true
-            },
-            {
-                "description": "an IP address with too many components",
-                "data": "127.0.0.0.1",
-                "valid": false
-            },
-            {
-                "description": "an IP address with out-of-range values",
-                "data": "256.256.256.256",
-                "valid": false
-            },
-            {
-                "description": "an IP address without 4 components",
-                "data": "127.0",
-                "valid": false
-            },
-            {
-                "description": "an IP address as an integer",
-                "data": "0x7f000001",
-                "valid": false
-            },
-            {
-                "description": "an IP address as an integer (decimal)",
-                "data": "2130706433",
-                "valid": false
-            },
-            {
-                "description": "invalid leading zeroes, as they are treated as octals",
-                "comment": "see https://sick.codes/universal-netmask-npm-package-used-by-270000-projects-vulnerable-to-octal-input-data-server-side-request-forgery-remote-file-inclusion-local-file-inclusion-and-more-cve-2021-28918/",
-                "data": "087.10.0.1",
-                "valid": false
-            },
-            {
-                "description": "value without leading zero is valid",
-                "data": "87.10.0.1",
-                "valid": true
-            },
-            {
-                "description": "invalid non-ASCII '২' (a Bengali 2)",
-                "data": "1২7.0.0.1",
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft-next/optional/format/ipv6.json b/json/tests/draft-next/optional/format/ipv6.json
deleted file mode 100644
index 241df7f..0000000
--- a/json/tests/draft-next/optional/format/ipv6.json
+++ /dev/null
@@ -1,211 +0,0 @@
-[
-    {
-        "description": "validation of IPv6 addresses",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "format": "ipv6"
-        },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            },
-            {
-                "description": "a valid IPv6 address",
-                "data": "::1",
-                "valid": true
-            },
-            {
-                "description": "an IPv6 address with out-of-range values",
-                "data": "12345::",
-                "valid": false
-            },
-            {
-                "description": "trailing 4 hex symbols is valid",
-                "data": "::abef",
-                "valid": true
-            },
-            {
-                "description": "trailing 5 hex symbols is invalid",
-                "data": "::abcef",
-                "valid": false
-            },
-            {
-                "description": "an IPv6 address with too many components",
-                "data": "1:1:1:1:1:1:1:1:1:1:1:1:1:1:1:1",
-                "valid": false
-            },
-            {
-                "description": "an IPv6 address containing illegal characters",
-                "data": "::laptop",
-                "valid": false
-            },
-            {
-                "description": "no digits is valid",
-                "data": "::",
-                "valid": true
-            },
-            {
-                "description": "leading colons is valid",
-                "data": "::42:ff:1",
-                "valid": true
-            },
-            {
-                "description": "trailing colons is valid",
-                "data": "d6::",
-                "valid": true
-            },
-            {
-                "description": "missing leading octet is invalid",
-                "data": ":2:3:4:5:6:7:8",
-                "valid": false
-            },
-            {
-                "description": "missing trailing octet is invalid",
-                "data": "1:2:3:4:5:6:7:",
-                "valid": false
-            },
-            {
-                "description": "missing leading octet with omitted octets later",
-                "data": ":2:3:4::8",
-                "valid": false
-            },
-            {
-                "description": "single set of double colons in the middle is valid",
-                "data": "1:d6::42",
-                "valid": true
-            },
-            {
-                "description": "two sets of double colons is invalid",
-                "data": "1::d6::42",
-                "valid": false
-            },
-            {
-                "description": "mixed format with the ipv4 section as decimal octets",
-                "data": "1::d6:192.168.0.1",
-                "valid": true
-            },
-            {
-                "description": "mixed format with double colons between the sections",
-                "data": "1:2::192.168.0.1",
-                "valid": true
-            },
-            {
-                "description": "mixed format with ipv4 section with octet out of range",
-                "data": "1::2:192.168.256.1",
-                "valid": false
-            },
-            {
-                "description": "mixed format with ipv4 section with a hex octet",
-                "data": "1::2:192.168.ff.1",
-                "valid": false
-            },
-            {
-                "description": "mixed format with leading double colons (ipv4-mapped ipv6 address)",
-                "data": "::ffff:192.168.0.1",
-                "valid": true
-            },
-            {
-                "description": "triple colons is invalid",
-                "data": "1:2:3:4:5:::8",
-                "valid": false
-            },
-            {
-                "description": "8 octets",
-                "data": "1:2:3:4:5:6:7:8",
-                "valid": true
-            },
-            {
-                "description": "insufficient octets without double colons",
-                "data": "1:2:3:4:5:6:7",
-                "valid": false
-            },
-            {
-                "description": "no colons is invalid",
-                "data": "1",
-                "valid": false
-            },
-            {
-                "description": "ipv4 is not ipv6",
-                "data": "127.0.0.1",
-                "valid": false
-            },
-            {
-                "description": "ipv4 segment must have 4 octets",
-                "data": "1:2:3:4:1.2.3",
-                "valid": false
-            },
-            {
-                "description": "leading whitespace is invalid",
-                "data": "  ::1",
-                "valid": false
-            },
-            {
-                "description": "trailing whitespace is invalid",
-                "data": "::1  ",
-                "valid": false
-            },
-            {
-                "description": "netmask is not a part of ipv6 address",
-                "data": "fe80::/64",
-                "valid": false
-            },
-            {
-                "description": "zone id is not a part of ipv6 address",
-                "data": "fe80::a%eth1",
-                "valid": false
-            },
-            {
-                "description": "a long valid ipv6",
-                "data": "1000:1000:1000:1000:1000:1000:255.255.255.255",
-                "valid": true
-            },
-            {
-                "description": "a long invalid ipv6, below length limit, first",
-                "data": "100:100:100:100:100:100:255.255.255.255.255",
-                "valid": false
-            },
-            {
-                "description": "a long invalid ipv6, below length limit, second",
-                "data": "100:100:100:100:100:100:100:255.255.255.255",
-                "valid": false
-            },
-            {
-                "description": "invalid non-ASCII '৪' (a Bengali 4)",
-                "data": "1:2:3:4:5:6:7:৪",
-                "valid": false
-            },
-            {
-                "description": "invalid non-ASCII '৪' (a Bengali 4) in the IPv4 portion",
-                "data": "1:2::192.16৪.0.1",
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft-next/optional/format/iri-reference.json b/json/tests/draft-next/optional/format/iri-reference.json
deleted file mode 100644
index 543b99e..0000000
--- a/json/tests/draft-next/optional/format/iri-reference.json
+++ /dev/null
@@ -1,76 +0,0 @@
-[
-    {
-        "description": "validation of IRI References",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "format": "iri-reference"
-        },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            },
-            {
-                "description": "a valid IRI",
-                "data": "http://ƒøø.ßår/?∂éœ=πîx#πîüx",
-                "valid": true
-            },
-            {
-                "description": "a valid protocol-relative IRI Reference",
-                "data": "//ƒøø.ßår/?∂éœ=πîx#πîüx",
-                "valid": true
-            },
-            {
-                "description": "a valid relative IRI Reference",
-                "data": "/âππ",
-                "valid": true
-            },
-            {
-                "description": "an invalid IRI Reference",
-                "data": "\\\\WINDOWS\\filëßåré",
-                "valid": false
-            },
-            {
-                "description": "a valid IRI Reference",
-                "data": "âππ",
-                "valid": true
-            },
-            {
-                "description": "a valid IRI fragment",
-                "data": "#ƒrägmênt",
-                "valid": true
-            },
-            {
-                "description": "an invalid IRI fragment",
-                "data": "#ƒräg\\mênt",
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft-next/optional/format/iri.json b/json/tests/draft-next/optional/format/iri.json
deleted file mode 100644
index 48e82a2..0000000
--- a/json/tests/draft-next/optional/format/iri.json
+++ /dev/null
@@ -1,86 +0,0 @@
-[
-    {
-        "description": "validation of IRIs",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "format": "iri"
-        },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            },
-            {
-                "description": "a valid IRI with anchor tag",
-                "data": "http://ƒøø.ßår/?∂éœ=πîx#πîüx",
-                "valid": true
-            },
-            {
-                "description": "a valid IRI with anchor tag and parentheses",
-                "data": "http://ƒøø.com/blah_(wîkïpédiå)_blah#ßité-1",
-                "valid": true
-            },
-            {
-                "description": "a valid IRI with URL-encoded stuff",
-                "data": "http://ƒøø.ßår/?q=Test%20URL-encoded%20stuff",
-                "valid": true
-            },
-            {
-                "description": "a valid IRI with many special characters",
-                "data": "http://-.~_!$&'()*+,;=:%40:80%2f::::::@example.com",
-                "valid": true
-            },
-            {
-                "description": "a valid IRI based on IPv6",
-                "data": "http://[2001:0db8:85a3:0000:0000:8a2e:0370:7334]",
-                "valid": true
-            },
-            {
-                "description": "an invalid IRI based on IPv6",
-                "data": "http://2001:0db8:85a3:0000:0000:8a2e:0370:7334",
-                "valid": false
-            },
-            {
-                "description": "an invalid relative IRI Reference",
-                "data": "/abc",
-                "valid": false
-            },
-            {
-                "description": "an invalid IRI",
-                "data": "\\\\WINDOWS\\filëßåré",
-                "valid": false
-            },
-            {
-                "description": "an invalid IRI though valid IRI reference",
-                "data": "âππ",
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft-next/optional/format/json-pointer.json b/json/tests/draft-next/optional/format/json-pointer.json
deleted file mode 100644
index f55342f..0000000
--- a/json/tests/draft-next/optional/format/json-pointer.json
+++ /dev/null
@@ -1,201 +0,0 @@
-[
-    {
-        "description": "validation of JSON-pointers (JSON String Representation)",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "format": "json-pointer"
-        },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            },
-            {
-                "description": "a valid JSON-pointer",
-                "data": "/foo/bar~0/baz~1/%a",
-                "valid": true
-            },
-            {
-                "description": "not a valid JSON-pointer (~ not escaped)",
-                "data": "/foo/bar~",
-                "valid": false
-            },
-            {
-                "description": "valid JSON-pointer with empty segment",
-                "data": "/foo//bar",
-                "valid": true
-            },
-            {
-                "description": "valid JSON-pointer with the last empty segment",
-                "data": "/foo/bar/",
-                "valid": true
-            },
-            {
-                "description": "valid JSON-pointer as stated in RFC 6901 #1",
-                "data": "",
-                "valid": true
-            },
-            {
-                "description": "valid JSON-pointer as stated in RFC 6901 #2",
-                "data": "/foo",
-                "valid": true
-            },
-            {
-                "description": "valid JSON-pointer as stated in RFC 6901 #3",
-                "data": "/foo/0",
-                "valid": true
-            },
-            {
-                "description": "valid JSON-pointer as stated in RFC 6901 #4",
-                "data": "/",
-                "valid": true
-            },
-            {
-                "description": "valid JSON-pointer as stated in RFC 6901 #5",
-                "data": "/a~1b",
-                "valid": true
-            },
-            {
-                "description": "valid JSON-pointer as stated in RFC 6901 #6",
-                "data": "/c%d",
-                "valid": true
-            },
-            {
-                "description": "valid JSON-pointer as stated in RFC 6901 #7",
-                "data": "/e^f",
-                "valid": true
-            },
-            {
-                "description": "valid JSON-pointer as stated in RFC 6901 #8",
-                "data": "/g|h",
-                "valid": true
-            },
-            {
-                "description": "valid JSON-pointer as stated in RFC 6901 #9",
-                "data": "/i\\j",
-                "valid": true
-            },
-            {
-                "description": "valid JSON-pointer as stated in RFC 6901 #10",
-                "data": "/k\"l",
-                "valid": true
-            },
-            {
-                "description": "valid JSON-pointer as stated in RFC 6901 #11",
-                "data": "/ ",
-                "valid": true
-            },
-            {
-                "description": "valid JSON-pointer as stated in RFC 6901 #12",
-                "data": "/m~0n",
-                "valid": true
-            },
-            {
-                "description": "valid JSON-pointer used adding to the last array position",
-                "data": "/foo/-",
-                "valid": true
-            },
-            {
-                "description": "valid JSON-pointer (- used as object member name)",
-                "data": "/foo/-/bar",
-                "valid": true
-            },
-            {
-                "description": "valid JSON-pointer (multiple escaped characters)",
-                "data": "/~1~0~0~1~1",
-                "valid": true
-            },
-            {
-                "description": "valid JSON-pointer (escaped with fraction part) #1",
-                "data": "/~1.1",
-                "valid": true
-            },
-            {
-                "description": "valid JSON-pointer (escaped with fraction part) #2",
-                "data": "/~0.1",
-                "valid": true
-            },
-            {
-                "description": "not a valid JSON-pointer (URI Fragment Identifier) #1",
-                "data": "#",
-                "valid": false
-            },
-            {
-                "description": "not a valid JSON-pointer (URI Fragment Identifier) #2",
-                "data": "#/",
-                "valid": false
-            },
-            {
-                "description": "not a valid JSON-pointer (URI Fragment Identifier) #3",
-                "data": "#a",
-                "valid": false
-            },
-            {
-                "description": "not a valid JSON-pointer (some escaped, but not all) #1",
-                "data": "/~0~",
-                "valid": false
-            },
-            {
-                "description": "not a valid JSON-pointer (some escaped, but not all) #2",
-                "data": "/~0/~",
-                "valid": false
-            },
-            {
-                "description": "not a valid JSON-pointer (wrong escape character) #1",
-                "data": "/~2",
-                "valid": false
-            },
-            {
-                "description": "not a valid JSON-pointer (wrong escape character) #2",
-                "data": "/~-1",
-                "valid": false
-            },
-            {
-                "description": "not a valid JSON-pointer (multiple characters not escaped)",
-                "data": "/~~",
-                "valid": false
-            },
-            {
-                "description": "not a valid JSON-pointer (isn't empty nor starts with /) #1",
-                "data": "a",
-                "valid": false
-            },
-            {
-                "description": "not a valid JSON-pointer (isn't empty nor starts with /) #2",
-                "data": "0",
-                "valid": false
-            },
-            {
-                "description": "not a valid JSON-pointer (isn't empty nor starts with /) #3",
-                "data": "a/a",
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft-next/optional/format/regex.json b/json/tests/draft-next/optional/format/regex.json
deleted file mode 100644
index 5987f53..0000000
--- a/json/tests/draft-next/optional/format/regex.json
+++ /dev/null
@@ -1,51 +0,0 @@
-[
-    {
-        "description": "validation of regular expressions",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "format": "regex"
-        },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            },
-            {
-                "description": "a valid regular expression",
-                "data": "([abc])+\\s+$",
-                "valid": true
-            },
-            {
-                "description": "a regular expression with unclosed parens is invalid",
-                "data": "^(abc]",
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft-next/optional/format/relative-json-pointer.json b/json/tests/draft-next/optional/format/relative-json-pointer.json
deleted file mode 100644
index 1e28fc2..0000000
--- a/json/tests/draft-next/optional/format/relative-json-pointer.json
+++ /dev/null
@@ -1,101 +0,0 @@
-[
-    {
-        "description": "validation of Relative JSON Pointers (RJP)",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "format": "relative-json-pointer"
-        },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            },
-            {
-                "description": "a valid upwards RJP",
-                "data": "1",
-                "valid": true
-            },
-            {
-                "description": "a valid downwards RJP",
-                "data": "0/foo/bar",
-                "valid": true
-            },
-            {
-                "description": "a valid up and then down RJP, with array index",
-                "data": "2/0/baz/1/zip",
-                "valid": true
-            },
-            {
-                "description": "a valid RJP taking the member or index name",
-                "data": "0#",
-                "valid": true
-            },
-            {
-                "description": "an invalid RJP that is a valid JSON Pointer",
-                "data": "/foo/bar",
-                "valid": false
-            },
-            {
-                "description": "negative prefix",
-                "data": "-1/foo/bar",
-                "valid": false
-            },
-            {
-                "description": "explicit positive prefix",
-                "data": "+1/foo/bar",
-                "valid": false
-            },
-            {
-                "description": "## is not a valid json-pointer",
-                "data": "0##",
-                "valid": false
-            },
-            {
-                "description": "zero cannot be followed by other digits, plus json-pointer",
-                "data": "01/a",
-                "valid": false
-            },
-            {
-                "description": "zero cannot be followed by other digits, plus octothorpe",
-                "data": "01#",
-                "valid": false
-            },
-            {
-                "description": "empty string",
-                "data": "",
-                "valid": false
-            },
-            {
-                "description": "multi-digit integer prefix",
-                "data": "120/foo/bar",
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft-next/optional/format/time.json b/json/tests/draft-next/optional/format/time.json
deleted file mode 100644
index bb58091..0000000
--- a/json/tests/draft-next/optional/format/time.json
+++ /dev/null
@@ -1,216 +0,0 @@
-[
-    {
-        "description": "validation of time strings",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "format": "time"
-        },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            },
-            {
-                "description": "a valid time string",
-                "data": "08:30:06Z",
-                "valid": true
-            },
-            {
-                "description": "a valid time string with leap second, Zulu",
-                "data": "23:59:60Z",
-                "valid": true
-            },
-            {
-                "description": "invalid leap second, Zulu (wrong hour)",
-                "data": "22:59:60Z",
-                "valid": false
-            },
-            {
-                "description": "invalid leap second, Zulu (wrong minute)",
-                "data": "23:58:60Z",
-                "valid": false
-            },
-            {
-                "description": "valid leap second, zero time-offset",
-                "data": "23:59:60+00:00",
-                "valid": true
-            },
-            {
-                "description": "invalid leap second, zero time-offset (wrong hour)",
-                "data": "22:59:60+00:00",
-                "valid": false
-            },
-            {
-                "description": "invalid leap second, zero time-offset (wrong minute)",
-                "data": "23:58:60+00:00",
-                "valid": false
-            },
-            {
-                "description": "valid leap second, positive time-offset",
-                "data": "01:29:60+01:30",
-                "valid": true
-            },
-            {
-                "description": "valid leap second, large positive time-offset",
-                "data": "23:29:60+23:30",
-                "valid": true
-            },
-            {
-                "description": "invalid leap second, positive time-offset (wrong hour)",
-                "data": "23:59:60+01:00",
-                "valid": false
-            },
-            {
-                "description": "invalid leap second, positive time-offset (wrong minute)",
-                "data": "23:59:60+00:30",
-                "valid": false
-            },
-            {
-                "description": "valid leap second, negative time-offset",
-                "data": "15:59:60-08:00",
-                "valid": true
-            },
-            {
-                "description": "valid leap second, large negative time-offset",
-                "data": "00:29:60-23:30",
-                "valid": true
-            },
-            {
-                "description": "invalid leap second, negative time-offset (wrong hour)",
-                "data": "23:59:60-01:00",
-                "valid": false
-            },
-            {
-                "description": "invalid leap second, negative time-offset (wrong minute)",
-                "data": "23:59:60-00:30",
-                "valid": false
-            },
-            {
-                "description": "a valid time string with second fraction",
-                "data": "23:20:50.52Z",
-                "valid": true
-            },
-            {
-                "description": "a valid time string with precise second fraction",
-                "data": "08:30:06.283185Z",
-                "valid": true
-            },
-            {
-                "description": "a valid time string with plus offset",
-                "data": "08:30:06+00:20",
-                "valid": true
-            },
-            {
-                "description": "a valid time string with minus offset",
-                "data": "08:30:06-08:00",
-                "valid": true
-            },
-            {
-                "description": "a valid time string with case-insensitive Z",
-                "data": "08:30:06z",
-                "valid": true
-            },
-            {
-                "description": "an invalid time string with invalid hour",
-                "data": "24:00:00Z",
-                "valid": false
-            },
-            {
-                "description": "an invalid time string with invalid minute",
-                "data": "00:60:00Z",
-                "valid": false
-            },
-            {
-                "description": "an invalid time string with invalid second",
-                "data": "00:00:61Z",
-                "valid": false
-            },
-            {
-                "description": "an invalid time string with invalid leap second (wrong hour)",
-                "data": "22:59:60Z",
-                "valid": false
-            },
-            {
-                "description": "an invalid time string with invalid leap second (wrong minute)",
-                "data": "23:58:60Z",
-                "valid": false
-            },
-            {
-                "description": "an invalid time string with invalid time numoffset hour",
-                "data": "01:02:03+24:00",
-                "valid": false
-            },
-            {
-                "description": "an invalid time string with invalid time numoffset minute",
-                "data": "01:02:03+00:60",
-                "valid": false
-            },
-            {
-                "description": "an invalid time string with invalid time with both Z and numoffset",
-                "data": "01:02:03Z+00:30",
-                "valid": false
-            },
-            {
-                "description": "an invalid offset indicator",
-                "data": "08:30:06 PST",
-                "valid": false
-            },
-            {
-                "description": "only RFC3339 not all of ISO 8601 are valid",
-                "data": "01:01:01,1111",
-                "valid": false
-            },
-            {
-                "description": "no time offset",
-                "data": "12:00:00",
-                "valid": false
-            },
-            {
-                "description": "no time offset with second fraction",
-                "data": "12:00:00.52",
-                "valid": false
-            },
-            {
-                "description": "invalid non-ASCII '২' (a Bengali 2)",
-                "data": "1২:00:00Z",
-                "valid": false
-            },
-            {
-                "description": "offset not starting with plus or minus",
-                "data": "08:30:06#00:20",
-                "valid": false
-            },
-            {
-                "description": "contains letters",
-                "data": "ab:cd:ef",
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft-next/optional/format/uri-reference.json b/json/tests/draft-next/optional/format/uri-reference.json
deleted file mode 100644
index 8d9d254..0000000
--- a/json/tests/draft-next/optional/format/uri-reference.json
+++ /dev/null
@@ -1,76 +0,0 @@
-[
-    {
-        "description": "validation of URI References",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "format": "uri-reference"
-        },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            },
-            {
-                "description": "a valid URI",
-                "data": "http://foo.bar/?baz=qux#quux",
-                "valid": true
-            },
-            {
-                "description": "a valid protocol-relative URI Reference",
-                "data": "//foo.bar/?baz=qux#quux",
-                "valid": true
-            },
-            {
-                "description": "a valid relative URI Reference",
-                "data": "/abc",
-                "valid": true
-            },
-            {
-                "description": "an invalid URI Reference",
-                "data": "\\\\WINDOWS\\fileshare",
-                "valid": false
-            },
-            {
-                "description": "a valid URI Reference",
-                "data": "abc",
-                "valid": true
-            },
-            {
-                "description": "a valid URI fragment",
-                "data": "#fragment",
-                "valid": true
-            },
-            {
-                "description": "an invalid URI fragment",
-                "data": "#frag\\ment",
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft-next/optional/format/uri-template.json b/json/tests/draft-next/optional/format/uri-template.json
deleted file mode 100644
index f57d62d..0000000
--- a/json/tests/draft-next/optional/format/uri-template.json
+++ /dev/null
@@ -1,61 +0,0 @@
-[
-    {
-        "description": "format: uri-template",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "format": "uri-template"
-        },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            },
-            {
-                "description": "a valid uri-template",
-                "data": "http://example.com/dictionary/{term:1}/{term}",
-                "valid": true
-            },
-            {
-                "description": "an invalid uri-template",
-                "data": "http://example.com/dictionary/{term:1}/{term",
-                "valid": false
-            },
-            {
-                "description": "a valid uri-template without variables",
-                "data": "http://example.com/dictionary",
-                "valid": true
-            },
-            {
-                "description": "a valid relative uri-template",
-                "data": "dictionary/{term:1}/{term}",
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft-next/optional/format/uri.json b/json/tests/draft-next/optional/format/uri.json
deleted file mode 100644
index 50908ea..0000000
--- a/json/tests/draft-next/optional/format/uri.json
+++ /dev/null
@@ -1,141 +0,0 @@
-[
-    {
-        "description": "validation of URIs",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "format": "uri"
-        },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            },
-            {
-                "description": "a valid URL with anchor tag",
-                "data": "http://foo.bar/?baz=qux#quux",
-                "valid": true
-            },
-            {
-                "description": "a valid URL with anchor tag and parentheses",
-                "data": "http://foo.com/blah_(wikipedia)_blah#cite-1",
-                "valid": true
-            },
-            {
-                "description": "a valid URL with URL-encoded stuff",
-                "data": "http://foo.bar/?q=Test%20URL-encoded%20stuff",
-                "valid": true
-            },
-            {
-                "description": "a valid puny-coded URL ",
-                "data": "http://xn--nw2a.xn--j6w193g/",
-                "valid": true
-            },
-            {
-                "description": "a valid URL with many special characters",
-                "data": "http://-.~_!$&'()*+,;=:%40:80%2f::::::@example.com",
-                "valid": true
-            },
-            {
-                "description": "a valid URL based on IPv4",
-                "data": "http://223.255.255.254",
-                "valid": true
-            },
-            {
-                "description": "a valid URL with ftp scheme",
-                "data": "ftp://ftp.is.co.za/rfc/rfc1808.txt",
-                "valid": true
-            },
-            {
-                "description": "a valid URL for a simple text file",
-                "data": "http://www.ietf.org/rfc/rfc2396.txt",
-                "valid": true
-            },
-            {
-                "description": "a valid URL ",
-                "data": "ldap://[2001:db8::7]/c=GB?objectClass?one",
-                "valid": true
-            },
-            {
-                "description": "a valid mailto URI",
-                "data": "mailto:John.Doe@example.com",
-                "valid": true
-            },
-            {
-                "description": "a valid newsgroup URI",
-                "data": "news:comp.infosystems.www.servers.unix",
-                "valid": true
-            },
-            {
-                "description": "a valid tel URI",
-                "data": "tel:+1-816-555-1212",
-                "valid": true
-            },
-            {
-                "description": "a valid URN",
-                "data": "urn:oasis:names:specification:docbook:dtd:xml:4.1.2",
-                "valid": true
-            },
-            {
-                "description": "an invalid protocol-relative URI Reference",
-                "data": "//foo.bar/?baz=qux#quux",
-                "valid": false
-            },
-            {
-                "description": "an invalid relative URI Reference",
-                "data": "/abc",
-                "valid": false
-            },
-            {
-                "description": "an invalid URI",
-                "data": "\\\\WINDOWS\\fileshare",
-                "valid": false
-            },
-            {
-                "description": "an invalid URI though valid URI reference",
-                "data": "abc",
-                "valid": false
-            },
-            {
-                "description": "an invalid URI with spaces",
-                "data": "http:// shouldfail.com",
-                "valid": false
-            },
-            {
-                "description": "an invalid URI with spaces and missing scheme",
-                "data": ":// should fail",
-                "valid": false
-            },
-            {
-                "description": "an invalid URI with comma in scheme",
-                "data": "bar,baz:foo",
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft-next/optional/format/uuid.json b/json/tests/draft-next/optional/format/uuid.json
deleted file mode 100644
index 6cea9da..0000000
--- a/json/tests/draft-next/optional/format/uuid.json
+++ /dev/null
@@ -1,116 +0,0 @@
-[
-    {
-        "description": "uuid format",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "format": "uuid"
-        },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            },
-            {
-                "description": "all upper-case",
-                "data": "2EB8AA08-AA98-11EA-B4AA-73B441D16380",
-                "valid": true
-            },
-            {
-                "description": "all lower-case",
-                "data": "2eb8aa08-aa98-11ea-b4aa-73b441d16380",
-                "valid": true
-            },
-            {
-                "description": "mixed case",
-                "data": "2eb8aa08-AA98-11ea-B4Aa-73B441D16380",
-                "valid": true
-            },
-            {
-                "description": "all zeroes is valid",
-                "data": "00000000-0000-0000-0000-000000000000",
-                "valid": true
-            },
-            {
-                "description": "wrong length",
-                "data": "2eb8aa08-aa98-11ea-b4aa-73b441d1638",
-                "valid": false
-            },
-            {
-                "description": "missing section",
-                "data": "2eb8aa08-aa98-11ea-73b441d16380",
-                "valid": false
-            },
-            {
-                "description": "bad characters (not hex)",
-                "data": "2eb8aa08-aa98-11ea-b4ga-73b441d16380",
-                "valid": false
-            },
-            {
-                "description": "no dashes",
-                "data": "2eb8aa08aa9811eab4aa73b441d16380",
-                "valid": false
-            },
-            {
-                "description": "too few dashes",
-                "data": "2eb8aa08aa98-11ea-b4aa73b441d16380",
-                "valid": false
-            },
-            {
-                "description": "too many dashes",
-                "data": "2eb8-aa08-aa98-11ea-b4aa73b44-1d16380",
-                "valid": false
-            },
-            {
-                "description": "dashes in the wrong spot",
-                "data": "2eb8aa08aa9811eab4aa73b441d16380----",
-                "valid": false
-            },
-            {
-                "description": "valid version 4",
-                "data": "98d80576-482e-427f-8434-7f86890ab222",
-                "valid": true
-            },
-            {
-                "description": "valid version 5",
-                "data": "99c17cbb-656f-564a-940f-1a4568f03487",
-                "valid": true
-            },
-            {
-                "description": "hypothetical version 6",
-                "data": "99c17cbb-656f-664a-940f-1a4568f03487",
-                "valid": true
-            },
-            {
-                "description": "hypothetical version 15",
-                "data": "99c17cbb-656f-f64a-940f-1a4568f03487",
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft-next/optional/non-bmp-regex.json b/json/tests/draft-next/optional/non-bmp-regex.json
deleted file mode 100644
index 3af875c..0000000
--- a/json/tests/draft-next/optional/non-bmp-regex.json
+++ /dev/null
@@ -1,86 +0,0 @@
-[
-    {
-        "description": "Proper UTF-16 surrogate pair handling: pattern",
-        "comment": "Optional because .Net doesn't correctly handle 32-bit Unicode characters",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "pattern": "^🐲*$"
-        },
-        "tests": [
-            {
-                "description": "matches empty",
-                "data": "",
-                "valid": true
-            },
-            {
-                "description": "matches single",
-                "data": "🐲",
-                "valid": true
-            },
-            {
-                "description": "matches two",
-                "data": "🐲🐲",
-                "valid": true
-            },
-            {
-                "description": "doesn't match one",
-                "data": "🐉",
-                "valid": false
-            },
-            {
-                "description": "doesn't match two",
-                "data": "🐉🐉",
-                "valid": false
-            },
-            {
-                "description": "doesn't match one ASCII",
-                "data": "D",
-                "valid": false
-            },
-            {
-                "description": "doesn't match two ASCII",
-                "data": "DD",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "Proper UTF-16 surrogate pair handling: patternProperties",
-        "comment": "Optional because .Net doesn't correctly handle 32-bit Unicode characters",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "patternProperties": {
-                "^🐲*$": {
-                    "type": "integer"
-                }
-            }
-        },
-        "tests": [
-            {
-                "description": "matches empty",
-                "data": { "": 1 },
-                "valid": true
-            },
-            {
-                "description": "matches single",
-                "data": { "🐲": 1 },
-                "valid": true
-            },
-            {
-                "description": "matches two",
-                "data": { "🐲🐲": 1 },
-                "valid": true
-            },
-            {
-                "description": "doesn't match one",
-                "data": { "🐲": "hello" },
-                "valid": false
-            },
-            {
-                "description": "doesn't match two",
-                "data": { "🐲🐲": "hello" },
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft-next/optional/refOfUnknownKeyword.json b/json/tests/draft-next/optional/refOfUnknownKeyword.json
deleted file mode 100644
index 489701c..0000000
--- a/json/tests/draft-next/optional/refOfUnknownKeyword.json
+++ /dev/null
@@ -1,46 +0,0 @@
-[
-    {
-        "description": "reference of a root arbitrary keyword ",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "unknown-keyword": {"type": "integer"},
-            "properties": {
-                "bar": {"$ref": "#/unknown-keyword"}
-            }
-        },
-        "tests": [
-            {
-                "description": "match",
-                "data": {"bar": 3},
-                "valid": true
-            },
-            {
-                "description": "mismatch",
-                "data": {"bar": true},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "reference of an arbitrary keyword of a sub-schema",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "properties": {
-                "foo": {"unknown-keyword": {"type": "integer"}},
-                "bar": {"$ref": "#/properties/foo/unknown-keyword"}
-            }
-        },
-        "tests": [
-            {
-                "description": "match",
-                "data": {"bar": 3},
-                "valid": true
-            },
-            {
-                "description": "mismatch",
-                "data": {"bar": true},
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft-next/pattern.json b/json/tests/draft-next/pattern.json
deleted file mode 100644
index 09c6d0f..0000000
--- a/json/tests/draft-next/pattern.json
+++ /dev/null
@@ -1,65 +0,0 @@
-[
-    {
-        "description": "pattern validation",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "pattern": "^a*$"
-        },
-        "tests": [
-            {
-                "description": "a matching pattern is valid",
-                "data": "aaa",
-                "valid": true
-            },
-            {
-                "description": "a non-matching pattern is invalid",
-                "data": "abc",
-                "valid": false
-            },
-            {
-                "description": "ignores booleans",
-                "data": true,
-                "valid": true
-            },
-            {
-                "description": "ignores integers",
-                "data": 123,
-                "valid": true
-            },
-            {
-                "description": "ignores floats",
-                "data": 1.0,
-                "valid": true
-            },
-            {
-                "description": "ignores objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "ignores arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "ignores null",
-                "data": null,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "pattern is not anchored",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "pattern": "a+"
-        },
-        "tests": [
-            {
-                "description": "matches a substring",
-                "data": "xxaayy",
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft-next/patternProperties.json b/json/tests/draft-next/patternProperties.json
deleted file mode 100644
index c7aca3d..0000000
--- a/json/tests/draft-next/patternProperties.json
+++ /dev/null
@@ -1,176 +0,0 @@
-[
-    {
-        "description":
-            "patternProperties validates properties matching a regex",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "patternProperties": {
-                "f.*o": {"type": "integer"}
-            }
-        },
-        "tests": [
-            {
-                "description": "a single valid match is valid",
-                "data": {"foo": 1},
-                "valid": true
-            },
-            {
-                "description": "multiple valid matches is valid",
-                "data": {"foo": 1, "foooooo" : 2},
-                "valid": true
-            },
-            {
-                "description": "a single invalid match is invalid",
-                "data": {"foo": "bar", "fooooo": 2},
-                "valid": false
-            },
-            {
-                "description": "multiple invalid matches is invalid",
-                "data": {"foo": "bar", "foooooo" : "baz"},
-                "valid": false
-            },
-            {
-                "description": "ignores arrays",
-                "data": ["foo"],
-                "valid": true
-            },
-            {
-                "description": "ignores strings",
-                "data": "foo",
-                "valid": true
-            },
-            {
-                "description": "ignores other non-objects",
-                "data": 12,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "multiple simultaneous patternProperties are validated",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "patternProperties": {
-                "a*": {"type": "integer"},
-                "aaa*": {"maximum": 20}
-            }
-        },
-        "tests": [
-            {
-                "description": "a single valid match is valid",
-                "data": {"a": 21},
-                "valid": true
-            },
-            {
-                "description": "a simultaneous match is valid",
-                "data": {"aaaa": 18},
-                "valid": true
-            },
-            {
-                "description": "multiple matches is valid",
-                "data": {"a": 21, "aaaa": 18},
-                "valid": true
-            },
-            {
-                "description": "an invalid due to one is invalid",
-                "data": {"a": "bar"},
-                "valid": false
-            },
-            {
-                "description": "an invalid due to the other is invalid",
-                "data": {"aaaa": 31},
-                "valid": false
-            },
-            {
-                "description": "an invalid due to both is invalid",
-                "data": {"aaa": "foo", "aaaa": 31},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "regexes are not anchored by default and are case sensitive",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "patternProperties": {
-                "[0-9]{2,}": { "type": "boolean" },
-                "X_": { "type": "string" }
-            }
-        },
-        "tests": [
-            {
-                "description": "non recognized members are ignored",
-                "data": { "answer 1": "42" },
-                "valid": true
-            },
-            {
-                "description": "recognized members are accounted for",
-                "data": { "a31b": null },
-                "valid": false
-            },
-            {
-                "description": "regexes are case sensitive",
-                "data": { "a_x_3": 3 },
-                "valid": true
-            },
-            {
-                "description": "regexes are case sensitive, 2",
-                "data": { "a_X_3": 3 },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "patternProperties with boolean schemas",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "patternProperties": {
-                "f.*": true,
-                "b.*": false
-            }
-        },
-        "tests": [
-            {
-                "description": "object with property matching schema true is valid",
-                "data": {"foo": 1},
-                "valid": true
-            },
-            {
-                "description": "object with property matching schema false is invalid",
-                "data": {"bar": 2},
-                "valid": false
-            },
-            {
-                "description": "object with both properties is invalid",
-                "data": {"foo": 1, "bar": 2},
-                "valid": false
-            },
-            {
-                "description": "object with a property matching both true and false is invalid",
-                "data": {"foobar":1},
-                "valid": false
-            },
-            {
-                "description": "empty object is valid",
-                "data": {},
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "patternProperties with null valued instance properties",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "patternProperties": {
-                "^.*bar$": {"type": "null"}
-            }
-        },
-        "tests": [
-            {
-                "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
deleted file mode 100644
index a7f5928..0000000
--- a/json/tests/draft-next/prefixItems.json
+++ /dev/null
@@ -1,104 +0,0 @@
-[
-    {
-        "description": "a schema given for prefixItems",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "prefixItems": [
-                {"type": "integer"},
-                {"type": "string"}
-            ]
-        },
-        "tests": [
-            {
-                "description": "correct types",
-                "data": [ 1, "foo" ],
-                "valid": true
-            },
-            {
-                "description": "wrong types",
-                "data": [ "foo", 1 ],
-                "valid": false
-            },
-            {
-                "description": "incomplete array of items",
-                "data": [ 1 ],
-                "valid": true
-            },
-            {
-                "description": "array with additional items",
-                "data": [ 1, "foo", true ],
-                "valid": true
-            },
-            {
-                "description": "empty array",
-                "data": [ ],
-                "valid": true
-            },
-            {
-                "description": "JavaScript pseudo-array is valid",
-                "data": {
-                    "0": "invalid",
-                    "1": "valid",
-                    "length": 2
-                },
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "prefixItems with boolean schemas",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "prefixItems": [true, false]
-        },
-        "tests": [
-            {
-                "description": "array with one item is valid",
-                "data": [ 1 ],
-                "valid": true
-            },
-            {
-                "description": "array with two items is invalid",
-                "data": [ 1, "foo" ],
-                "valid": false
-            },
-            {
-                "description": "empty array is valid",
-                "data": [],
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "additional items are allowed by default",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "prefixItems": [{"type": "integer"}]
-        },
-        "tests": [
-            {
-                "description": "only the first item is validated",
-                "data": [1, "foo", false],
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "prefixItems with null instance elements",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "prefixItems": [
-                {
-                    "type": "null"
-                }
-            ]
-        },
-        "tests": [
-            {
-                "description": "allows null elements",
-                "data": [ null ],
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft-next/properties.json b/json/tests/draft-next/properties.json
deleted file mode 100644
index 1ba4fe8..0000000
--- a/json/tests/draft-next/properties.json
+++ /dev/null
@@ -1,242 +0,0 @@
-[
-    {
-        "description": "object properties validation",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "properties": {
-                "foo": {"type": "integer"},
-                "bar": {"type": "string"}
-            }
-        },
-        "tests": [
-            {
-                "description": "both properties present and valid is valid",
-                "data": {"foo": 1, "bar": "baz"},
-                "valid": true
-            },
-            {
-                "description": "one property invalid is invalid",
-                "data": {"foo": 1, "bar": {}},
-                "valid": false
-            },
-            {
-                "description": "both properties invalid is invalid",
-                "data": {"foo": [], "bar": {}},
-                "valid": false
-            },
-            {
-                "description": "doesn't invalidate other properties",
-                "data": {"quux": []},
-                "valid": true
-            },
-            {
-                "description": "ignores arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "ignores other non-objects",
-                "data": 12,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description":
-            "properties, patternProperties, additionalProperties interaction",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "properties": {
-                "foo": {"type": "array", "maxItems": 3},
-                "bar": {"type": "array"}
-            },
-            "patternProperties": {"f.o": {"minItems": 2}},
-            "additionalProperties": {"type": "integer"}
-        },
-        "tests": [
-            {
-                "description": "property validates property",
-                "data": {"foo": [1, 2]},
-                "valid": true
-            },
-            {
-                "description": "property invalidates property",
-                "data": {"foo": [1, 2, 3, 4]},
-                "valid": false
-            },
-            {
-                "description": "patternProperty invalidates property",
-                "data": {"foo": []},
-                "valid": false
-            },
-            {
-                "description": "patternProperty validates nonproperty",
-                "data": {"fxo": [1, 2]},
-                "valid": true
-            },
-            {
-                "description": "patternProperty invalidates nonproperty",
-                "data": {"fxo": []},
-                "valid": false
-            },
-            {
-                "description": "additionalProperty ignores property",
-                "data": {"bar": []},
-                "valid": true
-            },
-            {
-                "description": "additionalProperty validates others",
-                "data": {"quux": 3},
-                "valid": true
-            },
-            {
-                "description": "additionalProperty invalidates others",
-                "data": {"quux": "foo"},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "properties with boolean schema",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "properties": {
-                "foo": true,
-                "bar": false
-            }
-        },
-        "tests": [
-            {
-                "description": "no property present is valid",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "only 'true' property present is valid",
-                "data": {"foo": 1},
-                "valid": true
-            },
-            {
-                "description": "only 'false' property present is invalid",
-                "data": {"bar": 2},
-                "valid": false
-            },
-            {
-                "description": "both properties present is invalid",
-                "data": {"foo": 1, "bar": 2},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "properties with escaped characters",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "properties": {
-                "foo\nbar": {"type": "number"},
-                "foo\"bar": {"type": "number"},
-                "foo\\bar": {"type": "number"},
-                "foo\rbar": {"type": "number"},
-                "foo\tbar": {"type": "number"},
-                "foo\fbar": {"type": "number"}
-            }
-        },
-        "tests": [
-            {
-                "description": "object with all numbers is valid",
-                "data": {
-                    "foo\nbar": 1,
-                    "foo\"bar": 1,
-                    "foo\\bar": 1,
-                    "foo\rbar": 1,
-                    "foo\tbar": 1,
-                    "foo\fbar": 1
-                },
-                "valid": true
-            },
-            {
-                "description": "object with strings is invalid",
-                "data": {
-                    "foo\nbar": "1",
-                    "foo\"bar": "1",
-                    "foo\\bar": "1",
-                    "foo\rbar": "1",
-                    "foo\tbar": "1",
-                    "foo\fbar": "1"
-                },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "properties with null valued instance properties",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "properties": {
-                "foo": {"type": "null"}
-            }
-        },
-        "tests": [
-            {
-                "description": "allows null values",
-                "data": {"foo": null},
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "properties whose names are Javascript object property names",
-        "comment": "Ensure JS implementations don't universally consider e.g. __proto__ to always be present in an object.",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "properties": {
-                "__proto__": {"type": "number"},
-                "toString": {
-                    "properties": { "length": { "type": "string" } }
-                },
-                "constructor": {"type": "number"}
-            }
-        },
-        "tests": [
-            {
-                "description": "ignores arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "ignores other non-objects",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "none of the properties mentioned",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "__proto__ not valid",
-                "data": { "__proto__": "foo" },
-                "valid": false
-            },
-            {
-                "description": "toString not valid",
-                "data": { "toString": { "length": 37 } },
-                "valid": false
-            },
-            {
-                "description": "constructor not valid",
-                "data": { "constructor": { "length": 37 } },
-                "valid": false
-            },
-            {
-                "description": "all present and valid",
-                "data": { 
-                    "__proto__": 12,
-                    "toString": { "length": "foo" },
-                    "constructor": 37
-                },
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft-next/propertyDependencies.json b/json/tests/draft-next/propertyDependencies.json
deleted file mode 100644
index 9efa2b4..0000000
--- a/json/tests/draft-next/propertyDependencies.json
+++ /dev/null
@@ -1,161 +0,0 @@
-[
-    {
-        "description": "propertyDependencies doesn't act on non-objects",
-        "schema": {
-            "propertyDependencies": {
-                "foo": {"bar": false}
-            }
-        },
-        "tests": [
-            {
-                "description": "ignores booleans",
-                "data": true,
-                "valid": true
-            },
-            {
-                "description": "ignores integers",
-                "data": 123,
-                "valid": true
-            },
-            {
-                "description": "ignores floats",
-                "data": 1.0,
-                "valid": true
-            },
-            {
-                "description": "ignores strings",
-                "data": "abc",
-                "valid": true
-            },
-            {
-                "description": "ignores arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "ignores null",
-                "data": null,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "propertyDependencies doesn't act on non-string property values",
-        "schema": {
-            "propertyDependencies": {
-                "foo": {"bar": false}
-            }
-        },
-        "tests": [
-            {
-                "description": "ignores booleans",
-                "data": {"foo": false},
-                "valid": true
-            },
-            {
-                "description": "ignores integers",
-                "data": {"foo": 2},
-                "valid": true
-            },
-            {
-                "description": "ignores floats",
-                "data": {"foo": 1.1},
-                "valid": true
-            },
-            {
-                "description": "ignores objects",
-                "data": {"foo": {}},
-                "valid": true
-            },
-            {
-                "description": "ignores objects wth a key of the expected value",
-                "data": {"foo": {"bar": "baz"}},
-                "valid": true
-            },
-            {
-                "description": "ignores objects with the expected value nested in structure",
-                "data": {"foo": {"baz": "bar"}},
-                "valid": true
-            },
-            {
-                "description": "ignores arrays",
-                "data": {"foo": []},
-                "valid": true
-            },
-            {
-                "description": "ignores null",
-                "data": {"foo": null},
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "multiple options selects the right one",
-        "schema": {
-            "propertyDependencies": {
-                "foo": {
-                    "bar": {
-                        "minProperties": 2,
-                        "maxProperties": 2
-                    },
-                    "baz": {"maxProperties": 1},
-                    "qux": true,
-                    "quux": false
-                }
-            }
-        },
-        "tests": [
-            {
-                "description": "bar with exactly 2 properties is valid",
-                "data": {
-                    "foo": "bar",
-                    "other-foo": "other-bar"
-                },
-                "valid": true
-            },
-            {
-                "description": "bar with more than 2 properties is invalid",
-                "data": {
-                    "foo": "bar",
-                    "other-foo": "other-bar",
-                    "too": "many"
-                },
-                "valid": false
-            },
-            {
-                "description": "bar with fewer than 2 properties is invalid",
-                "data": {"foo": "bar"},
-                "valid": false
-            },
-            {
-                "description": "baz alone is valid",
-                "data": {"foo": "baz"},
-                "valid": true
-            },
-            {
-                "description": "baz with other properties is invalid",
-                "data": {
-                    "foo": "baz",
-                    "other-foo": "other-bar"
-                },
-                "valid": false
-            },
-            {
-                "description": "anything allowed with qux",
-                "data": {
-                    "foo": "qux",
-                    "blah": ["some other property"],
-                    "more": "properties"
-                },
-                "valid": true
-            },
-            {
-                "description": "quux is disallowed",
-                "data": {
-                    "foo": "quux"
-                },
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft-next/propertyNames.json b/json/tests/draft-next/propertyNames.json
deleted file mode 100644
index e614017..0000000
--- a/json/tests/draft-next/propertyNames.json
+++ /dev/null
@@ -1,85 +0,0 @@
-[
-    {
-        "description": "propertyNames validation",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "propertyNames": {"maxLength": 3}
-        },
-        "tests": [
-            {
-                "description": "all property names valid",
-                "data": {
-                    "f": {},
-                    "foo": {}
-                },
-                "valid": true
-            },
-            {
-                "description": "some property names invalid",
-                "data": {
-                    "foo": {},
-                    "foobar": {}
-                },
-                "valid": false
-            },
-            {
-                "description": "object without properties is valid",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "ignores arrays",
-                "data": [1, 2, 3, 4],
-                "valid": true
-            },
-            {
-                "description": "ignores strings",
-                "data": "foobar",
-                "valid": true
-            },
-            {
-                "description": "ignores other non-objects",
-                "data": 12,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "propertyNames with boolean schema true",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "propertyNames": true
-        },
-        "tests": [
-            {
-                "description": "object with any properties is valid",
-                "data": {"foo": 1},
-                "valid": true
-            },
-            {
-                "description": "empty object is valid",
-                "data": {},
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "propertyNames with boolean schema false",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "propertyNames": false
-        },
-        "tests": [
-            {
-                "description": "object with any properties is invalid",
-                "data": {"foo": 1},
-                "valid": false
-            },
-            {
-                "description": "empty object is valid",
-                "data": {},
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft-next/ref.json b/json/tests/draft-next/ref.json
deleted file mode 100644
index 7da4afb..0000000
--- a/json/tests/draft-next/ref.json
+++ /dev/null
@@ -1,887 +0,0 @@
-[
-    {
-        "description": "root pointer ref",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "properties": {
-                "foo": {"$ref": "#"}
-            },
-            "additionalProperties": false
-        },
-        "tests": [
-            {
-                "description": "match",
-                "data": {"foo": false},
-                "valid": true
-            },
-            {
-                "description": "recursive match",
-                "data": {"foo": {"foo": false}},
-                "valid": true
-            },
-            {
-                "description": "mismatch",
-                "data": {"bar": false},
-                "valid": false
-            },
-            {
-                "description": "recursive mismatch",
-                "data": {"foo": {"bar": false}},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "relative pointer ref to object",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "properties": {
-                "foo": {"type": "integer"},
-                "bar": {"$ref": "#/properties/foo"}
-            }
-        },
-        "tests": [
-            {
-                "description": "match",
-                "data": {"bar": 3},
-                "valid": true
-            },
-            {
-                "description": "mismatch",
-                "data": {"bar": true},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "relative pointer ref to array",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "prefixItems": [
-                {"type": "integer"},
-                {"$ref": "#/prefixItems/0"}
-            ]
-        },
-        "tests": [
-            {
-                "description": "match array",
-                "data": [1, 2],
-                "valid": true
-            },
-            {
-                "description": "mismatch array",
-                "data": [1, "foo"],
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "escaped pointer ref",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "$defs": {
-                "tilde~field": {"type": "integer"},
-                "slash/field": {"type": "integer"},
-                "percent%field": {"type": "integer"}
-            },
-            "properties": {
-                "tilde": {"$ref": "#/$defs/tilde~0field"},
-                "slash": {"$ref": "#/$defs/slash~1field"},
-                "percent": {"$ref": "#/$defs/percent%25field"}
-            }
-        },
-        "tests": [
-            {
-                "description": "slash invalid",
-                "data": {"slash": "aoeu"},
-                "valid": false
-            },
-            {
-                "description": "tilde invalid",
-                "data": {"tilde": "aoeu"},
-                "valid": false
-            },
-            {
-                "description": "percent invalid",
-                "data": {"percent": "aoeu"},
-                "valid": false
-            },
-            {
-                "description": "slash valid",
-                "data": {"slash": 123},
-                "valid": true
-            },
-            {
-                "description": "tilde valid",
-                "data": {"tilde": 123},
-                "valid": true
-            },
-            {
-                "description": "percent valid",
-                "data": {"percent": 123},
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "nested refs",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "$defs": {
-                "a": {"type": "integer"},
-                "b": {"$ref": "#/$defs/a"},
-                "c": {"$ref": "#/$defs/b"}
-            },
-            "$ref": "#/$defs/c"
-        },
-        "tests": [
-            {
-                "description": "nested ref valid",
-                "data": 5,
-                "valid": true
-            },
-            {
-                "description": "nested ref invalid",
-                "data": "a",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "ref applies alongside sibling keywords",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "$defs": {
-                "reffed": {
-                    "type": "array"
-                }
-            },
-            "properties": {
-                "foo": {
-                    "$ref": "#/$defs/reffed",
-                    "maxItems": 2
-                }
-            }
-        },
-        "tests": [
-            {
-                "description": "ref valid, maxItems valid",
-                "data": { "foo": [] },
-                "valid": true
-            },
-            {
-                "description": "ref valid, maxItems invalid",
-                "data": { "foo": [1, 2, 3] },
-                "valid": false
-            },
-            {
-                "description": "ref invalid",
-                "data": { "foo": "string" },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "remote ref, containing refs itself",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "$ref": "https://json-schema.org/draft/next/schema"
-        },
-        "tests": [
-            {
-                "description": "remote ref valid",
-                "data": {"minLength": 1},
-                "valid": true
-            },
-            {
-                "description": "remote ref invalid",
-                "data": {"minLength": -1},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "property named $ref that is not a reference",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "properties": {
-                "$ref": {"type": "string"}
-            }
-        },
-        "tests": [
-            {
-                "description": "property named $ref valid",
-                "data": {"$ref": "a"},
-                "valid": true
-            },
-            {
-                "description": "property named $ref invalid",
-                "data": {"$ref": 2},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "property named $ref, containing an actual $ref",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "properties": {
-                "$ref": {"$ref": "#/$defs/is-string"}
-            },
-            "$defs": {
-                "is-string": {
-                    "type": "string"
-                }
-            }
-        },
-        "tests": [
-            {
-                "description": "property named $ref valid",
-                "data": {"$ref": "a"},
-                "valid": true
-            },
-            {
-                "description": "property named $ref invalid",
-                "data": {"$ref": 2},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "$ref to boolean schema true",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "$ref": "#/$defs/bool",
-            "$defs": {
-                "bool": true
-            }
-        },
-        "tests": [
-            {
-                "description": "any value is valid",
-                "data": "foo",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "$ref to boolean schema false",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "$ref": "#/$defs/bool",
-            "$defs": {
-                "bool": false
-            }
-        },
-        "tests": [
-            {
-                "description": "any value is invalid",
-                "data": "foo",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "Recursive references between schemas",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "$id": "http://localhost:1234/draft-next/tree",
-            "description": "tree of nodes",
-            "type": "object",
-            "properties": {
-                "meta": {"type": "string"},
-                "nodes": {
-                    "type": "array",
-                    "items": {"$ref": "node"}
-                }
-            },
-            "required": ["meta", "nodes"],
-            "$defs": {
-                "node": {
-                    "$id": "http://localhost:1234/draft-next/node",
-                    "description": "node",
-                    "type": "object",
-                    "properties": {
-                        "value": {"type": "number"},
-                        "subtree": {"$ref": "tree"}
-                    },
-                    "required": ["value"]
-                }
-            }
-        },
-        "tests": [
-            {
-                "description": "valid tree",
-                "data": {
-                    "meta": "root",
-                    "nodes": [
-                        {
-                            "value": 1,
-                            "subtree": {
-                                "meta": "child",
-                                "nodes": [
-                                    {"value": 1.1},
-                                    {"value": 1.2}
-                                ]
-                            }
-                        },
-                        {
-                            "value": 2,
-                            "subtree": {
-                                "meta": "child",
-                                "nodes": [
-                                    {"value": 2.1},
-                                    {"value": 2.2}
-                                ]
-                            }
-                        }
-                    ]
-                },
-                "valid": true
-            },
-            {
-                "description": "invalid tree",
-                "data": {
-                    "meta": "root",
-                    "nodes": [
-                        {
-                            "value": 1,
-                            "subtree": {
-                                "meta": "child",
-                                "nodes": [
-                                    {"value": "string is invalid"},
-                                    {"value": 1.2}
-                                ]
-                            }
-                        },
-                        {
-                            "value": 2,
-                            "subtree": {
-                                "meta": "child",
-                                "nodes": [
-                                    {"value": 2.1},
-                                    {"value": 2.2}
-                                ]
-                            }
-                        }
-                    ]
-                },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "refs with quote",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "properties": {
-                "foo\"bar": {"$ref": "#/$defs/foo%22bar"}
-            },
-            "$defs": {
-                "foo\"bar": {"type": "number"}
-            }
-        },
-        "tests": [
-            {
-                "description": "object with numbers is valid",
-                "data": {
-                    "foo\"bar": 1
-                },
-                "valid": true
-            },
-            {
-                "description": "object with strings is invalid",
-                "data": {
-                    "foo\"bar": "1"
-                },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "ref creates new scope when adjacent to keywords",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "$defs": {
-                "A": {
-                    "unevaluatedProperties": false
-                }
-            },
-            "properties": {
-                "prop1": {
-                    "type": "string"
-                }
-            },
-            "$ref": "#/$defs/A"
-        },
-        "tests": [
-            {
-                "description": "referenced subschema doesn't see annotations from properties",
-                "data": {
-                    "prop1": "match"
-                },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "naive replacement of $ref with its destination is not correct",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "$defs": {
-                "a_string": { "type": "string" }
-            },
-            "enum": [
-                { "$ref": "#/$defs/a_string" }
-            ]
-        },
-        "tests": [
-            {
-                "description": "do not evaluate the $ref inside the enum, matching any string",
-                "data": "this is a string",
-                "valid": false
-            },
-            {
-                "description": "do not evaluate the $ref inside the enum, definition exact match",
-                "data": { "type": "string" },
-                "valid": false
-            },
-            {
-                "description": "match the enum exactly",
-                "data": { "$ref": "#/$defs/a_string" },
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "refs with relative uris and defs",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "$id": "http://example.com/schema-relative-uri-defs1.json",
-            "properties": {
-                "foo": {
-                    "$id": "schema-relative-uri-defs2.json",
-                    "$defs": {
-                        "inner": {
-                            "properties": {
-                                "bar": { "type": "string" }
-                            }
-                        }
-                    },
-                    "$ref": "#/$defs/inner"
-                }
-            },
-            "$ref": "schema-relative-uri-defs2.json"
-        },
-        "tests": [
-            {
-                "description": "invalid on inner field",
-                "data": {
-                    "foo": {
-                        "bar": 1
-                    },
-                    "bar": "a"
-                },
-                "valid": false
-            },
-            {
-                "description": "invalid on outer field",
-                "data": {
-                    "foo": {
-                        "bar": "a"
-                    },
-                    "bar": 1
-                },
-                "valid": false
-            },
-            {
-                "description": "valid on both fields",
-                "data": {
-                    "foo": {
-                        "bar": "a"
-                    },
-                    "bar": "a"
-                },
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "relative refs with absolute uris and defs",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "$id": "http://example.com/schema-refs-absolute-uris-defs1.json",
-            "properties": {
-                "foo": {
-                    "$id": "http://example.com/schema-refs-absolute-uris-defs2.json",
-                    "$defs": {
-                        "inner": {
-                            "properties": {
-                                "bar": { "type": "string" }
-                            }
-                        }
-                    },
-                    "$ref": "#/$defs/inner"
-                }
-            },
-            "$ref": "schema-refs-absolute-uris-defs2.json"
-        },
-        "tests": [
-            {
-                "description": "invalid on inner field",
-                "data": {
-                    "foo": {
-                        "bar": 1
-                    },
-                    "bar": "a"
-                },
-                "valid": false
-            },
-            {
-                "description": "invalid on outer field",
-                "data": {
-                    "foo": {
-                        "bar": "a"
-                    },
-                    "bar": 1
-                },
-                "valid": false
-            },
-            {
-                "description": "valid on both fields",
-                "data": {
-                    "foo": {
-                        "bar": "a"
-                    },
-                    "bar": "a"
-                },
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "$id must be resolved against nearest parent, not just immediate parent",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "$id": "http://example.com/a.json",
-            "$defs": {
-                "x": {
-                    "$id": "http://example.com/b/c.json",
-                    "not": {
-                        "$defs": {
-                            "y": {
-                                "$id": "d.json",
-                                "type": "number"
-                            }
-                        }
-                    }
-                }
-            },
-            "allOf": [
-                {
-                    "$ref": "http://example.com/b/d.json"
-                }
-            ]
-        },
-        "tests": [
-            {
-                "description": "number is valid",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "non-number is invalid",
-                "data": "a",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "order of evaluation: $id and $ref",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "$comment": "$id must be evaluated before $ref to get the proper $ref destination",
-            "$id": "/draft/next/ref-and-id1/base.json",
-            "$ref": "int.json",
-            "$defs": {
-                "bigint": {
-                    "$comment": "canonical uri: /ref-and-id1/int.json",
-                    "$id": "int.json",
-                    "maximum": 10
-                },
-                "smallint": {
-                    "$comment": "canonical uri: /ref-and-id1-int.json",
-                    "$id": "/draft/next/ref-and-id1-int.json",
-                    "maximum": 2
-                }
-            }
-        },
-        "tests": [
-            {
-                "description": "data is valid against first definition",
-                "data": 5,
-                "valid": true
-            },
-            {
-                "description": "data is invalid against first definition",
-                "data": 50,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "order of evaluation: $id and $anchor and $ref",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "$comment": "$id must be evaluated before $ref to get the proper $ref destination",
-            "$id": "/draft/next/ref-and-id2/base.json",
-            "$ref": "#bigint",
-            "$defs": {
-                "bigint": {
-                    "$comment": "canonical uri: /ref-and-id2/base.json#/$defs/bigint; another valid uri for this location: /ref-and-id2/base.json#bigint",
-                    "$anchor": "bigint",
-                    "maximum": 10
-                },
-                "smallint": {
-                    "$comment": "canonical uri: /ref-and-id2#/$defs/smallint; another valid uri for this location: /ref-and-id2/#bigint",
-                    "$id": "/draft/next/ref-and-id2/",
-                    "$anchor": "bigint",
-                    "maximum": 2
-                }
-            }
-        },
-        "tests": [
-            {
-                "description": "data is valid against first definition",
-                "data": 5,
-                "valid": true
-            },
-            {
-                "description": "data is invalid against first definition",
-                "data": 50,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "simple URN base URI with $ref via the URN",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "$comment": "URIs do not have to have HTTP(s) schemes",
-            "$id": "urn:uuid:deadbeef-1234-ffff-ffff-4321feebdaed",
-            "minimum": 30,
-            "properties": {
-                "foo": {"$ref": "urn:uuid:deadbeef-1234-ffff-ffff-4321feebdaed"}
-            }
-        },
-        "tests": [
-            {
-                "description": "valid under the URN IDed schema",
-                "data": {"foo": 37},
-                "valid": true
-            },
-            {
-                "description": "invalid under the URN IDed schema",
-                "data": {"foo": 12},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "simple URN base URI with JSON pointer",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "$comment": "URIs do not have to have HTTP(s) schemes",
-            "$id": "urn:uuid:deadbeef-1234-00ff-ff00-4321feebdaed",
-            "properties": {
-                "foo": {"$ref": "#/$defs/bar"}
-            },
-            "$defs": {
-                "bar": {"type": "string"}
-            }
-        },
-        "tests": [
-            {
-                "description": "a string is valid",
-                "data": {"foo": "bar"},
-                "valid": true
-            },
-            {
-                "description": "a non-string is invalid",
-                "data": {"foo": 12},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "URN base URI with NSS",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "$comment": "RFC 8141 §2.2",
-            "$id": "urn:example:1/406/47452/2",
-            "properties": {
-                "foo": {"$ref": "#/$defs/bar"}
-            },
-            "$defs": {
-                "bar": {"type": "string"}
-            }
-        },
-        "tests": [
-            {
-                "description": "a string is valid",
-                "data": {"foo": "bar"},
-                "valid": true
-            },
-            {
-                "description": "a non-string is invalid",
-                "data": {"foo": 12},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "URN base URI with r-component",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "$comment": "RFC 8141 §2.3.1",
-            "$id": "urn:example:foo-bar-baz-qux?+CCResolve:cc=uk",
-            "properties": {
-                "foo": {"$ref": "#/$defs/bar"}
-            },
-            "$defs": {
-                "bar": {"type": "string"}
-            }
-        },
-        "tests": [
-            {
-                "description": "a string is valid",
-                "data": {"foo": "bar"},
-                "valid": true
-            },
-            {
-                "description": "a non-string is invalid",
-                "data": {"foo": 12},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "URN base URI with q-component",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "$comment": "RFC 8141 §2.3.2",
-            "$id": "urn:example:weather?=op=map&lat=39.56&lon=-104.85&datetime=1969-07-21T02:56:15Z",
-            "properties": {
-                "foo": {"$ref": "#/$defs/bar"}
-            },
-            "$defs": {
-                "bar": {"type": "string"}
-            }
-        },
-        "tests": [
-            {
-                "description": "a string is valid",
-                "data": {"foo": "bar"},
-                "valid": true
-            },
-            {
-                "description": "a non-string is invalid",
-                "data": {"foo": 12},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "URN base URI with f-component",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "$comment": "RFC 8141 §2.3.3, but we don't allow fragments",
-            "$ref": "https://json-schema.org/draft/next/schema"
-        },
-        "tests": [
-            {
-                "description": "is invalid",
-                "data": {"$id": "urn:example:foo-bar-baz-qux#somepart"},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "URN base URI with URN and JSON pointer ref",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "$id": "urn:uuid:deadbeef-1234-0000-0000-4321feebdaed",
-            "properties": {
-                "foo": {"$ref": "urn:uuid:deadbeef-1234-0000-0000-4321feebdaed#/$defs/bar"}
-            },
-            "$defs": {
-                "bar": {"type": "string"}
-            }
-        },
-        "tests": [
-            {
-                "description": "a string is valid",
-                "data": {"foo": "bar"},
-                "valid": true
-            },
-            {
-                "description": "a non-string is invalid",
-                "data": {"foo": 12},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "URN base URI with URN and anchor ref",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "$id": "urn:uuid:deadbeef-1234-ff00-00ff-4321feebdaed",
-            "properties": {
-                "foo": {"$ref": "urn:uuid:deadbeef-1234-ff00-00ff-4321feebdaed#something"}
-            },
-            "$defs": {
-                "bar": {
-                    "$anchor": "something",
-                    "type": "string"
-                }
-            }
-        },
-        "tests": [
-            {
-                "description": "a string is valid",
-                "data": {"foo": "bar"},
-                "valid": true
-            },
-            {
-                "description": "a non-string is invalid",
-                "data": {"foo": 12},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "URN ref with nested pointer ref",
-        "schema": {
-            "$ref": "urn:uuid:deadbeef-4321-ffff-ffff-1234feebdaed",
-            "$defs": {
-                "foo": {
-                    "$id": "urn:uuid:deadbeef-4321-ffff-ffff-1234feebdaed",
-                    "$defs": {"bar": {"type": "string"}},
-                    "$ref": "#/$defs/bar"
-                }
-            }
-        },
-        "tests": [
-            {
-                "description": "a string is valid",
-                "data": "bar",
-                "valid": true
-            },
-            {
-                "description": "a non-string is invalid",
-                "data": 12,
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft-next/refRemote.json b/json/tests/draft-next/refRemote.json
deleted file mode 100644
index ca5b8c4..0000000
--- a/json/tests/draft-next/refRemote.json
+++ /dev/null
@@ -1,295 +0,0 @@
-[
-    {
-        "description": "remote ref",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "$ref": "http://localhost:1234/draft-next/integer.json"
-        },
-        "tests": [
-            {
-                "description": "remote ref valid",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "remote ref invalid",
-                "data": "a",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "fragment within remote ref",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "$ref": "http://localhost:1234/draft-next/subSchemas-defs.json#/$defs/integer"
-        },
-        "tests": [
-            {
-                "description": "remote fragment valid",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "remote fragment invalid",
-                "data": "a",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "ref within remote ref",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "$ref": "http://localhost:1234/draft-next/subSchemas-defs.json#/$defs/refToInteger"
-        },
-        "tests": [
-            {
-                "description": "ref within ref valid",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "ref within ref invalid",
-                "data": "a",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "base URI change",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "$id": "http://localhost:1234/draft-next/",
-            "items": {
-                "$id": "baseUriChange/",
-                "items": {"$ref": "folderInteger.json"}
-            }
-        },
-        "tests": [
-            {
-                "description": "base URI change ref valid",
-                "data": [[1]],
-                "valid": true
-            },
-            {
-                "description": "base URI change ref invalid",
-                "data": [["a"]],
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "base URI change - change folder",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "$id": "http://localhost:1234/draft-next/scope_change_defs1.json",
-            "type" : "object",
-            "properties": {"list": {"$ref": "baseUriChangeFolder/"}},
-            "$defs": {
-                "baz": {
-                    "$id": "baseUriChangeFolder/",
-                    "type": "array",
-                    "items": {"$ref": "folderInteger.json"}
-                }
-            }
-        },
-        "tests": [
-            {
-                "description": "number is valid",
-                "data": {"list": [1]},
-                "valid": true
-            },
-            {
-                "description": "string is invalid",
-                "data": {"list": ["a"]},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "base URI change - change folder in subschema",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "$id": "http://localhost:1234/draft-next/scope_change_defs2.json",
-            "type" : "object",
-            "properties": {"list": {"$ref": "baseUriChangeFolderInSubschema/#/$defs/bar"}},
-            "$defs": {
-                "baz": {
-                    "$id": "baseUriChangeFolderInSubschema/",
-                    "$defs": {
-                        "bar": {
-                            "type": "array",
-                            "items": {"$ref": "folderInteger.json"}
-                        }
-                    }
-                }
-            }
-        },
-        "tests": [
-            {
-                "description": "number is valid",
-                "data": {"list": [1]},
-                "valid": true
-            },
-            {
-                "description": "string is invalid",
-                "data": {"list": ["a"]},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "root ref in remote ref",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "$id": "http://localhost:1234/draft-next/object",
-            "type": "object",
-            "properties": {
-                "name": {"$ref": "name-defs.json#/$defs/orNull"}
-            }
-        },
-        "tests": [
-            {
-                "description": "string is valid",
-                "data": {
-                    "name": "foo"
-                },
-                "valid": true
-            },
-            {
-                "description": "null is valid",
-                "data": {
-                    "name": null
-                },
-                "valid": true
-            },
-            {
-                "description": "object is invalid",
-                "data": {
-                    "name": {
-                        "name": null
-                    }
-                },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "remote ref with ref to defs",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "$id": "http://localhost:1234/draft-next/schema-remote-ref-ref-defs1.json",
-            "$ref": "ref-and-defs.json"
-        },
-        "tests": [
-            {
-                "description": "invalid",
-                "data": {
-                    "bar": 1
-                },
-                "valid": false
-            },
-            {
-                "description": "valid",
-                "data": {
-                    "bar": "a"
-                },
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "Location-independent identifier in remote ref",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "$ref": "http://localhost:1234/draft-next/locationIndependentIdentifier.json#/$defs/refToInteger"
-        },
-        "tests": [
-            {
-                "description": "integer is valid",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "string is invalid",
-                "data": "foo",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "retrieved nested refs resolve relative to their URI not $id",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "$id": "http://localhost:1234/draft-next/some-id",
-            "properties": {
-                "name": {"$ref": "nested/foo-ref-string.json"}
-            }
-        },
-        "tests": [
-            {
-                "description": "number is invalid",
-                "data": {
-                    "name": {"foo":  1}
-                },
-                "valid": false
-            },
-            {
-                "description": "string is valid",
-                "data": {
-                    "name": {"foo":  "a"}
-                },
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "remote HTTP ref with different $id",
-        "schema": {"$ref": "http://localhost:1234/different-id-ref-string.json"},
-        "tests": [
-            {
-                "description": "number is invalid",
-                "data": 1,
-                "valid": false
-            },
-            {
-                "description": "string is valid",
-                "data": "foo",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "remote HTTP ref with different URN $id",
-        "schema": {"$ref": "http://localhost:1234/urn-ref-string.json"},
-        "tests": [
-            {
-                "description": "number is invalid",
-                "data": 1,
-                "valid": false
-            },
-            {
-                "description": "string is valid",
-                "data": "foo",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "remote HTTP ref with nested absolute ref",
-        "schema": {"$ref": "http://localhost:1234/nested-absolute-ref-to-string.json"},
-        "tests": [
-            {
-                "description": "number is invalid",
-                "data": 1,
-                "valid": false
-            },
-            {
-                "description": "string is valid",
-                "data": "foo",
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft-next/required.json b/json/tests/draft-next/required.json
deleted file mode 100644
index cc02fd3..0000000
--- a/json/tests/draft-next/required.json
+++ /dev/null
@@ -1,158 +0,0 @@
-[
-    {
-        "description": "required validation",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "properties": {
-                "foo": {},
-                "bar": {}
-            },
-            "required": ["foo"]
-        },
-        "tests": [
-            {
-                "description": "present required property is valid",
-                "data": {"foo": 1},
-                "valid": true
-            },
-            {
-                "description": "non-present required property is invalid",
-                "data": {"bar": 1},
-                "valid": false
-            },
-            {
-                "description": "ignores arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "ignores strings",
-                "data": "",
-                "valid": true
-            },
-            {
-                "description": "ignores other non-objects",
-                "data": 12,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "required default validation",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "properties": {
-                "foo": {}
-            }
-        },
-        "tests": [
-            {
-                "description": "not required by default",
-                "data": {},
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "required with empty array",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "properties": {
-                "foo": {}
-            },
-            "required": []
-        },
-        "tests": [
-            {
-                "description": "property not required",
-                "data": {},
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "required with escaped characters",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "required": [
-                "foo\nbar",
-                "foo\"bar",
-                "foo\\bar",
-                "foo\rbar",
-                "foo\tbar",
-                "foo\fbar"
-            ]
-        },
-        "tests": [
-            {
-                "description": "object with all properties present is valid",
-                "data": {
-                    "foo\nbar": 1,
-                    "foo\"bar": 1,
-                    "foo\\bar": 1,
-                    "foo\rbar": 1,
-                    "foo\tbar": 1,
-                    "foo\fbar": 1
-                },
-                "valid": true
-            },
-            {
-                "description": "object with some properties missing is invalid",
-                "data": {
-                    "foo\nbar": "1",
-                    "foo\"bar": "1"
-                },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "required properties whose names are Javascript object property names",
-        "comment": "Ensure JS implementations don't universally consider e.g. __proto__ to always be present in an object.",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "required": ["__proto__", "toString", "constructor"]
-        },
-        "tests": [
-            {
-                "description": "ignores arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "ignores other non-objects",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "none of the properties mentioned",
-                "data": {},
-                "valid": false
-            },
-            {
-                "description": "__proto__ present",
-                "data": { "__proto__": "foo" },
-                "valid": false
-            },
-            {
-                "description": "toString present",
-                "data": { "toString": { "length": 37 } },
-                "valid": false
-            },
-            {
-                "description": "constructor present",
-                "data": { "constructor": { "length": 37 } },
-                "valid": false
-            },
-            {
-                "description": "all present",
-                "data": { 
-                    "__proto__": 12,
-                    "toString": { "length": "foo" },
-                    "constructor": 37
-                },
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft-next/type.json b/json/tests/draft-next/type.json
deleted file mode 100644
index 86e551c..0000000
--- a/json/tests/draft-next/type.json
+++ /dev/null
@@ -1,501 +0,0 @@
-[
-    {
-        "description": "integer type matches integers",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "type": "integer"
-        },
-        "tests": [
-            {
-                "description": "an integer is an integer",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "a float with zero fractional part is an integer",
-                "data": 1.0,
-                "valid": true
-            },
-            {
-                "description": "a float is not an integer",
-                "data": 1.1,
-                "valid": false
-            },
-            {
-                "description": "a string is not an integer",
-                "data": "foo",
-                "valid": false
-            },
-            {
-                "description": "a string is still not an integer, even if it looks like one",
-                "data": "1",
-                "valid": false
-            },
-            {
-                "description": "an object is not an integer",
-                "data": {},
-                "valid": false
-            },
-            {
-                "description": "an array is not an integer",
-                "data": [],
-                "valid": false
-            },
-            {
-                "description": "a boolean is not an integer",
-                "data": true,
-                "valid": false
-            },
-            {
-                "description": "null is not an integer",
-                "data": null,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "number type matches numbers",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "type": "number"
-        },
-        "tests": [
-            {
-                "description": "an integer is a number",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "a float with zero fractional part is a number (and an integer)",
-                "data": 1.0,
-                "valid": true
-            },
-            {
-                "description": "a float is a number",
-                "data": 1.1,
-                "valid": true
-            },
-            {
-                "description": "a string is not a number",
-                "data": "foo",
-                "valid": false
-            },
-            {
-                "description": "a string is still not a number, even if it looks like one",
-                "data": "1",
-                "valid": false
-            },
-            {
-                "description": "an object is not a number",
-                "data": {},
-                "valid": false
-            },
-            {
-                "description": "an array is not a number",
-                "data": [],
-                "valid": false
-            },
-            {
-                "description": "a boolean is not a number",
-                "data": true,
-                "valid": false
-            },
-            {
-                "description": "null is not a number",
-                "data": null,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "string type matches strings",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "type": "string"
-        },
-        "tests": [
-            {
-                "description": "1 is not a string",
-                "data": 1,
-                "valid": false
-            },
-            {
-                "description": "a float is not a string",
-                "data": 1.1,
-                "valid": false
-            },
-            {
-                "description": "a string is a string",
-                "data": "foo",
-                "valid": true
-            },
-            {
-                "description": "a string is still a string, even if it looks like a number",
-                "data": "1",
-                "valid": true
-            },
-            {
-                "description": "an empty string is still a string",
-                "data": "",
-                "valid": true
-            },
-            {
-                "description": "an object is not a string",
-                "data": {},
-                "valid": false
-            },
-            {
-                "description": "an array is not a string",
-                "data": [],
-                "valid": false
-            },
-            {
-                "description": "a boolean is not a string",
-                "data": true,
-                "valid": false
-            },
-            {
-                "description": "null is not a string",
-                "data": null,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "object type matches objects",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "type": "object"
-        },
-        "tests": [
-            {
-                "description": "an integer is not an object",
-                "data": 1,
-                "valid": false
-            },
-            {
-                "description": "a float is not an object",
-                "data": 1.1,
-                "valid": false
-            },
-            {
-                "description": "a string is not an object",
-                "data": "foo",
-                "valid": false
-            },
-            {
-                "description": "an object is an object",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "an array is not an object",
-                "data": [],
-                "valid": false
-            },
-            {
-                "description": "a boolean is not an object",
-                "data": true,
-                "valid": false
-            },
-            {
-                "description": "null is not an object",
-                "data": null,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "array type matches arrays",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "type": "array"
-        },
-        "tests": [
-            {
-                "description": "an integer is not an array",
-                "data": 1,
-                "valid": false
-            },
-            {
-                "description": "a float is not an array",
-                "data": 1.1,
-                "valid": false
-            },
-            {
-                "description": "a string is not an array",
-                "data": "foo",
-                "valid": false
-            },
-            {
-                "description": "an object is not an array",
-                "data": {},
-                "valid": false
-            },
-            {
-                "description": "an array is an array",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "a boolean is not an array",
-                "data": true,
-                "valid": false
-            },
-            {
-                "description": "null is not an array",
-                "data": null,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "boolean type matches booleans",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "type": "boolean"
-        },
-        "tests": [
-            {
-                "description": "an integer is not a boolean",
-                "data": 1,
-                "valid": false
-            },
-            {
-                "description": "zero is not a boolean",
-                "data": 0,
-                "valid": false
-            },
-            {
-                "description": "a float is not a boolean",
-                "data": 1.1,
-                "valid": false
-            },
-            {
-                "description": "a string is not a boolean",
-                "data": "foo",
-                "valid": false
-            },
-            {
-                "description": "an empty string is not a boolean",
-                "data": "",
-                "valid": false
-            },
-            {
-                "description": "an object is not a boolean",
-                "data": {},
-                "valid": false
-            },
-            {
-                "description": "an array is not a boolean",
-                "data": [],
-                "valid": false
-            },
-            {
-                "description": "true is a boolean",
-                "data": true,
-                "valid": true
-            },
-            {
-                "description": "false is a boolean",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "null is not a boolean",
-                "data": null,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "null type matches only the null object",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "type": "null"
-        },
-        "tests": [
-            {
-                "description": "an integer is not null",
-                "data": 1,
-                "valid": false
-            },
-            {
-                "description": "a float is not null",
-                "data": 1.1,
-                "valid": false
-            },
-            {
-                "description": "zero is not null",
-                "data": 0,
-                "valid": false
-            },
-            {
-                "description": "a string is not null",
-                "data": "foo",
-                "valid": false
-            },
-            {
-                "description": "an empty string is not null",
-                "data": "",
-                "valid": false
-            },
-            {
-                "description": "an object is not null",
-                "data": {},
-                "valid": false
-            },
-            {
-                "description": "an array is not null",
-                "data": [],
-                "valid": false
-            },
-            {
-                "description": "true is not null",
-                "data": true,
-                "valid": false
-            },
-            {
-                "description": "false is not null",
-                "data": false,
-                "valid": false
-            },
-            {
-                "description": "null is null",
-                "data": null,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "multiple types can be specified in an array",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "type": ["integer", "string"]
-        },
-        "tests": [
-            {
-                "description": "an integer is valid",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "a string is valid",
-                "data": "foo",
-                "valid": true
-            },
-            {
-                "description": "a float is invalid",
-                "data": 1.1,
-                "valid": false
-            },
-            {
-                "description": "an object is invalid",
-                "data": {},
-                "valid": false
-            },
-            {
-                "description": "an array is invalid",
-                "data": [],
-                "valid": false
-            },
-            {
-                "description": "a boolean is invalid",
-                "data": true,
-                "valid": false
-            },
-            {
-                "description": "null is invalid",
-                "data": null,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "type as array with one item",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "type": ["string"]
-        },
-        "tests": [
-            {
-                "description": "string is valid",
-                "data": "foo",
-                "valid": true
-            },
-            {
-                "description": "number is invalid",
-                "data": 123,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "type: array or object",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "type": ["array", "object"]
-        },
-        "tests": [
-            {
-                "description": "array is valid",
-                "data": [1,2,3],
-                "valid": true
-            },
-            {
-                "description": "object is valid",
-                "data": {"foo": 123},
-                "valid": true
-            },
-            {
-                "description": "number is invalid",
-                "data": 123,
-                "valid": false
-            },
-            {
-                "description": "string is invalid",
-                "data": "foo",
-                "valid": false
-            },
-            {
-                "description": "null is invalid",
-                "data": null,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "type: array, object or null",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "type": ["array", "object", "null"]
-        },
-        "tests": [
-            {
-                "description": "array is valid",
-                "data": [1,2,3],
-                "valid": true
-            },
-            {
-                "description": "object is valid",
-                "data": {"foo": 123},
-                "valid": true
-            },
-            {
-                "description": "null is valid",
-                "data": null,
-                "valid": true
-            },
-            {
-                "description": "number is invalid",
-                "data": 123,
-                "valid": false
-            },
-            {
-                "description": "string is invalid",
-                "data": "foo",
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft-next/unevaluatedItems.json b/json/tests/draft-next/unevaluatedItems.json
deleted file mode 100644
index 9e0faef..0000000
--- a/json/tests/draft-next/unevaluatedItems.json
+++ /dev/null
@@ -1,675 +0,0 @@
-[
-    {
-        "description": "unevaluatedItems true",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "unevaluatedItems": true
-        },
-        "tests": [
-            {
-                "description": "with no unevaluated items",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "with unevaluated items",
-                "data": ["foo"],
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "unevaluatedItems false",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "unevaluatedItems": false
-        },
-        "tests": [
-            {
-                "description": "with no unevaluated items",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "with unevaluated items",
-                "data": ["foo"],
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "unevaluatedItems as schema",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "unevaluatedItems": { "type": "string" }
-        },
-        "tests": [
-            {
-                "description": "with no unevaluated items",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "with valid unevaluated items",
-                "data": ["foo"],
-                "valid": true
-            },
-            {
-                "description": "with invalid unevaluated items",
-                "data": [42],
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "unevaluatedItems with uniform items",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "items": { "type": "string" },
-            "unevaluatedItems": false
-        },
-        "tests": [
-            {
-                "description": "unevaluatedItems doesn't apply",
-                "data": ["foo", "bar"],
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "unevaluatedItems with tuple",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "prefixItems": [
-                { "type": "string" }
-            ],
-            "unevaluatedItems": false
-        },
-        "tests": [
-            {
-                "description": "with no unevaluated items",
-                "data": ["foo"],
-                "valid": true
-            },
-            {
-                "description": "with unevaluated items",
-                "data": ["foo", "bar"],
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "unevaluatedItems with items",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "prefixItems": [
-                { "type": "string" }
-            ],
-            "items": true,
-            "unevaluatedItems": false
-        },
-        "tests": [
-            {
-                "description": "unevaluatedItems doesn't apply",
-                "data": ["foo", 42],
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "unevaluatedItems with nested tuple",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "prefixItems": [
-                { "type": "string" }
-            ],
-            "allOf": [
-                {
-                    "prefixItems": [
-                        true,
-                        { "type": "number" }
-                    ]
-                }
-            ],
-            "unevaluatedItems": false
-        },
-        "tests": [
-            {
-                "description": "with no unevaluated items",
-                "data": ["foo", 42],
-                "valid": true
-            },
-            {
-                "description": "with unevaluated items",
-                "data": ["foo", 42, true],
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "unevaluatedItems with nested items",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "unevaluatedItems": {"type": "boolean"},
-            "anyOf": [
-                { "items": {"type": "string"} },
-                true
-            ]
-        },
-        "tests": [
-            {
-                "description": "with only (valid) additional items",
-                "data": [true, false],
-                "valid": true
-            },
-            {
-                "description": "with no additional items",
-                "data": ["yes", "no"],
-                "valid": true
-            },
-            {
-                "description": "with invalid additional item",
-                "data": ["yes", false],
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "unevaluatedItems with nested prefixItems and items",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "allOf": [
-                {
-                    "prefixItems": [
-                        { "type": "string" }
-                    ],
-                    "items": true
-                }
-            ],
-            "unevaluatedItems": false
-        },
-        "tests": [
-            {
-                "description": "with no additional items",
-                "data": ["foo"],
-                "valid": true
-            },
-            {
-                "description": "with additional items",
-                "data": ["foo", 42, true],
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "unevaluatedItems with nested unevaluatedItems",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "allOf": [
-                {
-                    "prefixItems": [
-                        { "type": "string" }
-                    ]
-                },
-                { "unevaluatedItems": true }
-            ],
-            "unevaluatedItems": false
-        },
-        "tests": [
-            {
-                "description": "with no additional items",
-                "data": ["foo"],
-                "valid": true
-            },
-            {
-                "description": "with additional items",
-                "data": ["foo", 42, true],
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "unevaluatedItems with anyOf",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "prefixItems": [
-                { "const": "foo" }
-            ],
-            "anyOf": [
-                {
-                    "prefixItems": [
-                        true,
-                        { "const": "bar" }
-                    ]
-                },
-                {
-                    "prefixItems": [
-                        true,
-                        true,
-                        { "const": "baz" }
-                    ]
-                }
-            ],
-            "unevaluatedItems": false
-        },
-        "tests": [
-            {
-                "description": "when one schema matches and has no unevaluated items",
-                "data": ["foo", "bar"],
-                "valid": true
-            },
-            {
-                "description": "when one schema matches and has unevaluated items",
-                "data": ["foo", "bar", 42],
-                "valid": false
-            },
-            {
-                "description": "when two schemas match and has no unevaluated items",
-                "data": ["foo", "bar", "baz"],
-                "valid": true
-            },
-            {
-                "description": "when two schemas match and has unevaluated items",
-                "data": ["foo", "bar", "baz", 42],
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "unevaluatedItems with oneOf",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "prefixItems": [
-                { "const": "foo" }
-            ],
-            "oneOf": [
-                {
-                    "prefixItems": [
-                        true,
-                        { "const": "bar" }
-                    ]
-                },
-                {
-                    "prefixItems": [
-                        true,
-                        { "const": "baz" }
-                    ]
-                }
-            ],
-            "unevaluatedItems": false
-        },
-        "tests": [
-            {
-                "description": "with no unevaluated items",
-                "data": ["foo", "bar"],
-                "valid": true
-            },
-            {
-                "description": "with unevaluated items",
-                "data": ["foo", "bar", 42],
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "unevaluatedItems with not",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "prefixItems": [
-                { "const": "foo" }
-            ],
-            "not": {
-                "not": {
-                    "prefixItems": [
-                        true,
-                        { "const": "bar" }
-                    ]
-                }
-            },
-            "unevaluatedItems": false
-        },
-        "tests": [
-            {
-                "description": "with unevaluated items",
-                "data": ["foo", "bar"],
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "unevaluatedItems with if/then/else",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "prefixItems": [
-                { "const": "foo" }
-            ],
-            "if": {
-                "prefixItems": [
-                    true,
-                    { "const": "bar" }
-                ]
-            },
-            "then": {
-                "prefixItems": [
-                    true,
-                    true,
-                    { "const": "then" }
-                ]
-            },
-            "else": {
-                "prefixItems": [
-                    true,
-                    true,
-                    true,
-                    { "const": "else" }
-                ]
-            },
-            "unevaluatedItems": false
-        },
-        "tests": [
-            {
-                "description": "when if matches and it has no unevaluated items",
-                "data": ["foo", "bar", "then"],
-                "valid": true
-            },
-            {
-                "description": "when if matches and it has unevaluated items",
-                "data": ["foo", "bar", "then", "else"],
-                "valid": false
-            },
-            {
-                "description": "when if doesn't match and it has no unevaluated items",
-                "data": ["foo", 42, 42, "else"],
-                "valid": true
-            },
-            {
-                "description": "when if doesn't match and it has unevaluated items",
-                "data": ["foo", 42, 42, "else", 42],
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "unevaluatedItems with boolean schemas",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "allOf": [true],
-            "unevaluatedItems": false
-        },
-        "tests": [
-            {
-                "description": "with no unevaluated items",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "with unevaluated items",
-                "data": ["foo"],
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "unevaluatedItems with $ref",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "$ref": "#/$defs/bar",
-            "prefixItems": [
-                { "type": "string" }
-            ],
-            "unevaluatedItems": false,
-            "$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 can't see inside cousins",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "allOf": [
-                {
-                    "prefixItems": [ true ]
-                },
-                { "unevaluatedItems": false }
-            ]
-        },
-        "tests": [
-            {
-                "description": "always fails",
-                "data": [ 1 ],
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "item is evaluated in an uncle schema to unevaluatedItems",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "properties": {
-                "foo": {
-                    "prefixItems": [
-                        { "type": "string" }
-                    ],
-                    "unevaluatedItems": false
-                  }
-            },
-            "anyOf": [
-                {
-                    "properties": {
-                        "foo": {
-                            "prefixItems": [
-                                true,
-                                { "type": "string" }
-                            ]
-                        }
-                    }
-                }
-            ]
-        },
-        "tests": [
-            {
-                "description": "no extra items",
-                "data": {
-                    "foo": [
-                        "test"
-                    ]
-                },
-                "valid": true
-            },
-            {
-                "description": "uncle keyword evaluation is not significant",
-                "data": {
-                    "foo": [
-                        "test",
-                        "test"
-                    ]
-                },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "unevaluatedItems depends on adjacent contains",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "prefixItems": [true],
-            "contains": {"type": "string"},
-            "unevaluatedItems": false
-        },
-        "tests": [
-            {
-                "description": "second item is evaluated by contains",
-                "data": [ 1, "foo" ],
-                "valid": true
-            },
-            {
-                "description": "contains fails, second item is not evaluated",
-                "data": [ 1, 2 ],
-                "valid": false
-            },
-            {
-                "description": "contains passes, second item is not evaluated",
-                "data": [ 1, 2, "foo" ],
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "unevaluatedItems depends on multiple nested contains",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "allOf": [
-                { "contains": { "multipleOf": 2 } },
-                { "contains": { "multipleOf": 3 } }
-            ],
-            "unevaluatedItems": { "multipleOf": 5 }
-        },
-        "tests": [
-            {
-                "description": "5 not evaluated, passes unevaluatedItems",
-                "data": [ 2, 3, 4, 5, 6 ],
-                "valid": true
-            },
-            {
-                "description": "7 not evaluated, fails unevaluatedItems",
-                "data": [ 2, 3, 4, 7, 8 ],
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "unevaluatedItems and contains interact to control item dependency relationship",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "if": {
-                "contains": {"const": "a"}
-            },
-            "then": {
-                "if": {
-                    "contains": {"const": "b"}
-                },
-                "then": {
-                    "if": {
-                        "contains": {"const": "c"}
-                    }
-                }
-            },
-            "unevaluatedItems": false
-        },
-        "tests": [
-            {
-                "description": "empty array is valid",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "only a's are valid",
-                "data": [ "a", "a" ],
-                "valid": true
-            },
-            {
-                "description": "a's and b's are valid",
-                "data": [ "a", "b", "a", "b", "a" ],
-                "valid": true
-            },
-            {
-                "description": "a's, b's and c's are valid",
-                "data": [ "c", "a", "c", "c", "b", "a" ],
-                "valid": true
-            },
-            {
-                "description": "only b's are invalid",
-                "data": [ "b", "b" ],
-                "valid": false
-            },
-            {
-                "description": "only c's are invalid",
-                "data": [ "c", "c" ],
-                "valid": false
-            },
-            {
-                "description": "only b's and c's are invalid",
-                "data": [ "c", "b", "c", "b", "c" ],
-                "valid": false
-            },
-            {
-                "description": "only a's and c's are invalid",
-                "data": [ "c", "a", "c", "a", "c" ],
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "non-array instances are valid",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "unevaluatedItems": false
-        },
-        "tests": [
-            {
-                "description": "ignores booleans",
-                "data": true,
-                "valid": true
-            },
-            {
-                "description": "ignores integers",
-                "data": 123,
-                "valid": true
-            },
-            {
-                "description": "ignores floats",
-                "data": 1.0,
-                "valid": true
-            },
-            {
-                "description": "ignores objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "ignores strings",
-                "data": "foo",
-                "valid": true
-            },
-            {
-                "description": "ignores null",
-                "data": null,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "unevaluatedItems with null instance elements",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "unevaluatedItems": {
-                "type": "null"
-            }
-        },
-        "tests": [
-            {
-                "description": "allows null elements",
-                "data": [ null ],
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft-next/unevaluatedProperties.json b/json/tests/draft-next/unevaluatedProperties.json
deleted file mode 100644
index 59c0e4e..0000000
--- a/json/tests/draft-next/unevaluatedProperties.json
+++ /dev/null
@@ -1,1520 +0,0 @@
-[
-    {
-        "description": "unevaluatedProperties true",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "type": "object",
-            "unevaluatedProperties": true
-        },
-        "tests": [
-            {
-                "description": "with no unevaluated properties",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "with unevaluated properties",
-                "data": {
-                    "foo": "foo"
-                },
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "unevaluatedProperties schema",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "type": "object",
-            "unevaluatedProperties": {
-                "type": "string",
-                "minLength": 3
-            }
-        },
-        "tests": [
-            {
-                "description": "with no unevaluated properties",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "with valid unevaluated properties",
-                "data": {
-                    "foo": "foo"
-                },
-                "valid": true
-            },
-            {
-                "description": "with invalid unevaluated properties",
-                "data": {
-                    "foo": "fo"
-                },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "unevaluatedProperties false",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "type": "object",
-            "unevaluatedProperties": false
-        },
-        "tests": [
-            {
-                "description": "with no unevaluated properties",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "with unevaluated properties",
-                "data": {
-                    "foo": "foo"
-                },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "unevaluatedProperties with adjacent properties",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "type": "object",
-            "properties": {
-                "foo": { "type": "string" }
-            },
-            "unevaluatedProperties": false
-        },
-        "tests": [
-            {
-                "description": "with no unevaluated properties",
-                "data": {
-                    "foo": "foo"
-                },
-                "valid": true
-            },
-            {
-                "description": "with unevaluated properties",
-                "data": {
-                    "foo": "foo",
-                    "bar": "bar"
-                },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "unevaluatedProperties with adjacent patternProperties",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "type": "object",
-            "patternProperties": {
-                "^foo": { "type": "string" }
-            },
-            "unevaluatedProperties": false
-        },
-        "tests": [
-            {
-                "description": "with no unevaluated properties",
-                "data": {
-                    "foo": "foo"
-                },
-                "valid": true
-            },
-            {
-                "description": "with unevaluated properties",
-                "data": {
-                    "foo": "foo",
-                    "bar": "bar"
-                },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "unevaluatedProperties with adjacent additionalProperties",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "type": "object",
-            "properties": {
-                "foo": { "type": "string" }
-            },
-            "additionalProperties": true,
-            "unevaluatedProperties": false
-        },
-        "tests": [
-            {
-                "description": "with no additional properties",
-                "data": {
-                    "foo": "foo"
-                },
-                "valid": true
-            },
-            {
-                "description": "with additional properties",
-                "data": {
-                    "foo": "foo",
-                    "bar": "bar"
-                },
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "unevaluatedProperties with nested properties",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "type": "object",
-            "properties": {
-                "foo": { "type": "string" }
-            },
-            "allOf": [
-                {
-                    "properties": {
-                        "bar": { "type": "string" }
-                    }
-                }
-            ],
-            "unevaluatedProperties": false
-        },
-        "tests": [
-            {
-                "description": "with no additional properties",
-                "data": {
-                    "foo": "foo",
-                    "bar": "bar"
-                },
-                "valid": true
-            },
-            {
-                "description": "with additional properties",
-                "data": {
-                    "foo": "foo",
-                    "bar": "bar",
-                    "baz": "baz"
-                },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "unevaluatedProperties with nested patternProperties",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "type": "object",
-            "properties": {
-                "foo": { "type": "string" }
-            },
-            "allOf": [
-              {
-                  "patternProperties": {
-                      "^bar": { "type": "string" }
-                  }
-              }
-            ],
-            "unevaluatedProperties": false
-        },
-        "tests": [
-            {
-                "description": "with no additional properties",
-                "data": {
-                    "foo": "foo",
-                    "bar": "bar"
-                },
-                "valid": true
-            },
-            {
-                "description": "with additional properties",
-                "data": {
-                    "foo": "foo",
-                    "bar": "bar",
-                    "baz": "baz"
-                },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "unevaluatedProperties with nested additionalProperties",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "type": "object",
-            "properties": {
-                "foo": { "type": "string" }
-            },
-            "allOf": [
-                {
-                    "additionalProperties": true
-                }
-            ],
-            "unevaluatedProperties": false
-        },
-        "tests": [
-            {
-                "description": "with no additional properties",
-                "data": {
-                    "foo": "foo"
-                },
-                "valid": true
-            },
-            {
-                "description": "with additional properties",
-                "data": {
-                    "foo": "foo",
-                    "bar": "bar"
-                },
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "unevaluatedProperties with nested unevaluatedProperties",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "type": "object",
-            "properties": {
-                "foo": { "type": "string" }
-            },
-            "allOf": [
-                {
-                    "unevaluatedProperties": true
-                }
-            ],
-            "unevaluatedProperties": {
-                "type": "string",
-                "maxLength": 2
-            }
-        },
-        "tests": [
-            {
-                "description": "with no nested unevaluated properties",
-                "data": {
-                    "foo": "foo"
-                },
-                "valid": true
-            },
-            {
-                "description": "with nested unevaluated properties",
-                "data": {
-                    "foo": "foo",
-                    "bar": "bar"
-                },
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "unevaluatedProperties with anyOf",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "type": "object",
-            "properties": {
-                "foo": { "type": "string" }
-            },
-            "anyOf": [
-                {
-                    "properties": {
-                        "bar": { "const": "bar" }
-                    },
-                    "required": ["bar"]
-                },
-                {
-                    "properties": {
-                        "baz": { "const": "baz" }
-                    },
-                    "required": ["baz"]
-                },
-                {
-                    "properties": {
-                        "quux": { "const": "quux" }
-                    },
-                    "required": ["quux"]
-                }
-            ],
-            "unevaluatedProperties": false
-        },
-        "tests": [
-            {
-                "description": "when one matches and has no unevaluated properties",
-                "data": {
-                    "foo": "foo",
-                    "bar": "bar"
-                },
-                "valid": true
-            },
-            {
-                "description": "when one matches and has unevaluated properties",
-                "data": {
-                    "foo": "foo",
-                    "bar": "bar",
-                    "baz": "not-baz"
-                },
-                "valid": false
-            },
-            {
-                "description": "when two match and has no unevaluated properties",
-                "data": {
-                    "foo": "foo",
-                    "bar": "bar",
-                    "baz": "baz"
-                },
-                "valid": true
-            },
-            {
-                "description": "when two match and has unevaluated properties",
-                "data": {
-                    "foo": "foo",
-                    "bar": "bar",
-                    "baz": "baz",
-                    "quux": "not-quux"
-                },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "unevaluatedProperties with oneOf",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "type": "object",
-            "properties": {
-                "foo": { "type": "string" }
-            },
-            "oneOf": [
-                {
-                    "properties": {
-                        "bar": { "const": "bar" }
-                    },
-                    "required": ["bar"]
-                },
-                {
-                    "properties": {
-                        "baz": { "const": "baz" }
-                    },
-                    "required": ["baz"]
-                }
-            ],
-            "unevaluatedProperties": false
-        },
-        "tests": [
-            {
-                "description": "with no unevaluated properties",
-                "data": {
-                    "foo": "foo",
-                    "bar": "bar"
-                },
-                "valid": true
-            },
-            {
-                "description": "with unevaluated properties",
-                "data": {
-                    "foo": "foo",
-                    "bar": "bar",
-                    "quux": "quux"
-                },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "unevaluatedProperties with not",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "type": "object",
-            "properties": {
-                "foo": { "type": "string" }
-            },
-            "not": {
-                "not": {
-                    "properties": {
-                        "bar": { "const": "bar" }
-                    },
-                    "required": ["bar"]
-                }
-            },
-            "unevaluatedProperties": false
-        },
-        "tests": [
-            {
-                "description": "with unevaluated properties",
-                "data": {
-                    "foo": "foo",
-                    "bar": "bar"
-                },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "unevaluatedProperties with if/then/else",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "type": "object",
-            "if": {
-                "properties": {
-                    "foo": { "const": "then" }
-                },
-                "required": ["foo"]
-            },
-            "then": {
-                "properties": {
-                    "bar": { "type": "string" }
-                },
-                "required": ["bar"]
-            },
-            "else": {
-                "properties": {
-                    "baz": { "type": "string" }
-                },
-                "required": ["baz"]
-            },
-            "unevaluatedProperties": false
-        },
-        "tests": [
-            {
-                "description": "when if is true and has no unevaluated properties",
-                "data": {
-                    "foo": "then",
-                    "bar": "bar"
-                },
-                "valid": true
-            },
-            {
-                "description": "when if is true and has unevaluated properties",
-                "data": {
-                    "foo": "then",
-                    "bar": "bar",
-                    "baz": "baz"
-                },
-                "valid": false
-            },
-            {
-                "description": "when if is false and has no unevaluated properties",
-                "data": {
-                    "baz": "baz"
-                },
-                "valid": true
-            },
-            {
-                "description": "when if is false and has unevaluated properties",
-                "data": {
-                    "foo": "else",
-                    "baz": "baz"
-                },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "unevaluatedProperties with if/then/else, then not defined",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "type": "object",
-            "if": {
-                "properties": {
-                    "foo": { "const": "then" }
-                },
-                "required": ["foo"]
-            },
-            "else": {
-                "properties": {
-                    "baz": { "type": "string" }
-                },
-                "required": ["baz"]
-            },
-            "unevaluatedProperties": false
-        },
-        "tests": [
-            {
-                "description": "when if is true and has no unevaluated properties",
-                "data": {
-                    "foo": "then",
-                    "bar": "bar"
-                },
-                "valid": false
-            },
-            {
-                "description": "when if is true and has unevaluated properties",
-                "data": {
-                    "foo": "then",
-                    "bar": "bar",
-                    "baz": "baz"
-                },
-                "valid": false
-            },
-            {
-                "description": "when if is false and has no unevaluated properties",
-                "data": {
-                    "baz": "baz"
-                },
-                "valid": true
-            },
-            {
-                "description": "when if is false and has unevaluated properties",
-                "data": {
-                    "foo": "else",
-                    "baz": "baz"
-                },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "unevaluatedProperties with if/then/else, else not defined",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "type": "object",
-            "if": {
-                "properties": {
-                    "foo": { "const": "then" }
-                },
-                "required": ["foo"]
-            },
-            "then": {
-                "properties": {
-                    "bar": { "type": "string" }
-                },
-                "required": ["bar"]
-            },
-            "unevaluatedProperties": false
-        },
-        "tests": [
-            {
-                "description": "when if is true and has no unevaluated properties",
-                "data": {
-                    "foo": "then",
-                    "bar": "bar"
-                },
-                "valid": true
-            },
-            {
-                "description": "when if is true and has unevaluated properties",
-                "data": {
-                    "foo": "then",
-                    "bar": "bar",
-                    "baz": "baz"
-                },
-                "valid": false
-            },
-            {
-                "description": "when if is false and has no unevaluated properties",
-                "data": {
-                    "baz": "baz"
-                },
-                "valid": false
-            },
-            {
-                "description": "when if is false and has unevaluated properties",
-                "data": {
-                    "foo": "else",
-                    "baz": "baz"
-                },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "unevaluatedProperties with dependentSchemas",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "type": "object",
-            "properties": {
-                "foo": { "type": "string" }
-            },
-            "dependentSchemas": {
-                "foo": {
-                    "properties": {
-                        "bar": { "const": "bar" }
-                    },
-                    "required": ["bar"]
-                }
-            },
-            "unevaluatedProperties": false
-        },
-        "tests": [
-            {
-                "description": "with no unevaluated properties",
-                "data": {
-                    "foo": "foo",
-                    "bar": "bar"
-                },
-                "valid": true
-            },
-            {
-                "description": "with unevaluated properties",
-                "data": {
-                    "bar": "bar"
-                },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "unevaluatedProperties with boolean schemas",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "type": "object",
-            "properties": {
-                "foo": { "type": "string" }
-            },
-            "allOf": [true],
-            "unevaluatedProperties": false
-        },
-        "tests": [
-            {
-                "description": "with no unevaluated properties",
-                "data": {
-                    "foo": "foo"
-                },
-                "valid": true
-            },
-            {
-                "description": "with unevaluated properties",
-                "data": {
-                    "bar": "bar"
-                },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "unevaluatedProperties with $ref",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "type": "object",
-            "$ref": "#/$defs/bar",
-            "properties": {
-                "foo": { "type": "string" }
-            },
-            "unevaluatedProperties": false,
-            "$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 can't see inside cousins",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "allOf": [
-                {
-                    "properties": {
-                        "foo": true
-                    }
-                },
-                {
-                    "unevaluatedProperties": false
-                }
-            ]
-        },
-        "tests": [
-            {
-                "description": "always fails",
-                "data": {
-                    "foo": 1
-                },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "unevaluatedProperties can't see inside cousins (reverse order)",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "allOf": [
-                {
-                    "unevaluatedProperties": false
-                },
-                {
-                    "properties": {
-                        "foo": true
-                    }
-                }
-            ]
-        },
-        "tests": [
-            {
-                "description": "always fails",
-                "data": {
-                    "foo": 1
-                },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "nested unevaluatedProperties, outer false, inner true, properties outside",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "type": "object",
-            "properties": {
-                "foo": { "type": "string" }
-            },
-            "allOf": [
-                {
-                    "unevaluatedProperties": true
-                }
-            ],
-            "unevaluatedProperties": false
-        },
-        "tests": [
-            {
-                "description": "with no nested unevaluated properties",
-                "data": {
-                    "foo": "foo"
-                },
-                "valid": true
-            },
-            {
-                "description": "with nested unevaluated properties",
-                "data": {
-                    "foo": "foo",
-                    "bar": "bar"
-                },
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "nested unevaluatedProperties, outer false, inner true, properties inside",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "type": "object",
-            "allOf": [
-                {
-                    "properties": {
-                        "foo": { "type": "string" }
-                    },
-                    "unevaluatedProperties": true
-                }
-            ],
-            "unevaluatedProperties": false
-        },
-        "tests": [
-            {
-                "description": "with no nested unevaluated properties",
-                "data": {
-                    "foo": "foo"
-                },
-                "valid": true
-            },
-            {
-                "description": "with nested unevaluated properties",
-                "data": {
-                    "foo": "foo",
-                    "bar": "bar"
-                },
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "nested unevaluatedProperties, outer true, inner false, properties outside",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "type": "object",
-            "properties": {
-                "foo": { "type": "string" }
-            },
-            "allOf": [
-                {
-                    "unevaluatedProperties": false
-                }
-            ],
-            "unevaluatedProperties": true
-        },
-        "tests": [
-            {
-                "description": "with no nested unevaluated properties",
-                "data": {
-                    "foo": "foo"
-                },
-                "valid": false
-            },
-            {
-                "description": "with nested unevaluated properties",
-                "data": {
-                    "foo": "foo",
-                    "bar": "bar"
-                },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "nested unevaluatedProperties, outer true, inner false, properties inside",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "type": "object",
-            "allOf": [
-                {
-                    "properties": {
-                        "foo": { "type": "string" }
-                    },
-                    "unevaluatedProperties": false
-                }
-            ],
-            "unevaluatedProperties": true
-        },
-        "tests": [
-            {
-                "description": "with no nested unevaluated properties",
-                "data": {
-                    "foo": "foo"
-                },
-                "valid": true
-            },
-            {
-                "description": "with nested unevaluated properties",
-                "data": {
-                    "foo": "foo",
-                    "bar": "bar"
-                },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "cousin unevaluatedProperties, true and false, true with properties",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "type": "object",
-            "allOf": [
-                {
-                    "properties": {
-                        "foo": { "type": "string" }
-                    },
-                    "unevaluatedProperties": true
-                },
-                {
-                    "unevaluatedProperties": false
-                }
-            ]
-        },
-        "tests": [
-            {
-                "description": "with no nested unevaluated properties",
-                "data": {
-                    "foo": "foo"
-                },
-                "valid": false
-            },
-            {
-                "description": "with nested unevaluated properties",
-                "data": {
-                    "foo": "foo",
-                    "bar": "bar"
-                },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "cousin unevaluatedProperties, true and false, false with properties",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "type": "object",
-            "allOf": [
-                {
-                    "unevaluatedProperties": true
-                },
-                {
-                    "properties": {
-                        "foo": { "type": "string" }
-                    },
-                    "unevaluatedProperties": false
-                }
-            ]
-        },
-        "tests": [
-            {
-                "description": "with no nested unevaluated properties",
-                "data": {
-                    "foo": "foo"
-                },
-                "valid": true
-            },
-            {
-                "description": "with nested unevaluated properties",
-                "data": {
-                    "foo": "foo",
-                    "bar": "bar"
-                },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "property is evaluated in an uncle schema to unevaluatedProperties",
-        "comment": "see https://stackoverflow.com/questions/66936884/deeply-nested-unevaluatedproperties-and-their-expectations",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "type": "object",
-            "properties": {
-                "foo": {
-                    "type": "object",
-                    "properties": {
-                        "bar": {
-                            "type": "string"
-                        }
-                    },
-                    "unevaluatedProperties": false
-                  }
-            },
-            "anyOf": [
-                {
-                    "properties": {
-                        "foo": {
-                            "properties": {
-                                "faz": {
-                                    "type": "string"
-                                }
-                            }
-                        }
-                    }
-                }
-            ]
-        },
-        "tests": [
-            {
-                "description": "no extra properties",
-                "data": {
-                    "foo": {
-                        "bar": "test"
-                    }
-                },
-                "valid": true
-            },
-            {
-                "description": "uncle keyword evaluation is not significant",
-                "data": {
-                    "foo": {
-                        "bar": "test",
-                        "faz": "test"
-                    }
-                },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "in-place applicator siblings, allOf has unevaluated",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "type": "object",
-            "allOf": [
-                {
-                    "properties": {
-                        "foo": true
-                    },
-                    "unevaluatedProperties": false
-                }
-            ],
-            "anyOf": [
-                {
-                    "properties": {
-                        "bar": true
-                    }
-                }
-            ]
-        },
-        "tests": [
-            {
-                "description": "base case: both properties present",
-                "data": {
-                    "foo": 1,
-                    "bar": 1
-                },
-                "valid": false
-            },
-            {
-                "description": "in place applicator siblings, bar is missing",
-                "data": {
-                    "foo": 1
-                },
-                "valid": true
-            },
-            {
-                "description": "in place applicator siblings, foo is missing",
-                "data": {
-                    "bar": 1
-                },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "in-place applicator siblings, anyOf has unevaluated",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "type": "object",
-            "allOf": [
-                {
-                    "properties": {
-                        "foo": true
-                    }
-                }
-            ],
-            "anyOf": [
-                {
-                    "properties": {
-                        "bar": true
-                    },
-                    "unevaluatedProperties": false
-                }
-            ]
-        },
-        "tests": [
-            {
-                "description": "base case: both properties present",
-                "data": {
-                    "foo": 1,
-                    "bar": 1
-                },
-                "valid": false
-            },
-            {
-                "description": "in place applicator siblings, bar is missing",
-                "data": {
-                    "foo": 1
-                },
-                "valid": false
-            },
-            {
-                "description": "in place applicator siblings, foo is missing",
-                "data": {
-                    "bar": 1
-                },
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "unevaluatedProperties + single cyclic ref",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "type": "object",
-            "properties": {
-                "x": { "$ref": "#" }
-            },
-            "unevaluatedProperties": false
-        },
-        "tests": [
-            {
-                "description": "Empty is valid",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "Single is valid",
-                "data": { "x": {} },
-                "valid": true
-            },
-            {
-                "description": "Unevaluated on 1st level is invalid",
-                "data": { "x": {}, "y": {} },
-                "valid": false
-            },
-            {
-                "description": "Nested is valid",
-                "data": { "x": { "x": {} } },
-                "valid": true
-            },
-            {
-                "description": "Unevaluated on 2nd level is invalid",
-                "data": { "x": { "x": {}, "y": {} } },
-                "valid": false
-            },
-            {
-                "description": "Deep nested is valid",
-                "data": { "x": { "x": { "x": {} } } },
-                "valid": true
-            },
-            {
-                "description": "Unevaluated on 3rd level is invalid",
-                "data": { "x": { "x": { "x": {}, "y": {} } } },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "unevaluatedProperties + ref inside allOf / oneOf",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "$defs": {
-                "one": {
-                    "properties": { "a": true }
-                },
-                "two": {
-                    "required": ["x"],
-                    "properties": { "x": true }
-                }
-            },
-            "allOf": [
-                { "$ref": "#/$defs/one" },
-                { "properties": { "b": true } },
-                {
-                    "oneOf": [
-                        { "$ref": "#/$defs/two" },
-                        {
-                            "required": ["y"],
-                            "properties": { "y": true }
-                        }
-                    ]
-                }
-            ],
-            "unevaluatedProperties": false
-        },
-        "tests": [
-            {
-                "description": "Empty is invalid (no x or y)",
-                "data": {},
-                "valid": false
-            },
-            {
-                "description": "a and b are invalid (no x or y)",
-                "data": { "a": 1, "b": 1 },
-                "valid": false
-            },
-            {
-                "description": "x and y are invalid",
-                "data": { "x": 1, "y": 1 },
-                "valid": false
-            },
-            {
-                "description": "a and x are valid",
-                "data": { "a": 1, "x": 1 },
-                "valid": true
-            },
-            {
-                "description": "a and y are valid",
-                "data": { "a": 1, "y": 1 },
-                "valid": true
-            },
-            {
-                "description": "a and b and x are valid",
-                "data": { "a": 1, "b": 1, "x": 1 },
-                "valid": true
-            },
-            {
-                "description": "a and b and y are valid",
-                "data": { "a": 1, "b": 1, "y": 1 },
-                "valid": true
-            },
-            {
-                "description": "a and b and x and y are invalid",
-                "data": { "a": 1, "b": 1, "x": 1, "y": 1 },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "dynamic evalation inside nested refs",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "$defs": {
-                "one": {
-                    "oneOf": [
-                        { "$ref": "#/$defs/two" },
-                        { "required": ["b"], "properties": { "b": true } },
-                        { "required": ["xx"], "patternProperties": { "x": true } },
-                        { "required": ["all"], "unevaluatedProperties": true }
-                    ]
-                },
-                "two": {
-                    "oneOf": [
-                        { "required": ["c"], "properties": { "c": true } },
-                        { "required": ["d"], "properties": { "d": true } }
-                    ]
-                }
-            },
-            "oneOf": [
-                { "$ref": "#/$defs/one" },
-                { "required": ["a"], "properties": { "a": true } }
-            ],
-            "unevaluatedProperties": false
-        },
-        "tests": [
-            {
-                "description": "Empty is invalid",
-                "data": {},
-                "valid": false
-            },
-            {
-                "description": "a is valid",
-                "data": { "a": 1 },
-                "valid": true
-            },
-            {
-                "description": "b is valid",
-                "data": { "b": 1 },
-                "valid": true
-            },
-            {
-                "description": "c is valid",
-                "data": { "c": 1 },
-                "valid": true
-            },
-            {
-                "description": "d is valid",
-                "data": { "d": 1 },
-                "valid": true
-            },
-            {
-                "description": "a + b is invalid",
-                "data": { "a": 1, "b": 1 },
-                "valid": false
-            },
-            {
-                "description": "a + c is invalid",
-                "data": { "a": 1, "c": 1 },
-                "valid": false
-            },
-            {
-                "description": "a + d is invalid",
-                "data": { "a": 1, "d": 1 },
-                "valid": false
-            },
-            {
-                "description": "b + c is invalid",
-                "data": { "b": 1, "c": 1 },
-                "valid": false
-            },
-            {
-                "description": "b + d is invalid",
-                "data": { "b": 1, "d": 1 },
-                "valid": false
-            },
-            {
-                "description": "c + d is invalid",
-                "data": { "c": 1, "d": 1 },
-                "valid": false
-            },
-            {
-                "description": "xx is valid",
-                "data": { "xx": 1 },
-                "valid": true
-            },
-            {
-                "description": "xx + foox is valid",
-                "data": { "xx": 1, "foox": 1 },
-                "valid": true
-            },
-            {
-                "description": "xx + foo is invalid",
-                "data": { "xx": 1, "foo": 1 },
-                "valid": false
-            },
-            {
-                "description": "xx + a is invalid",
-                "data": { "xx": 1, "a": 1 },
-                "valid": false
-            },
-            {
-                "description": "xx + b is invalid",
-                "data": { "xx": 1, "b": 1 },
-                "valid": false
-            },
-            {
-                "description": "xx + c is invalid",
-                "data": { "xx": 1, "c": 1 },
-                "valid": false
-            },
-            {
-                "description": "xx + d is invalid",
-                "data": { "xx": 1, "d": 1 },
-                "valid": false
-            },
-            {
-                "description": "all is valid",
-                "data": { "all": 1 },
-                "valid": true
-            },
-            {
-                "description": "all + foo is valid",
-                "data": { "all": 1, "foo": 1 },
-                "valid": true
-            },
-            {
-                "description": "all + a is invalid",
-                "data": { "all": 1, "a": 1 },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "unevaluatedProperties depends on adjacent contains",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "properties": {
-              "foo": { "type": "number" }
-            },
-            "contains": { "type": "string" },
-            "unevaluatedProperties": false
-        },
-        "tests": [
-            {
-                "description": "bar is evaluated by contains",
-                "data": { "foo": 1, "bar": "foo" },
-                "valid": true
-            },
-            {
-                "description": "contains fails, bar is not evaluated",
-                "data": { "foo": 1, "bar": 2 },
-                "valid": false
-            },
-            {
-                "description": "contains passes, bar is not evaluated",
-                "data": { "foo": 1, "bar": 2, "baz": "foo" },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "unevaluatedProperties depends on multiple nested contains",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "allOf": [
-                { "contains": { "multipleOf": 2 } },
-                { "contains": { "multipleOf": 3 } }
-            ],
-            "unevaluatedProperties": { "multipleOf": 5 }
-        },
-        "tests": [
-            {
-                "description": "5 not evaluated, passes unevaluatedItems",
-                "data": { "a": 2, "b": 3, "c": 4, "d": 5, "e": 6 },
-                "valid": true
-            },
-            {
-                "description": "7 not evaluated, fails unevaluatedItems",
-                "data": { "a": 2, "b": 3, "c": 4, "d": 7, "e": 8 },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "non-object instances are valid",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "unevaluatedProperties": false
-        },
-        "tests": [
-            {
-                "description": "ignores booleans",
-                "data": true,
-                "valid": true
-            },
-            {
-                "description": "ignores integers",
-                "data": 123,
-                "valid": true
-            },
-            {
-                "description": "ignores floats",
-                "data": 1.0,
-                "valid": true
-            },
-            {
-                "description": "ignores arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "ignores strings",
-                "data": "foo",
-                "valid": true
-            },
-            {
-                "description": "ignores null",
-                "data": null,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "unevaluatedProperties with null valued instance properties",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "unevaluatedProperties": {
-                "type": "null"
-            }
-        },
-        "tests": [
-            {
-                "description": "allows null valued properties",
-                "data": {"foo": null},
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "unevaluatedProperties can see inside propertyDependencies",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "properties": {
-                "foo": {
-                    "type": "string"
-                }
-            },
-            "propertyDependencies": {
-                "foo": {
-                    "foo1": { 
-                        "properties": {
-                            "bar": true
-                        }
-                    }
-                }
-            },
-            "unevaluatedProperties": false
-        },
-        "tests": [
-            {
-                "description": "allows bar if foo = foo1",
-                "data": {
-                    "foo": "foo1",
-                    "bar": 42
-                },
-                "valid": true
-            },
-            {
-                "description": "disallows bar if foo != foo1",
-                "data": {
-                    "foo": "foo2",
-                    "bar": 42
-                },
-                "valid": false
-            },
-            {
-                "description": "disallows bar if foo is absent",
-                "data": {
-                    "bar": 42
-                },
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft-next/uniqueItems.json b/json/tests/draft-next/uniqueItems.json
deleted file mode 100644
index 610b257..0000000
--- a/json/tests/draft-next/uniqueItems.json
+++ /dev/null
@@ -1,414 +0,0 @@
-[
-    {
-        "description": "uniqueItems validation",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "uniqueItems": true
-        },
-        "tests": [
-            {
-                "description": "unique array of integers is valid",
-                "data": [1, 2],
-                "valid": true
-            },
-            {
-                "description": "non-unique array of integers is invalid",
-                "data": [1, 1],
-                "valid": false
-            },
-            {
-                "description": "non-unique array of more than two integers is invalid",
-                "data": [1, 2, 1],
-                "valid": false
-            },
-            {
-                "description": "numbers are unique if mathematically unequal",
-                "data": [1.0, 1.00, 1],
-                "valid": false
-            },
-            {
-                "description": "false is not equal to zero",
-                "data": [0, false],
-                "valid": true
-            },
-            {
-                "description": "true is not equal to one",
-                "data": [1, true],
-                "valid": true
-            },
-            {
-                "description": "unique array of strings is valid",
-                "data": ["foo", "bar", "baz"],
-                "valid": true
-            },
-            {
-                "description": "non-unique array of strings is invalid",
-                "data": ["foo", "bar", "foo"],
-                "valid": false
-            },
-            {
-                "description": "unique array of objects is valid",
-                "data": [{"foo": "bar"}, {"foo": "baz"}],
-                "valid": true
-            },
-            {
-                "description": "non-unique array of objects is invalid",
-                "data": [{"foo": "bar"}, {"foo": "bar"}],
-                "valid": false
-            },
-            {
-                "description": "unique array of nested objects is valid",
-                "data": [
-                    {"foo": {"bar" : {"baz" : true}}},
-                    {"foo": {"bar" : {"baz" : false}}}
-                ],
-                "valid": true
-            },
-            {
-                "description": "non-unique array of nested objects is invalid",
-                "data": [
-                    {"foo": {"bar" : {"baz" : true}}},
-                    {"foo": {"bar" : {"baz" : true}}}
-                ],
-                "valid": false
-            },
-            {
-                "description": "unique array of arrays is valid",
-                "data": [["foo"], ["bar"]],
-                "valid": true
-            },
-            {
-                "description": "non-unique array of arrays is invalid",
-                "data": [["foo"], ["foo"]],
-                "valid": false
-            },
-            {
-                "description": "non-unique array of more than two arrays is invalid",
-                "data": [["foo"], ["bar"], ["foo"]],
-                "valid": false
-            },
-            {
-                "description": "1 and true are unique",
-                "data": [1, true],
-                "valid": true
-            },
-            {
-                "description": "0 and false are unique",
-                "data": [0, false],
-                "valid": true
-            },
-            {
-                "description": "[1] and [true] are unique",
-                "data": [[1], [true]],
-                "valid": true
-            },
-            {
-                "description": "[0] and [false] are unique",
-                "data": [[0], [false]],
-                "valid": true
-            },
-            {
-                "description": "nested [1] and [true] are unique",
-                "data": [[[1], "foo"], [[true], "foo"]],
-                "valid": true
-            },
-            {
-                "description": "nested [0] and [false] are unique",
-                "data": [[[0], "foo"], [[false], "foo"]],
-                "valid": true
-            },
-            {
-                "description": "unique heterogeneous types are valid",
-                "data": [{}, [1], true, null, 1, "{}"],
-                "valid": true
-            },
-            {
-                "description": "non-unique heterogeneous types are invalid",
-                "data": [{}, [1], true, null, {}, 1],
-                "valid": false
-            },
-            {
-                "description": "different objects are unique",
-                "data": [{"a": 1, "b": 2}, {"a": 2, "b": 1}],
-                "valid": true
-            },
-            {
-                "description": "objects are non-unique despite key order",
-                "data": [{"a": 1, "b": 2}, {"b": 2, "a": 1}],
-                "valid": false
-            },
-            {
-                "description": "{\"a\": false} and {\"a\": 0} are unique",
-                "data": [{"a": false}, {"a": 0}],
-                "valid": true
-            },
-            {
-                "description": "{\"a\": true} and {\"a\": 1} are unique",
-                "data": [{"a": true}, {"a": 1}],
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "uniqueItems with an array of items",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "prefixItems": [{"type": "boolean"}, {"type": "boolean"}],
-            "uniqueItems": true
-        },
-        "tests": [
-            {
-                "description": "[false, true] from items array is valid",
-                "data": [false, true],
-                "valid": true
-            },
-            {
-                "description": "[true, false] from items array is valid",
-                "data": [true, false],
-                "valid": true
-            },
-            {
-                "description": "[false, false] from items array is not valid",
-                "data": [false, false],
-                "valid": false
-            },
-            {
-                "description": "[true, true] from items array is not valid",
-                "data": [true, true],
-                "valid": false
-            },
-            {
-                "description": "unique array extended from [false, true] is valid",
-                "data": [false, true, "foo", "bar"],
-                "valid": true
-            },
-            {
-                "description": "unique array extended from [true, false] is valid",
-                "data": [true, false, "foo", "bar"],
-                "valid": true
-            },
-            {
-                "description": "non-unique array extended from [false, true] is not valid",
-                "data": [false, true, "foo", "foo"],
-                "valid": false
-            },
-            {
-                "description": "non-unique array extended from [true, false] is not valid",
-                "data": [true, false, "foo", "foo"],
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "uniqueItems with an array of items and additionalItems=false",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "prefixItems": [{"type": "boolean"}, {"type": "boolean"}],
-            "uniqueItems": true,
-            "items": false
-        },
-        "tests": [
-            {
-                "description": "[false, true] from items array is valid",
-                "data": [false, true],
-                "valid": true
-            },
-            {
-                "description": "[true, false] from items array is valid",
-                "data": [true, false],
-                "valid": true
-            },
-            {
-                "description": "[false, false] from items array is not valid",
-                "data": [false, false],
-                "valid": false
-            },
-            {
-                "description": "[true, true] from items array is not valid",
-                "data": [true, true],
-                "valid": false
-            },
-            {
-                "description": "extra items are invalid even if unique",
-                "data": [false, true, null],
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "uniqueItems=false validation",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "uniqueItems": false
-        },
-        "tests": [
-            {
-                "description": "unique array of integers is valid",
-                "data": [1, 2],
-                "valid": true
-            },
-            {
-                "description": "non-unique array of integers is valid",
-                "data": [1, 1],
-                "valid": true
-            },
-            {
-                "description": "numbers are unique if mathematically unequal",
-                "data": [1.0, 1.00, 1],
-                "valid": true
-            },
-            {
-                "description": "false is not equal to zero",
-                "data": [0, false],
-                "valid": true
-            },
-            {
-                "description": "true is not equal to one",
-                "data": [1, true],
-                "valid": true
-            },
-            {
-                "description": "unique array of objects is valid",
-                "data": [{"foo": "bar"}, {"foo": "baz"}],
-                "valid": true
-            },
-            {
-                "description": "non-unique array of objects is valid",
-                "data": [{"foo": "bar"}, {"foo": "bar"}],
-                "valid": true
-            },
-            {
-                "description": "unique array of nested objects is valid",
-                "data": [
-                    {"foo": {"bar" : {"baz" : true}}},
-                    {"foo": {"bar" : {"baz" : false}}}
-                ],
-                "valid": true
-            },
-            {
-                "description": "non-unique array of nested objects is valid",
-                "data": [
-                    {"foo": {"bar" : {"baz" : true}}},
-                    {"foo": {"bar" : {"baz" : true}}}
-                ],
-                "valid": true
-            },
-            {
-                "description": "unique array of arrays is valid",
-                "data": [["foo"], ["bar"]],
-                "valid": true
-            },
-            {
-                "description": "non-unique array of arrays is valid",
-                "data": [["foo"], ["foo"]],
-                "valid": true
-            },
-            {
-                "description": "1 and true are unique",
-                "data": [1, true],
-                "valid": true
-            },
-            {
-                "description": "0 and false are unique",
-                "data": [0, false],
-                "valid": true
-            },
-            {
-                "description": "unique heterogeneous types are valid",
-                "data": [{}, [1], true, null, 1],
-                "valid": true
-            },
-            {
-                "description": "non-unique heterogeneous types are valid",
-                "data": [{}, [1], true, null, {}, 1],
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "uniqueItems=false with an array of items",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "prefixItems": [{"type": "boolean"}, {"type": "boolean"}],
-            "uniqueItems": false
-        },
-        "tests": [
-            {
-                "description": "[false, true] from items array is valid",
-                "data": [false, true],
-                "valid": true
-            },
-            {
-                "description": "[true, false] from items array is valid",
-                "data": [true, false],
-                "valid": true
-            },
-            {
-                "description": "[false, false] from items array is valid",
-                "data": [false, false],
-                "valid": true
-            },
-            {
-                "description": "[true, true] from items array is valid",
-                "data": [true, true],
-                "valid": true
-            },
-            {
-                "description": "unique array extended from [false, true] is valid",
-                "data": [false, true, "foo", "bar"],
-                "valid": true
-            },
-            {
-                "description": "unique array extended from [true, false] is valid",
-                "data": [true, false, "foo", "bar"],
-                "valid": true
-            },
-            {
-                "description": "non-unique array extended from [false, true] is valid",
-                "data": [false, true, "foo", "foo"],
-                "valid": true
-            },
-            {
-                "description": "non-unique array extended from [true, false] is valid",
-                "data": [true, false, "foo", "foo"],
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "uniqueItems=false with an array of items and additionalItems=false",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "prefixItems": [{"type": "boolean"}, {"type": "boolean"}],
-            "uniqueItems": false,
-            "items": false
-        },
-        "tests": [
-            {
-                "description": "[false, true] from items array is valid",
-                "data": [false, true],
-                "valid": true
-            },
-            {
-                "description": "[true, false] from items array is valid",
-                "data": [true, false],
-                "valid": true
-            },
-            {
-                "description": "[false, false] from items array is valid",
-                "data": [false, false],
-                "valid": true
-            },
-            {
-                "description": "[true, true] from items array is valid",
-                "data": [true, true],
-                "valid": true
-            },
-            {
-                "description": "extra items are invalid even if unique",
-                "data": [false, true, null],
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft-next/unknownKeyword.json b/json/tests/draft-next/unknownKeyword.json
deleted file mode 100644
index 055ff6b..0000000
--- a/json/tests/draft-next/unknownKeyword.json
+++ /dev/null
@@ -1,57 +0,0 @@
-[
-    {
-        "description": "$id inside an unknown keyword is not a real identifier",
-        "comment": "the implementation must not be confused by an $id in locations we do not know how to parse",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "$defs": {
-                "id_in_unknown0": {
-                    "not": {
-                        "array_of_schemas": [
-                            {
-                              "$id": "https://localhost:1234/draft-next/unknownKeyword/my_identifier.json",
-                              "type": "null"
-                            }
-                        ]
-                    }
-                },
-                "real_id_in_schema": {
-                    "$id": "https://localhost:1234/draft-next/unknownKeyword/my_identifier.json",
-                    "type": "string"
-                },
-                "id_in_unknown1": {
-                    "not": {
-                        "object_of_schemas": {
-                            "foo": {
-                              "$id": "https://localhost:1234/draft-next/unknownKeyword/my_identifier.json",
-                              "type": "integer"
-                            }
-                        }
-                    }
-                }
-            },
-            "anyOf": [
-                { "$ref": "#/$defs/id_in_unknown0" },
-                { "$ref": "#/$defs/id_in_unknown1" },
-                { "$ref": "https://localhost:1234/draft-next/unknownKeyword/my_identifier.json" }
-            ]
-        },
-        "tests": [
-            {
-                "description": "type matches second anyOf, which has a real schema in it",
-                "data": "a string",
-                "valid": true
-            },
-            {
-                "description": "type matches non-schema in first anyOf",
-                "data": null,
-                "valid": false
-            },
-            {
-                "description": "type matches non-schema in third anyOf",
-                "data": 1,
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft-next/vocabulary.json b/json/tests/draft-next/vocabulary.json
deleted file mode 100644
index 65b81ea..0000000
--- a/json/tests/draft-next/vocabulary.json
+++ /dev/null
@@ -1,38 +0,0 @@
-[
-    {
-        "description": "schema that uses custom metaschema with with no validation vocabulary",
-        "schema": {
-            "$id": "https://schema/using/no/validation",
-            "$schema": "http://localhost:1234/draft-next/metaschema-no-validation.json",
-            "properties": {
-                "badProperty": false,
-                "numberProperty": {
-                    "minimum": 10
-                }
-            }
-        },
-        "tests": [
-            {
-                "description": "applicator vocabulary still works",
-                "data": {
-                    "badProperty": "this property should not exist"
-                },
-                "valid": false
-            },
-            {
-                "description": "no validation: valid number",
-                "data": {
-                    "numberProperty": 20
-                },
-                "valid": true
-            },
-            {
-                "description": "no validation: invalid number, but it still validates",
-                "data": {
-                    "numberProperty": 1
-                },
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft2019-09/additionalItems.json b/json/tests/draft2019-09/additionalItems.json
deleted file mode 100644
index ca91c0c..0000000
--- a/json/tests/draft2019-09/additionalItems.json
+++ /dev/null
@@ -1,177 +0,0 @@
-[
-    {
-        "description": "additionalItems as schema",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "items": [{}],
-            "additionalItems": {"type": "integer"}
-        },
-        "tests": [
-            {
-                "description": "additional items match schema",
-                "data": [ null, 2, 3, 4 ],
-                "valid": true
-            },
-            {
-                "description": "additional items do not match schema",
-                "data": [ null, 2, 3, "foo" ],
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "when items is schema, additionalItems does nothing",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "items": {},
-            "additionalItems": false
-        },
-        "tests": [
-            {
-                "description": "all items match schema",
-                "data": [ 1, 2, 3, 4, 5 ],
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "array of items with no additionalItems permitted",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "items": [{}, {}, {}],
-            "additionalItems": false
-        },
-        "tests": [
-            {
-                "description": "empty array",
-                "data": [ ],
-                "valid": true
-            },
-            {
-                "description": "fewer number of items present (1)",
-                "data": [ 1 ],
-                "valid": true
-            },
-            {
-                "description": "fewer number of items present (2)",
-                "data": [ 1, 2 ],
-                "valid": true
-            },
-            {
-                "description": "equal number of items present",
-                "data": [ 1, 2, 3 ],
-                "valid": true
-            },
-            {
-                "description": "additional items are not permitted",
-                "data": [ 1, 2, 3, 4 ],
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "additionalItems as false without items",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "additionalItems": false
-        },
-        "tests": [
-            {
-                "description":
-                    "items defaults to empty schema so everything is valid",
-                "data": [ 1, 2, 3, 4, 5 ],
-                "valid": true
-            },
-            {
-                "description": "ignores non-arrays",
-                "data": {"foo" : "bar"},
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "additionalItems are allowed by default",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "items": [{"type": "integer"}]
-        },
-        "tests": [
-            {
-                "description": "only the first item is validated",
-                "data": [1, "foo", false],
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "additionalItems does not look in applicators, valid case",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "allOf": [
-                { "items": [ { "type": "integer" } ] }
-            ],
-            "additionalItems": { "type": "boolean" }
-        },
-        "tests": [
-            {
-                "description": "items defined in allOf are not examined",
-                "data": [ 1, null ],
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "additionalItems does not look in applicators, invalid case",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "allOf": [
-                { "items": [ { "type": "integer" }, { "type": "string" } ] }
-            ],
-            "items": [ {"type": "integer" } ],
-            "additionalItems": { "type": "boolean" }
-        },
-        "tests": [
-            {
-                "description": "items defined in allOf are not examined",
-                "data": [ 1, "hello" ],
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "items validation adjusts the starting index for additionalItems",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "items": [ { "type": "string" } ],
-            "additionalItems": { "type": "integer" }
-        },
-        "tests": [
-            {
-                "description": "valid items",
-                "data": [ "x", 2, 3 ],
-                "valid": true
-            },
-            {
-                "description": "wrong type of second item",
-                "data": [ "x", "y" ],
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "additionalItems with null instance elements",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "additionalItems": {
-                "type": "null"
-            }
-        },
-        "tests": [
-            {
-                "description": "allows null elements",
-                "data": [ null ],
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft2019-09/additionalProperties.json b/json/tests/draft2019-09/additionalProperties.json
deleted file mode 100644
index f9f03bb..0000000
--- a/json/tests/draft2019-09/additionalProperties.json
+++ /dev/null
@@ -1,156 +0,0 @@
-[
-    {
-        "description":
-            "additionalProperties being false does not allow other properties",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "properties": {"foo": {}, "bar": {}},
-            "patternProperties": { "^v": {} },
-            "additionalProperties": false
-        },
-        "tests": [
-            {
-                "description": "no additional properties is valid",
-                "data": {"foo": 1},
-                "valid": true
-            },
-            {
-                "description": "an additional property is invalid",
-                "data": {"foo" : 1, "bar" : 2, "quux" : "boom"},
-                "valid": false
-            },
-            {
-                "description": "ignores arrays",
-                "data": [1, 2, 3],
-                "valid": true
-            },
-            {
-                "description": "ignores strings",
-                "data": "foobarbaz",
-                "valid": true
-            },
-            {
-                "description": "ignores other non-objects",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "patternProperties are not additional properties",
-                "data": {"foo":1, "vroom": 2},
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "non-ASCII pattern with additionalProperties",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "patternProperties": {"^á": {}},
-            "additionalProperties": false
-        },
-        "tests": [
-            {
-                "description": "matching the pattern is valid",
-                "data": {"ármányos": 2},
-                "valid": true
-            },
-            {
-                "description": "not matching the pattern is invalid",
-                "data": {"élmény": 2},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "additionalProperties with schema",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "properties": {"foo": {}, "bar": {}},
-            "additionalProperties": {"type": "boolean"}
-        },
-        "tests": [
-            {
-                "description": "no additional properties is valid",
-                "data": {"foo": 1},
-                "valid": true
-            },
-            {
-                "description": "an additional valid property is valid",
-                "data": {"foo" : 1, "bar" : 2, "quux" : true},
-                "valid": true
-            },
-            {
-                "description": "an additional invalid property is invalid",
-                "data": {"foo" : 1, "bar" : 2, "quux" : 12},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description":
-            "additionalProperties can exist by itself",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "additionalProperties": {"type": "boolean"}
-        },
-        "tests": [
-            {
-                "description": "an additional valid property is valid",
-                "data": {"foo" : true},
-                "valid": true
-            },
-            {
-                "description": "an additional invalid property is invalid",
-                "data": {"foo" : 1},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "additionalProperties are allowed by default",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "properties": {"foo": {}, "bar": {}}
-        },
-        "tests": [
-            {
-                "description": "additional properties are allowed",
-                "data": {"foo": 1, "bar": 2, "quux": true},
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "additionalProperties does not look in applicators",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "allOf": [
-                {"properties": {"foo": {}}}
-            ],
-            "additionalProperties": {"type": "boolean"}
-        },
-        "tests": [
-            {
-                "description": "properties defined in allOf are not examined",
-                "data": {"foo": 1, "bar": true},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "additionalProperties with null valued instance properties",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "additionalProperties": {
-                "type": "null"
-            }
-        },
-        "tests": [
-            {
-                "description": "allows null values",
-                "data": {"foo": null},
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft2019-09/allOf.json b/json/tests/draft2019-09/allOf.json
deleted file mode 100644
index dec267e..0000000
--- a/json/tests/draft2019-09/allOf.json
+++ /dev/null
@@ -1,312 +0,0 @@
-[
-    {
-        "description": "allOf",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "allOf": [
-                {
-                    "properties": {
-                        "bar": {"type": "integer"}
-                    },
-                    "required": ["bar"]
-                },
-                {
-                    "properties": {
-                        "foo": {"type": "string"}
-                    },
-                    "required": ["foo"]
-                }
-            ]
-        },
-        "tests": [
-            {
-                "description": "allOf",
-                "data": {"foo": "baz", "bar": 2},
-                "valid": true
-            },
-            {
-                "description": "mismatch second",
-                "data": {"foo": "baz"},
-                "valid": false
-            },
-            {
-                "description": "mismatch first",
-                "data": {"bar": 2},
-                "valid": false
-            },
-            {
-                "description": "wrong type",
-                "data": {"foo": "baz", "bar": "quux"},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "allOf with base schema",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "properties": {"bar": {"type": "integer"}},
-            "required": ["bar"],
-            "allOf" : [
-                {
-                    "properties": {
-                        "foo": {"type": "string"}
-                    },
-                    "required": ["foo"]
-                },
-                {
-                    "properties": {
-                        "baz": {"type": "null"}
-                    },
-                    "required": ["baz"]
-                }
-            ]
-        },
-        "tests": [
-            {
-                "description": "valid",
-                "data": {"foo": "quux", "bar": 2, "baz": null},
-                "valid": true
-            },
-            {
-                "description": "mismatch base schema",
-                "data": {"foo": "quux", "baz": null},
-                "valid": false
-            },
-            {
-                "description": "mismatch first allOf",
-                "data": {"bar": 2, "baz": null},
-                "valid": false
-            },
-            {
-                "description": "mismatch second allOf",
-                "data": {"foo": "quux", "bar": 2},
-                "valid": false
-            },
-            {
-                "description": "mismatch both",
-                "data": {"bar": 2},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "allOf simple types",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "allOf": [
-                {"maximum": 30},
-                {"minimum": 20}
-            ]
-        },
-        "tests": [
-            {
-                "description": "valid",
-                "data": 25,
-                "valid": true
-            },
-            {
-                "description": "mismatch one",
-                "data": 35,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "allOf with boolean schemas, all true",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "allOf": [true, true]
-        },
-        "tests": [
-            {
-                "description": "any value is valid",
-                "data": "foo",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "allOf with boolean schemas, some false",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "allOf": [true, false]
-        },
-        "tests": [
-            {
-                "description": "any value is invalid",
-                "data": "foo",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "allOf with boolean schemas, all false",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "allOf": [false, false]
-        },
-        "tests": [
-            {
-                "description": "any value is invalid",
-                "data": "foo",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "allOf with one empty schema",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "allOf": [
-                {}
-            ]
-        },
-        "tests": [
-            {
-                "description": "any data is valid",
-                "data": 1,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "allOf with two empty schemas",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "allOf": [
-                {},
-                {}
-            ]
-        },
-        "tests": [
-            {
-                "description": "any data is valid",
-                "data": 1,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "allOf with the first empty schema",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "allOf": [
-                {},
-                { "type": "number" }
-            ]
-        },
-        "tests": [
-            {
-                "description": "number is valid",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "string is invalid",
-                "data": "foo",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "allOf with the last empty schema",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "allOf": [
-                { "type": "number" },
-                {}
-            ]
-        },
-        "tests": [
-            {
-                "description": "number is valid",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "string is invalid",
-                "data": "foo",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "nested allOf, to check validation semantics",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "allOf": [
-                {
-                    "allOf": [
-                        {
-                            "type": "null"
-                        }
-                    ]
-                }
-            ]
-        },
-        "tests": [
-            {
-                "description": "null is valid",
-                "data": null,
-                "valid": true
-            },
-            {
-                "description": "anything non-null is invalid",
-                "data": 123,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "allOf combined with anyOf, oneOf",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "allOf": [ { "multipleOf": 2 } ],
-            "anyOf": [ { "multipleOf": 3 } ],
-            "oneOf": [ { "multipleOf": 5 } ]
-        },
-        "tests": [
-            {
-                "description": "allOf: false, anyOf: false, oneOf: false",
-                "data": 1,
-                "valid": false
-            },
-            {
-                "description": "allOf: false, anyOf: false, oneOf: true",
-                "data": 5,
-                "valid": false
-            },
-            {
-                "description": "allOf: false, anyOf: true, oneOf: false",
-                "data": 3,
-                "valid": false
-            },
-            {
-                "description": "allOf: false, anyOf: true, oneOf: true",
-                "data": 15,
-                "valid": false
-            },
-            {
-                "description": "allOf: true, anyOf: false, oneOf: false",
-                "data": 2,
-                "valid": false
-            },
-            {
-                "description": "allOf: true, anyOf: false, oneOf: true",
-                "data": 10,
-                "valid": false
-            },
-            {
-                "description": "allOf: true, anyOf: true, oneOf: false",
-                "data": 6,
-                "valid": false
-            },
-            {
-                "description": "allOf: true, anyOf: true, oneOf: true",
-                "data": 30,
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft2019-09/anchor.json b/json/tests/draft2019-09/anchor.json
deleted file mode 100644
index 5d8c86f..0000000
--- a/json/tests/draft2019-09/anchor.json
+++ /dev/null
@@ -1,235 +0,0 @@
-[
-    {
-        "description": "Location-independent identifier",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "$ref": "#foo",
-            "$defs": {
-                "A": {
-                    "$anchor": "foo",
-                    "type": "integer"
-                }
-            }
-        },
-        "tests": [
-            {
-                "data": 1,
-                "description": "match",
-                "valid": true
-            },
-            {
-                "data": "a",
-                "description": "mismatch",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "Location-independent identifier with absolute URI",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "$ref": "http://localhost:1234/draft2019-09/bar#foo",
-            "$defs": {
-                "A": {
-                    "$id": "http://localhost:1234/draft2019-09/bar",
-                    "$anchor": "foo",
-                    "type": "integer"
-                }
-            }
-        },
-        "tests": [
-            {
-                "data": 1,
-                "description": "match",
-                "valid": true
-            },
-            {
-                "data": "a",
-                "description": "mismatch",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "Location-independent identifier with base URI change in subschema",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "$id": "http://localhost:1234/draft2019-09/root",
-            "$ref": "http://localhost:1234/draft2019-09/nested.json#foo",
-            "$defs": {
-                "A": {
-                    "$id": "nested.json",
-                    "$defs": {
-                        "B": {
-                            "$anchor": "foo",
-                            "type": "integer"
-                        }
-                    }
-                }
-            }
-        },
-        "tests": [
-            {
-                "data": 1,
-                "description": "match",
-                "valid": true
-            },
-            {
-                "data": "a",
-                "description": "mismatch",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "$anchor inside an enum is not a real identifier",
-        "comment": "the implementation must not be confused by an $anchor buried in the enum",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "$defs": {
-                "anchor_in_enum": {
-                    "enum": [
-                        {
-                            "$anchor": "my_anchor",
-                            "type": "null"
-                        }
-                    ]
-                },
-                "real_identifier_in_schema": {
-                    "$anchor": "my_anchor",
-                    "type": "string"
-                },
-                "zzz_anchor_in_const": {
-                    "const": {
-                        "$anchor": "my_anchor",
-                        "type": "null"
-                    }
-                }
-            },
-            "anyOf": [
-                { "$ref": "#/$defs/anchor_in_enum" },
-                { "$ref": "#my_anchor" }
-            ]
-        },
-        "tests": [
-            {
-                "description": "exact match to enum, and type matches",
-                "data": {
-                    "$anchor": "my_anchor",
-                    "type": "null"
-                },
-                "valid": true
-            },
-            {
-                "description": "in implementations that strip $anchor, this may match either $def",
-                "data": {
-                    "type": "null"
-                },
-                "valid": false
-            },
-            {
-                "description": "match $ref to $anchor",
-                "data": "a string to match #/$defs/anchor_in_enum",
-                "valid": true
-            },
-            {
-                "description": "no match on enum or $ref to $anchor",
-                "data": 1,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "same $anchor with different base uri",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "$id": "http://localhost:1234/draft2019-09/foobar",
-            "$defs": {
-                "A": {
-                    "$id": "child1",
-                    "allOf": [
-                        {
-                            "$id": "child2",
-                            "$anchor": "my_anchor",
-                            "type": "number"
-                        },
-                        {
-                            "$anchor": "my_anchor",
-                            "type": "string"
-                        }
-                    ]
-                }
-            },
-            "$ref": "child1#my_anchor"
-        },
-        "tests": [
-            {
-                "description": "$ref resolves to /$defs/A/allOf/1",
-                "data": "a",
-                "valid": true
-            },
-            {
-                "description": "$ref does not resolve to /$defs/A/allOf/0",
-                "data": 1,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "non-schema object containing an $anchor property",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "$defs": {
-                "const_not_anchor": {
-                    "const": {
-                        "$anchor": "not_a_real_anchor"
-                    }
-                }
-            },
-            "if": {
-                "const": "skip not_a_real_anchor"
-            },
-            "then": true,
-            "else" : {
-                "$ref": "#/$defs/const_not_anchor"
-            }
-        },
-        "tests": [
-            {
-                "description": "skip traversing definition for a valid result",
-                "data": "skip not_a_real_anchor",
-                "valid": true
-            },
-            {
-                "description": "const at const_not_anchor does not match",
-                "data": 1,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "invalid anchors",
-        "comment": "Section 8.2.3",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "$ref": "https://json-schema.org/draft/2019-09/schema"
-        },
-        "tests": [
-            {
-                "description": "MUST start with a letter (and not #)",
-                "data": { "$anchor" : "#foo" },
-                "valid": false
-            },
-            {
-                "description": "JSON pointers are not valid",
-                "data": { "$anchor" : "/a/b" },
-                "valid": false
-            },
-            {
-                "description": "invalid with valid beginning",
-                "data": { "$anchor" : "foo#something" },
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft2019-09/anyOf.json b/json/tests/draft2019-09/anyOf.json
deleted file mode 100644
index 8712d11..0000000
--- a/json/tests/draft2019-09/anyOf.json
+++ /dev/null
@@ -1,203 +0,0 @@
-[
-    {
-        "description": "anyOf",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "anyOf": [
-                {
-                    "type": "integer"
-                },
-                {
-                    "minimum": 2
-                }
-            ]
-        },
-        "tests": [
-            {
-                "description": "first anyOf valid",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "second anyOf valid",
-                "data": 2.5,
-                "valid": true
-            },
-            {
-                "description": "both anyOf valid",
-                "data": 3,
-                "valid": true
-            },
-            {
-                "description": "neither anyOf valid",
-                "data": 1.5,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "anyOf with base schema",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "type": "string",
-            "anyOf" : [
-                {
-                    "maxLength": 2
-                },
-                {
-                    "minLength": 4
-                }
-            ]
-        },
-        "tests": [
-            {
-                "description": "mismatch base schema",
-                "data": 3,
-                "valid": false
-            },
-            {
-                "description": "one anyOf valid",
-                "data": "foobar",
-                "valid": true
-            },
-            {
-                "description": "both anyOf invalid",
-                "data": "foo",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "anyOf with boolean schemas, all true",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "anyOf": [true, true]
-        },
-        "tests": [
-            {
-                "description": "any value is valid",
-                "data": "foo",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "anyOf with boolean schemas, some true",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "anyOf": [true, false]
-        },
-        "tests": [
-            {
-                "description": "any value is valid",
-                "data": "foo",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "anyOf with boolean schemas, all false",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "anyOf": [false, false]
-        },
-        "tests": [
-            {
-                "description": "any value is invalid",
-                "data": "foo",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "anyOf complex types",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "anyOf": [
-                {
-                    "properties": {
-                        "bar": {"type": "integer"}
-                    },
-                    "required": ["bar"]
-                },
-                {
-                    "properties": {
-                        "foo": {"type": "string"}
-                    },
-                    "required": ["foo"]
-                }
-            ]
-        },
-        "tests": [
-            {
-                "description": "first anyOf valid (complex)",
-                "data": {"bar": 2},
-                "valid": true
-            },
-            {
-                "description": "second anyOf valid (complex)",
-                "data": {"foo": "baz"},
-                "valid": true
-            },
-            {
-                "description": "both anyOf valid (complex)",
-                "data": {"foo": "baz", "bar": 2},
-                "valid": true
-            },
-            {
-                "description": "neither anyOf valid (complex)",
-                "data": {"foo": 2, "bar": "quux"},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "anyOf with one empty schema",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "anyOf": [
-                { "type": "number" },
-                {}
-            ]
-        },
-        "tests": [
-            {
-                "description": "string is valid",
-                "data": "foo",
-                "valid": true
-            },
-            {
-                "description": "number is valid",
-                "data": 123,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "nested anyOf, to check validation semantics",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "anyOf": [
-                {
-                    "anyOf": [
-                        {
-                            "type": "null"
-                        }
-                    ]
-                }
-            ]
-        },
-        "tests": [
-            {
-                "description": "null is valid",
-                "data": null,
-                "valid": true
-            },
-            {
-                "description": "anything non-null is invalid",
-                "data": 123,
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft2019-09/boolean_schema.json b/json/tests/draft2019-09/boolean_schema.json
deleted file mode 100644
index 6d40f23..0000000
--- a/json/tests/draft2019-09/boolean_schema.json
+++ /dev/null
@@ -1,104 +0,0 @@
-[
-    {
-        "description": "boolean schema 'true'",
-        "schema": true,
-        "tests": [
-            {
-                "description": "number is valid",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "string is valid",
-                "data": "foo",
-                "valid": true
-            },
-            {
-                "description": "boolean true is valid",
-                "data": true,
-                "valid": true
-            },
-            {
-                "description": "boolean false is valid",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "null is valid",
-                "data": null,
-                "valid": true
-            },
-            {
-                "description": "object is valid",
-                "data": {"foo": "bar"},
-                "valid": true
-            },
-            {
-                "description": "empty object is valid",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "array is valid",
-                "data": ["foo"],
-                "valid": true
-            },
-            {
-                "description": "empty array is valid",
-                "data": [],
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "boolean schema 'false'",
-        "schema": false,
-        "tests": [
-            {
-                "description": "number is invalid",
-                "data": 1,
-                "valid": false
-            },
-            {
-                "description": "string is invalid",
-                "data": "foo",
-                "valid": false
-            },
-            {
-                "description": "boolean true is invalid",
-                "data": true,
-                "valid": false
-            },
-            {
-                "description": "boolean false is invalid",
-                "data": false,
-                "valid": false
-            },
-            {
-                "description": "null is invalid",
-                "data": null,
-                "valid": false
-            },
-            {
-                "description": "object is invalid",
-                "data": {"foo": "bar"},
-                "valid": false
-            },
-            {
-                "description": "empty object is invalid",
-                "data": {},
-                "valid": false
-            },
-            {
-                "description": "array is invalid",
-                "data": ["foo"],
-                "valid": false
-            },
-            {
-                "description": "empty array is invalid",
-                "data": [],
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft2019-09/const.json b/json/tests/draft2019-09/const.json
deleted file mode 100644
index 29700fd..0000000
--- a/json/tests/draft2019-09/const.json
+++ /dev/null
@@ -1,387 +0,0 @@
-[
-    {
-        "description": "const validation",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "const": 2
-        },
-        "tests": [
-            {
-                "description": "same value is valid",
-                "data": 2,
-                "valid": true
-            },
-            {
-                "description": "another value is invalid",
-                "data": 5,
-                "valid": false
-            },
-            {
-                "description": "another type is invalid",
-                "data": "a",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "const with object",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "const": {"foo": "bar", "baz": "bax"}
-        },
-        "tests": [
-            {
-                "description": "same object is valid",
-                "data": {"foo": "bar", "baz": "bax"},
-                "valid": true
-            },
-            {
-                "description": "same object with different property order is valid",
-                "data": {"baz": "bax", "foo": "bar"},
-                "valid": true
-            },
-            {
-                "description": "another object is invalid",
-                "data": {"foo": "bar"},
-                "valid": false
-            },
-            {
-                "description": "another type is invalid",
-                "data": [1, 2],
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "const with array",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "const": [{ "foo": "bar" }]
-        },
-        "tests": [
-            {
-                "description": "same array is valid",
-                "data": [{"foo": "bar"}],
-                "valid": true
-            },
-            {
-                "description": "another array item is invalid",
-                "data": [2],
-                "valid": false
-            },
-            {
-                "description": "array with additional items is invalid",
-                "data": [1, 2, 3],
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "const with null",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "const": null
-        },
-        "tests": [
-            {
-                "description": "null is valid",
-                "data": null,
-                "valid": true
-            },
-            {
-                "description": "not null is invalid",
-                "data": 0,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "const with false does not match 0",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "const": false
-        },
-        "tests": [
-            {
-                "description": "false is valid",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "integer zero is invalid",
-                "data": 0,
-                "valid": false
-            },
-            {
-                "description": "float zero is invalid",
-                "data": 0.0,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "const with true does not match 1",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "const": true
-        },
-        "tests": [
-            {
-                "description": "true is valid",
-                "data": true,
-                "valid": true
-            },
-            {
-                "description": "integer one is invalid",
-                "data": 1,
-                "valid": false
-            },
-            {
-                "description": "float one is invalid",
-                "data": 1.0,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "const with [false] does not match [0]",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "const": [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": "const with [true] does not match [1]",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "const": [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": "const with {\"a\": false} does not match {\"a\": 0}",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "const": {"a": false}
-        },
-        "tests": [
-            {
-                "description": "{\"a\": false} is valid",
-                "data": {"a": false},
-                "valid": true
-            },
-            {
-                "description": "{\"a\": 0} is invalid",
-                "data": {"a": 0},
-                "valid": false
-            },
-            {
-                "description": "{\"a\": 0.0} is invalid",
-                "data": {"a": 0.0},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "const with {\"a\": true} does not match {\"a\": 1}",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "const": {"a": true}
-        },
-        "tests": [
-            {
-                "description": "{\"a\": true} is valid",
-                "data": {"a": true},
-                "valid": true
-            },
-            {
-                "description": "{\"a\": 1} is invalid",
-                "data": {"a": 1},
-                "valid": false
-            },
-            {
-                "description": "{\"a\": 1.0} is invalid",
-                "data": {"a": 1.0},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "const with 0 does not match other zero-like types",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "const": 0
-        },
-        "tests": [
-            {
-                "description": "false is invalid",
-                "data": false,
-                "valid": false
-            },
-            {
-                "description": "integer zero is valid",
-                "data": 0,
-                "valid": true
-            },
-            {
-                "description": "float zero is valid",
-                "data": 0.0,
-                "valid": true
-            },
-            {
-                "description": "empty object is invalid",
-                "data": {},
-                "valid": false
-            },
-            {
-                "description": "empty array is invalid",
-                "data": [],
-                "valid": false
-            },
-            {
-                "description": "empty string is invalid",
-                "data": "",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "const with 1 does not match true",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "const": 1
-        },
-        "tests": [
-            {
-                "description": "true is invalid",
-                "data": true,
-                "valid": false
-            },
-            {
-                "description": "integer one is valid",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "float one is valid",
-                "data": 1.0,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "const with -2.0 matches integer and float types",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "const": -2.0
-        },
-        "tests": [
-            {
-                "description": "integer -2 is valid",
-                "data": -2,
-                "valid": true
-            },
-            {
-                "description": "integer 2 is invalid",
-                "data": 2,
-                "valid": false
-            },
-            {
-                "description": "float -2.0 is valid",
-                "data": -2.0,
-                "valid": true
-            },
-            {
-                "description": "float 2.0 is invalid",
-                "data": 2.0,
-                "valid": false
-            },
-            {
-                "description": "float -2.00001 is invalid",
-                "data": -2.00001,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "float and integers are equal up to 64-bit representation limits",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "const": 9007199254740992
-        },
-        "tests": [
-            {
-                "description": "integer is valid",
-                "data": 9007199254740992,
-                "valid": true
-            },
-            {
-                "description": "integer minus one is invalid",
-                "data": 9007199254740991,
-                "valid": false
-            },
-            {
-                "description": "float is valid",
-                "data": 9007199254740992.0,
-                "valid": true
-            },
-            {
-                "description": "float minus one is invalid",
-                "data": 9007199254740991.0,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "nul characters in strings",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "const": "hello\u0000there"
-        },
-        "tests": [
-            {
-                "description": "match string with nul",
-                "data": "hello\u0000there",
-                "valid": true
-            },
-            {
-                "description": "do not match string lacking nul",
-                "data": "hellothere",
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft2019-09/contains.json b/json/tests/draft2019-09/contains.json
deleted file mode 100644
index 30458bf..0000000
--- a/json/tests/draft2019-09/contains.json
+++ /dev/null
@@ -1,176 +0,0 @@
-[
-    {
-        "description": "contains keyword validation",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "contains": {"minimum": 5}
-        },
-        "tests": [
-            {
-                "description": "array with item matching schema (5) is valid",
-                "data": [3, 4, 5],
-                "valid": true
-            },
-            {
-                "description": "array with item matching schema (6) is valid",
-                "data": [3, 4, 6],
-                "valid": true
-            },
-            {
-                "description": "array with two items matching schema (5, 6) is valid",
-                "data": [3, 4, 5, 6],
-                "valid": true
-            },
-            {
-                "description": "array without items matching schema is invalid",
-                "data": [2, 3, 4],
-                "valid": false
-            },
-            {
-                "description": "empty array is invalid",
-                "data": [],
-                "valid": false
-            },
-            {
-                "description": "not array is valid",
-                "data": {},
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "contains keyword with const keyword",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "contains": { "const": 5 }
-        },
-        "tests": [
-            {
-                "description": "array with item 5 is valid",
-                "data": [3, 4, 5],
-                "valid": true
-            },
-            {
-                "description": "array with two items 5 is valid",
-                "data": [3, 4, 5, 5],
-                "valid": true
-            },
-            {
-                "description": "array without item 5 is invalid",
-                "data": [1, 2, 3, 4],
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "contains keyword with boolean schema true",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "contains": true
-        },
-        "tests": [
-            {
-                "description": "any non-empty array is valid",
-                "data": ["foo"],
-                "valid": true
-            },
-            {
-                "description": "empty array is invalid",
-                "data": [],
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "contains keyword with boolean schema false",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "contains": false
-        },
-        "tests": [
-            {
-                "description": "any non-empty array is invalid",
-                "data": ["foo"],
-                "valid": false
-            },
-            {
-                "description": "empty array is invalid",
-                "data": [],
-                "valid": false
-            },
-            {
-                "description": "non-arrays are valid",
-                "data": "contains does not apply to strings",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "items + contains",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "items": { "multipleOf": 2 },
-            "contains": { "multipleOf": 3 }
-        },
-        "tests": [
-            {
-                "description": "matches items, does not match contains",
-                "data": [ 2, 4, 8 ],
-                "valid": false
-            },
-            {
-                "description": "does not match items, matches contains",
-                "data": [ 3, 6, 9 ],
-                "valid": false
-            },
-            {
-                "description": "matches both items and contains",
-                "data": [ 6, 12 ],
-                "valid": true
-            },
-            {
-                "description": "matches neither items nor contains",
-                "data": [ 1, 5 ],
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "contains with false if subschema",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "contains": {
-                "if": false,
-                "else": true
-            }
-        },
-        "tests": [
-            {
-                "description": "any non-empty array is valid",
-                "data": ["foo"],
-                "valid": true
-            },
-            {
-                "description": "empty array is invalid",
-                "data": [],
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "contains with null instance elements",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "contains": {
-                "type": "null"
-            }
-        },
-        "tests": [
-            {
-                "description": "allows null items",
-                "data": [ null ],
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft2019-09/content.json b/json/tests/draft2019-09/content.json
deleted file mode 100644
index 2a7a5d8..0000000
--- a/json/tests/draft2019-09/content.json
+++ /dev/null
@@ -1,131 +0,0 @@
-[
-    {
-        "description": "validation of string-encoded content based on media type",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "contentMediaType": "application/json"
-        },
-        "tests": [
-            {
-                "description": "a valid JSON document",
-                "data": "{\"foo\": \"bar\"}",
-                "valid": true
-            },
-            {
-                "description": "an invalid JSON document; validates true",
-                "data": "{:}",
-                "valid": true
-            },
-            {
-                "description": "ignores non-strings",
-                "data": 100,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "validation of binary string-encoding",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "contentEncoding": "base64"
-        },
-        "tests": [
-            {
-                "description": "a valid base64 string",
-                "data": "eyJmb28iOiAiYmFyIn0K",
-                "valid": true
-            },
-            {
-                "description": "an invalid base64 string (% is not a valid character); validates true",
-                "data": "eyJmb28iOi%iYmFyIn0K",
-                "valid": true
-            },
-            {
-                "description": "ignores non-strings",
-                "data": 100,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "validation of binary-encoded media type documents",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "contentMediaType": "application/json",
-            "contentEncoding": "base64"
-        },
-        "tests": [
-            {
-                "description": "a valid base64-encoded JSON document",
-                "data": "eyJmb28iOiAiYmFyIn0K",
-                "valid": true
-            },
-            {
-                "description": "a validly-encoded invalid JSON document; validates true",
-                "data": "ezp9Cg==",
-                "valid": true
-            },
-            {
-                "description": "an invalid base64 string that is valid JSON; validates true",
-                "data": "{}",
-                "valid": true
-            },
-            {
-                "description": "ignores non-strings",
-                "data": 100,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "validation of binary-encoded media type documents with schema",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "contentMediaType": "application/json",
-            "contentEncoding": "base64",
-            "contentSchema": { "type": "object", "required": ["foo"], "properties": { "foo": { "type": "string" } } }
-        },
-        "tests": [
-            {
-                "description": "a valid base64-encoded JSON document",
-                "data": "eyJmb28iOiAiYmFyIn0K",
-                "valid": true
-            },
-            {
-                "description": "another valid base64-encoded JSON document",
-                "data": "eyJib28iOiAyMCwgImZvbyI6ICJiYXoifQ==",
-                "valid": true
-            },
-            {
-                "description": "an invalid base64-encoded JSON document; validates true",
-                "data": "eyJib28iOiAyMH0=",
-                "valid": true
-            },
-            {
-                "description": "an empty object as a base64-encoded JSON document; validates true",
-                "data": "e30=",
-                "valid": true
-            },
-            {
-                "description": "an empty array as a base64-encoded JSON document",
-                "data": "W10=",
-                "valid": true
-            },
-            {
-                "description": "a validly-encoded invalid JSON document; validates true",
-                "data": "ezp9Cg==",
-                "valid": true
-            },
-            {
-                "description": "an invalid base64 string that is valid JSON; validates true",
-                "data": "{}",
-                "valid": true
-            },
-            {
-                "description": "ignores non-strings",
-                "data": 100,
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft2019-09/default.json b/json/tests/draft2019-09/default.json
deleted file mode 100644
index 95eba5a..0000000
--- a/json/tests/draft2019-09/default.json
+++ /dev/null
@@ -1,82 +0,0 @@
-[
-    {
-        "description": "invalid type for default",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "properties": {
-                "foo": {
-                    "type": "integer",
-                    "default": []
-                }
-            }
-        },
-        "tests": [
-            {
-                "description": "valid when property is specified",
-                "data": {"foo": 13},
-                "valid": true
-            },
-            {
-                "description": "still valid when the invalid default is used",
-                "data": {},
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "invalid string value for default",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "properties": {
-                "bar": {
-                    "type": "string",
-                    "minLength": 4,
-                    "default": "bad"
-                }
-            }
-        },
-        "tests": [
-            {
-                "description": "valid when property is specified",
-                "data": {"bar": "good"},
-                "valid": true
-            },
-            {
-                "description": "still valid when the invalid default is used",
-                "data": {},
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "the default keyword does not do anything if the property is missing",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "type": "object",
-            "properties": {
-                "alpha": {
-                    "type": "number",
-                    "maximum": 3,
-                    "default": 5
-                }
-            }
-        },
-        "tests": [
-            {
-                "description": "an explicit property value is checked against maximum (passing)",
-                "data": { "alpha": 1 },
-                "valid": true
-            },
-            {
-                "description": "an explicit property value is checked against maximum (failing)",
-                "data": { "alpha": 5 },
-                "valid": false
-            },
-            {
-                "description": "missing properties are not filled in with the default",
-                "data": {},
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft2019-09/defs.json b/json/tests/draft2019-09/defs.json
deleted file mode 100644
index 3f9088c..0000000
--- a/json/tests/draft2019-09/defs.json
+++ /dev/null
@@ -1,21 +0,0 @@
-[
-    {
-        "description": "validate definition against metaschema",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "$ref": "https://json-schema.org/draft/2019-09/schema"
-        },
-        "tests": [
-            {
-                "description": "valid definition schema",
-                "data": {"$defs": {"foo": {"type": "integer"}}},
-                "valid": true
-            },
-            {
-                "description": "invalid definition schema",
-                "data": {"$defs": {"foo": {"type": 1}}},
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft2019-09/dependentRequired.json b/json/tests/draft2019-09/dependentRequired.json
deleted file mode 100644
index d573c10..0000000
--- a/json/tests/draft2019-09/dependentRequired.json
+++ /dev/null
@@ -1,152 +0,0 @@
-[
-    {
-        "description": "single dependency",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "dependentRequired": {"bar": ["foo"]}
-        },
-        "tests": [
-            {
-                "description": "neither",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "nondependant",
-                "data": {"foo": 1},
-                "valid": true
-            },
-            {
-                "description": "with dependency",
-                "data": {"foo": 1, "bar": 2},
-                "valid": true
-            },
-            {
-                "description": "missing dependency",
-                "data": {"bar": 2},
-                "valid": false
-            },
-            {
-                "description": "ignores arrays",
-                "data": ["bar"],
-                "valid": true
-            },
-            {
-                "description": "ignores strings",
-                "data": "foobar",
-                "valid": true
-            },
-            {
-                "description": "ignores other non-objects",
-                "data": 12,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "empty dependents",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "dependentRequired": {"bar": []}
-        },
-        "tests": [
-            {
-                "description": "empty object",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "object with one property",
-                "data": {"bar": 2},
-                "valid": true
-            },
-            {
-                "description": "non-object is valid",
-                "data": 1,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "multiple dependents required",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "dependentRequired": {"quux": ["foo", "bar"]}
-        },
-        "tests": [
-            {
-                "description": "neither",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "nondependants",
-                "data": {"foo": 1, "bar": 2},
-                "valid": true
-            },
-            {
-                "description": "with dependencies",
-                "data": {"foo": 1, "bar": 2, "quux": 3},
-                "valid": true
-            },
-            {
-                "description": "missing dependency",
-                "data": {"foo": 1, "quux": 2},
-                "valid": false
-            },
-            {
-                "description": "missing other dependency",
-                "data": {"bar": 1, "quux": 2},
-                "valid": false
-            },
-            {
-                "description": "missing both dependencies",
-                "data": {"quux": 1},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "dependencies with escaped characters",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "dependentRequired": {
-                "foo\nbar": ["foo\rbar"],
-                "foo\"bar": ["foo'bar"]
-            }
-        },
-        "tests": [
-            {
-                "description": "CRLF",
-                "data": {
-                    "foo\nbar": 1,
-                    "foo\rbar": 2
-                },
-                "valid": true
-            },
-            {
-                "description": "quoted quotes",
-                "data": {
-                    "foo'bar": 1,
-                    "foo\"bar": 2
-                },
-                "valid": true
-            },
-            {
-                "description": "CRLF missing dependent",
-                "data": {
-                    "foo\nbar": 1,
-                    "foo": 2
-                },
-                "valid": false
-            },
-            {
-                "description": "quoted quotes missing dependent",
-                "data": {
-                    "foo\"bar": 2
-                },
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft2019-09/dependentSchemas.json b/json/tests/draft2019-09/dependentSchemas.json
deleted file mode 100644
index b397583..0000000
--- a/json/tests/draft2019-09/dependentSchemas.json
+++ /dev/null
@@ -1,132 +0,0 @@
-[
-    {
-        "description": "single dependency",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "dependentSchemas": {
-                "bar": {
-                    "properties": {
-                        "foo": {"type": "integer"},
-                        "bar": {"type": "integer"}
-                    }
-                }
-            }
-        },
-        "tests": [
-            {
-                "description": "valid",
-                "data": {"foo": 1, "bar": 2},
-                "valid": true
-            },
-            {
-                "description": "no dependency",
-                "data": {"foo": "quux"},
-                "valid": true
-            },
-            {
-                "description": "wrong type",
-                "data": {"foo": "quux", "bar": 2},
-                "valid": false
-            },
-            {
-                "description": "wrong type other",
-                "data": {"foo": 2, "bar": "quux"},
-                "valid": false
-            },
-            {
-                "description": "wrong type both",
-                "data": {"foo": "quux", "bar": "quux"},
-                "valid": false
-            },
-            {
-                "description": "ignores arrays",
-                "data": ["bar"],
-                "valid": true
-            },
-            {
-                "description": "ignores strings",
-                "data": "foobar",
-                "valid": true
-            },
-            {
-                "description": "ignores other non-objects",
-                "data": 12,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "boolean subschemas",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "dependentSchemas": {
-                "foo": true,
-                "bar": false
-            }
-        },
-        "tests": [
-            {
-                "description": "object with property having schema true is valid",
-                "data": {"foo": 1},
-                "valid": true
-            },
-            {
-                "description": "object with property having schema false is invalid",
-                "data": {"bar": 2},
-                "valid": false
-            },
-            {
-                "description": "object with both properties is invalid",
-                "data": {"foo": 1, "bar": 2},
-                "valid": false
-            },
-            {
-                "description": "empty object is valid",
-                "data": {},
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "dependencies with escaped characters",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "dependentSchemas": {
-                "foo\tbar": {"minProperties": 4},
-                "foo'bar": {"required": ["foo\"bar"]}
-            }
-        },
-        "tests": [
-            {
-                "description": "quoted tab",
-                "data": {
-                    "foo\tbar": 1,
-                    "a": 2,
-                    "b": 3,
-                    "c": 4
-                },
-                "valid": true
-            },
-            {
-                "description": "quoted quote",
-                "data": {
-                    "foo'bar": {"foo\"bar": 1}
-                },
-                "valid": false
-            },
-            {
-                "description": "quoted tab invalid under dependent schema",
-                "data": {
-                    "foo\tbar": 1,
-                    "a": 2
-                },
-                "valid": false
-            },
-            {
-                "description": "quoted quote invalid under dependent schema",
-                "data": {"foo'bar": 1},
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft2019-09/enum.json b/json/tests/draft2019-09/enum.json
deleted file mode 100644
index f9a44a6..0000000
--- a/json/tests/draft2019-09/enum.json
+++ /dev/null
@@ -1,262 +0,0 @@
-[
-    {
-        "description": "simple enum validation",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "enum": [1, 2, 3]
-        },
-        "tests": [
-            {
-                "description": "one of the enum is valid",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "something else is invalid",
-                "data": 4,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "heterogeneous enum validation",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "enum": [6, "foo", [], true, {"foo": 12}]
-        },
-        "tests": [
-            {
-                "description": "one of the enum is valid",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "something else is invalid",
-                "data": null,
-                "valid": false
-            },
-            {
-                "description": "objects are deep compared",
-                "data": {"foo": false},
-                "valid": false
-            },
-            {
-                "description": "valid object matches",
-                "data": {"foo": 12},
-                "valid": true
-            },
-            {
-                "description": "extra properties in object is invalid",
-                "data": {"foo": 12, "boo": 42},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "heterogeneous enum-with-null validation",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "enum": [6, null]
-        },
-        "tests": [
-            {
-                "description": "null is valid",
-                "data": null,
-                "valid": true
-            },
-            {
-                "description": "number is valid",
-                "data": 6,
-                "valid": true
-            },
-            {
-                "description": "something else is invalid",
-                "data": "test",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "enums in properties",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "type":"object",
-            "properties": {
-                "foo": {"enum":["foo"]},
-                "bar": {"enum":["bar"]}
-            },
-            "required": ["bar"]
-        },
-        "tests": [
-            {
-                "description": "both properties are valid",
-                "data": {"foo":"foo", "bar":"bar"},
-                "valid": true
-            },
-            {
-                "description": "wrong foo value",
-                "data": {"foo":"foot", "bar":"bar"},
-                "valid": false
-            },
-            {
-                "description": "wrong bar value",
-                "data": {"foo":"foo", "bar":"bart"},
-                "valid": false
-            },
-            {
-                "description": "missing optional property is valid",
-                "data": {"bar":"bar"},
-                "valid": true
-            },
-            {
-                "description": "missing required property is invalid",
-                "data": {"foo":"foo"},
-                "valid": false
-            },
-            {
-                "description": "missing all properties is invalid",
-                "data": {},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "enum with escaped characters",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "enum": ["foo\nbar", "foo\rbar"]
-        },
-        "tests": [
-            {
-                "description": "member 1 is valid",
-                "data": "foo\nbar",
-                "valid": true
-            },
-            {
-                "description": "member 2 is valid",
-                "data": "foo\rbar",
-                "valid": true
-            },
-            {
-                "description": "another string is invalid",
-                "data": "abc",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "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": "integer zero is invalid",
-                "data": 0,
-                "valid": false
-            },
-            {
-                "description": "float zero is invalid",
-                "data": 0.0,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "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": "integer one is invalid",
-                "data": 1,
-                "valid": false
-            },
-            {
-                "description": "float one is invalid",
-                "data": 1.0,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "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": "integer zero is valid",
-                "data": 0,
-                "valid": true
-            },
-            {
-                "description": "float zero is valid",
-                "data": 0.0,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "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": "integer one is valid",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "float one is valid",
-                "data": 1.0,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "nul characters in strings",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "enum": [ "hello\u0000there" ]
-        },
-        "tests": [
-            {
-                "description": "match string with nul",
-                "data": "hello\u0000there",
-                "valid": true
-            },
-            {
-                "description": "do not match string lacking nul",
-                "data": "hellothere",
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft2019-09/exclusiveMaximum.json b/json/tests/draft2019-09/exclusiveMaximum.json
deleted file mode 100644
index 4ec8569..0000000
--- a/json/tests/draft2019-09/exclusiveMaximum.json
+++ /dev/null
@@ -1,31 +0,0 @@
-[
-    {
-        "description": "exclusiveMaximum validation",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "exclusiveMaximum": 3.0
-        },
-        "tests": [
-            {
-                "description": "below the exclusiveMaximum is valid",
-                "data": 2.2,
-                "valid": true
-            },
-            {
-                "description": "boundary point is invalid",
-                "data": 3.0,
-                "valid": false
-            },
-            {
-                "description": "above the exclusiveMaximum is invalid",
-                "data": 3.5,
-                "valid": false
-            },
-            {
-                "description": "ignores non-numbers",
-                "data": "x",
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft2019-09/exclusiveMinimum.json b/json/tests/draft2019-09/exclusiveMinimum.json
deleted file mode 100644
index 24f4689..0000000
--- a/json/tests/draft2019-09/exclusiveMinimum.json
+++ /dev/null
@@ -1,31 +0,0 @@
-[
-    {
-        "description": "exclusiveMinimum validation",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "exclusiveMinimum": 1.1
-        },
-        "tests": [
-            {
-                "description": "above the exclusiveMinimum is valid",
-                "data": 1.2,
-                "valid": true
-            },
-            {
-                "description": "boundary point is invalid",
-                "data": 1.1,
-                "valid": false
-            },
-            {
-                "description": "below the exclusiveMinimum is invalid",
-                "data": 0.6,
-                "valid": false
-            },
-            {
-                "description": "ignores non-numbers",
-                "data": "x",
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft2019-09/format.json b/json/tests/draft2019-09/format.json
deleted file mode 100644
index 2934dce..0000000
--- a/json/tests/draft2019-09/format.json
+++ /dev/null
@@ -1,743 +0,0 @@
-[
-    {
-        "description": "email format",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "format": "email"
-        },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "idn-email format",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "format": "idn-email"
-        },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "regex format",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "format": "regex"
-        },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "ipv4 format",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "format": "ipv4"
-        },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "ipv6 format",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "format": "ipv6"
-        },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "idn-hostname format",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "format": "idn-hostname"
-        },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "hostname format",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "format": "hostname"
-        },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "date format",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "format": "date"
-        },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "date-time format",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "format": "date-time"
-        },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "time format",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "format": "time"
-        },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "json-pointer format",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "format": "json-pointer"
-        },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "relative-json-pointer format",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "format": "relative-json-pointer"
-        },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "iri format",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "format": "iri"
-        },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "iri-reference format",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "format": "iri-reference"
-        },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "uri format",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "format": "uri"
-        },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "uri-reference format",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "format": "uri-reference"
-        },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "uri-template format",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "format": "uri-template"
-        },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "uuid format",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "format": "uuid"
-        },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "duration format",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "format": "duration"
-        },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft2019-09/id.json b/json/tests/draft2019-09/id.json
deleted file mode 100644
index e2e403f..0000000
--- a/json/tests/draft2019-09/id.json
+++ /dev/null
@@ -1,294 +0,0 @@
-[
-    {
-        "description": "Invalid use of fragments in location-independent $id",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "$ref": "https://json-schema.org/draft/2019-09/schema"
-        },
-        "tests": [
-            {
-                "description": "Identifier name",
-                "data": {
-                    "$ref": "#foo",
-                    "$defs": {
-                        "A": {
-                            "$id": "#foo",
-                            "type": "integer"
-                        }
-                    }
-                },
-                "valid": false
-            },
-            {
-                "description": "Identifier name and no ref",
-                "data": {
-                    "$defs": {
-                        "A": { "$id": "#foo" }
-                    }
-                },
-                "valid": false
-            },
-            {
-                "description": "Identifier path",
-                "data": {
-                    "$ref": "#/a/b",
-                    "$defs": {
-                        "A": {
-                            "$id": "#/a/b",
-                            "type": "integer"
-                        }
-                    }
-                },
-                "valid": false
-            },
-            {
-                "description": "Identifier name with absolute URI",
-                "data": {
-                    "$ref": "http://localhost:1234/draft2019-09/bar#foo",
-                    "$defs": {
-                        "A": {
-                            "$id": "http://localhost:1234/draft2019-09/bar#foo",
-                            "type": "integer"
-                        }
-                    }
-                },
-                "valid": false
-            },
-            {
-                "description": "Identifier path with absolute URI",
-                "data": {
-                    "$ref": "http://localhost:1234/draft2019-09/bar#/a/b",
-                    "$defs": {
-                        "A": {
-                            "$id": "http://localhost:1234/draft2019-09/bar#/a/b",
-                            "type": "integer"
-                        }
-                    }
-                },
-                "valid": false
-            },
-            {
-                "description": "Identifier name with base URI change in subschema",
-                "data": {
-                    "$id": "http://localhost:1234/draft2019-09/root",
-                    "$ref": "http://localhost:1234/draft2019-09/nested.json#foo",
-                    "$defs": {
-                        "A": {
-                            "$id": "nested.json",
-                            "$defs": {
-                                "B": {
-                                    "$id": "#foo",
-                                    "type": "integer"
-                                }
-                            }
-                        }
-                    }
-                },
-                "valid": false
-            },
-            {
-                "description": "Identifier path with base URI change in subschema",
-                "data": {
-                    "$id": "http://localhost:1234/draft2019-09/root",
-                    "$ref": "http://localhost:1234/draft2019-09/nested.json#/a/b",
-                    "$defs": {
-                        "A": {
-                            "$id": "nested.json",
-                            "$defs": {
-                                "B": {
-                                    "$id": "#/a/b",
-                                    "type": "integer"
-                                }
-                            }
-                        }
-                    }
-                },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "Valid use of empty fragments in location-independent $id",
-        "comment": "These are allowed but discouraged",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "$ref": "https://json-schema.org/draft/2019-09/schema"
-        },
-        "tests": [
-            {
-                "description": "Identifier name with absolute URI",
-                "data": {
-                    "$ref": "http://localhost:1234/draft2019-09/bar",
-                    "$defs": {
-                        "A": {
-                            "$id": "http://localhost:1234/draft2019-09/bar#",
-                            "type": "integer"
-                        }
-                    }
-                },
-                "valid": true
-            },
-            {
-                "description": "Identifier name with base URI change in subschema",
-                "data": {
-                    "$id": "http://localhost:1234/draft2019-09/root",
-                    "$ref": "http://localhost:1234/draft2019-09/nested.json#/$defs/B",
-                    "$defs": {
-                        "A": {
-                            "$id": "nested.json",
-                            "$defs": {
-                                "B": {
-                                    "$id": "#",
-                                    "type": "integer"
-                                }
-                            }
-                        }
-                    }
-                },
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "Unnormalized $ids are allowed but discouraged",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "$ref": "https://json-schema.org/draft/2019-09/schema"
-        },
-        "tests": [
-            {
-                "description": "Unnormalized identifier",
-                "data": {
-                    "$ref": "http://localhost:1234/draft2019-09/foo/baz",
-                    "$defs": {
-                        "A": {
-                            "$id": "http://localhost:1234/draft2019-09/foo/bar/../baz",
-                            "type": "integer"
-                        }
-                    }
-                },
-                "valid": true
-            },
-            {
-                "description": "Unnormalized identifier and no ref",
-                "data": {
-                    "$defs": {
-                        "A": {
-                            "$id": "http://localhost:1234/draft2019-09/foo/bar/../baz",
-                            "type": "integer"
-                        }
-                    }
-                },
-                "valid": true
-            },
-            {
-                "description": "Unnormalized identifier with empty fragment",
-                "data": {
-                    "$ref": "http://localhost:1234/draft2019-09/foo/baz",
-                    "$defs": {
-                        "A": {
-                            "$id": "http://localhost:1234/draft2019-09/foo/bar/../baz#",
-                            "type": "integer"
-                        }
-                    }
-                },
-                "valid": true
-            },
-            {
-                "description": "Unnormalized identifier with empty fragment and no ref",
-                "data": {
-                    "$defs": {
-                        "A": {
-                            "$id": "http://localhost:1234/draft2019-09/foo/bar/../baz#",
-                            "type": "integer"
-                        }
-                    }
-                },
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "$id inside an enum is not a real identifier",
-        "comment": "the implementation must not be confused by an $id buried in the enum",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "$defs": {
-                "id_in_enum": {
-                    "enum": [
-                        {
-                          "$id": "https://localhost:1234/draft2019-09/id/my_identifier.json",
-                          "type": "null"
-                        }
-                    ]
-                },
-                "real_id_in_schema": {
-                    "$id": "https://localhost:1234/draft2019-09/id/my_identifier.json",
-                    "type": "string"
-                },
-                "zzz_id_in_const": {
-                    "const": {
-                        "$id": "https://localhost:1234/draft2019-09/id/my_identifier.json",
-                        "type": "null"
-                    }
-                }
-            },
-            "anyOf": [
-                { "$ref": "#/$defs/id_in_enum" },
-                { "$ref": "https://localhost:1234/draft2019-09/id/my_identifier.json" }
-            ]
-        },
-        "tests": [
-            {
-                "description": "exact match to enum, and type matches",
-                "data": {
-                    "$id": "https://localhost:1234/draft2019-09/id/my_identifier.json",
-                    "type": "null"
-                },
-                "valid": true
-            },
-            {
-                "description": "match $ref to $id",
-                "data": "a string to match #/$defs/id_in_enum",
-                "valid": true
-            },
-            {
-                "description": "no match on enum or $ref to $id",
-                "data": 1,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "non-schema object containing an $id property",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "$defs": {
-                "const_not_id": {
-                    "const": {
-                        "$id": "not_a_real_id"
-                    }
-                }
-            },
-            "if": {
-                "const": "skip not_a_real_id"
-            },
-            "then": true,
-            "else" : {
-                "$ref": "#/$defs/const_not_id"
-            }
-        },
-        "tests": [
-            {
-                "description": "skip traversing definition for a valid result",
-                "data": "skip not_a_real_id",
-                "valid": true
-            },
-            {
-                "description": "const at const_not_id does not match",
-                "data": 1,
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft2019-09/if-then-else.json b/json/tests/draft2019-09/if-then-else.json
deleted file mode 100644
index 510a0e0..0000000
--- a/json/tests/draft2019-09/if-then-else.json
+++ /dev/null
@@ -1,268 +0,0 @@
-[
-    {
-        "description": "ignore if without then or else",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "if": {
-                "const": 0
-            }
-        },
-        "tests": [
-            {
-                "description": "valid when valid against lone if",
-                "data": 0,
-                "valid": true
-            },
-            {
-                "description": "valid when invalid against lone if",
-                "data": "hello",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "ignore then without if",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "then": {
-                "const": 0
-            }
-        },
-        "tests": [
-            {
-                "description": "valid when valid against lone then",
-                "data": 0,
-                "valid": true
-            },
-            {
-                "description": "valid when invalid against lone then",
-                "data": "hello",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "ignore else without if",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "else": {
-                "const": 0
-            }
-        },
-        "tests": [
-            {
-                "description": "valid when valid against lone else",
-                "data": 0,
-                "valid": true
-            },
-            {
-                "description": "valid when invalid against lone else",
-                "data": "hello",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "if and then without else",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "if": {
-                "exclusiveMaximum": 0
-            },
-            "then": {
-                "minimum": -10
-            }
-        },
-        "tests": [
-            {
-                "description": "valid through then",
-                "data": -1,
-                "valid": true
-            },
-            {
-                "description": "invalid through then",
-                "data": -100,
-                "valid": false
-            },
-            {
-                "description": "valid when if test fails",
-                "data": 3,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "if and else without then",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "if": {
-                "exclusiveMaximum": 0
-            },
-            "else": {
-                "multipleOf": 2
-            }
-        },
-        "tests": [
-            {
-                "description": "valid when if test passes",
-                "data": -1,
-                "valid": true
-            },
-            {
-                "description": "valid through else",
-                "data": 4,
-                "valid": true
-            },
-            {
-                "description": "invalid through else",
-                "data": 3,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "validate against correct branch, then vs else",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "if": {
-                "exclusiveMaximum": 0
-            },
-            "then": {
-                "minimum": -10
-            },
-            "else": {
-                "multipleOf": 2
-            }
-        },
-        "tests": [
-            {
-                "description": "valid through then",
-                "data": -1,
-                "valid": true
-            },
-            {
-                "description": "invalid through then",
-                "data": -100,
-                "valid": false
-            },
-            {
-                "description": "valid through else",
-                "data": 4,
-                "valid": true
-            },
-            {
-                "description": "invalid through else",
-                "data": 3,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "non-interference across combined schemas",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "allOf": [
-                {
-                    "if": {
-                        "exclusiveMaximum": 0
-                    }
-                },
-                {
-                    "then": {
-                        "minimum": -10
-                    }
-                },
-                {
-                    "else": {
-                        "multipleOf": 2
-                    }
-                }
-            ]
-        },
-        "tests": [
-            {
-                "description": "valid, but would have been invalid through then",
-                "data": -100,
-                "valid": true
-            },
-            {
-                "description": "valid, but would have been invalid through else",
-                "data": 3,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "if with boolean schema true",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "if": true,
-            "then": { "const": "then" },
-            "else": { "const": "else" }
-        },
-        "tests": [
-            {
-                "description": "boolean schema true in if always chooses the then path (valid)",
-                "data": "then",
-                "valid": true
-            },
-            {
-                "description": "boolean schema true in if always chooses the then path (invalid)",
-                "data": "else",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "if with boolean schema false",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "if": false,
-            "then": { "const": "then" },
-            "else": { "const": "else" }
-        },
-        "tests": [
-            {
-                "description": "boolean schema false in if always chooses the else path (invalid)",
-                "data": "then",
-                "valid": false
-            },
-            {
-                "description": "boolean schema false in if always chooses the else path (valid)",
-                "data": "else",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "if appears at the end when serialized (keyword processing sequence)",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "then": { "const": "yes" },
-            "else": { "const": "other" },
-            "if": { "maxLength": 4 }
-        },
-        "tests": [
-            {
-                "description": "yes redirects to then and passes",
-                "data": "yes",
-                "valid": true
-            },
-            {
-                "description": "other redirects to else and passes",
-                "data": "other",
-                "valid": true
-            },
-            {
-                "description": "no redirects to then and fails",
-                "data": "no",
-                "valid": false
-            },
-            {
-                "description": "invalid redirects to else and fails",
-                "data": "invalid",
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft2019-09/infinite-loop-detection.json b/json/tests/draft2019-09/infinite-loop-detection.json
deleted file mode 100644
index eb69414..0000000
--- a/json/tests/draft2019-09/infinite-loop-detection.json
+++ /dev/null
@@ -1,37 +0,0 @@
-[
-    {
-        "description": "evaluating the same schema location against the same data location twice is not a sign of an infinite loop",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "$defs": {
-                "int": { "type": "integer" }
-            },
-            "allOf": [
-                {
-                    "properties": {
-                        "foo": {
-                            "$ref": "#/$defs/int"
-                        }
-                    }
-                },
-                {
-                    "additionalProperties": {
-                        "$ref": "#/$defs/int"
-                    }
-                }
-            ]
-        },
-        "tests": [
-            {
-                "description": "passing case",
-                "data": { "foo": 1 },
-                "valid": true
-            },
-            {
-                "description": "failing case",
-                "data": { "foo": "a string" },
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft2019-09/items.json b/json/tests/draft2019-09/items.json
deleted file mode 100644
index e24156a..0000000
--- a/json/tests/draft2019-09/items.json
+++ /dev/null
@@ -1,295 +0,0 @@
-[
-    {
-        "description": "a schema given for items",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "items": {"type": "integer"}
-        },
-        "tests": [
-            {
-                "description": "valid items",
-                "data": [ 1, 2, 3 ],
-                "valid": true
-            },
-            {
-                "description": "wrong type of items",
-                "data": [1, "x"],
-                "valid": false
-            },
-            {
-                "description": "ignores non-arrays",
-                "data": {"foo" : "bar"},
-                "valid": true
-            },
-            {
-                "description": "JavaScript pseudo-array is valid",
-                "data": {
-                    "0": "invalid",
-                    "length": 1
-                },
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "an array of schemas for items",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "items": [
-                {"type": "integer"},
-                {"type": "string"}
-            ]
-        },
-        "tests": [
-            {
-                "description": "correct types",
-                "data": [ 1, "foo" ],
-                "valid": true
-            },
-            {
-                "description": "wrong types",
-                "data": [ "foo", 1 ],
-                "valid": false
-            },
-            {
-                "description": "incomplete array of items",
-                "data": [ 1 ],
-                "valid": true
-            },
-            {
-                "description": "array with additional items",
-                "data": [ 1, "foo", true ],
-                "valid": true
-            },
-            {
-                "description": "empty array",
-                "data": [ ],
-                "valid": true
-            },
-            {
-                "description": "JavaScript pseudo-array is valid",
-                "data": {
-                    "0": "invalid",
-                    "1": "valid",
-                    "length": 2
-                },
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "items with boolean schema (true)",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "items": true
-        },
-        "tests": [
-            {
-                "description": "any array is valid",
-                "data": [ 1, "foo", true ],
-                "valid": true
-            },
-            {
-                "description": "empty array is valid",
-                "data": [],
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "items with boolean schema (false)",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "items": false
-        },
-        "tests": [
-            {
-                "description": "any non-empty array is invalid",
-                "data": [ 1, "foo", true ],
-                "valid": false
-            },
-            {
-                "description": "empty array is valid",
-                "data": [],
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "items with boolean schemas",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "items": [true, false]
-        },
-        "tests": [
-            {
-                "description": "array with one item is valid",
-                "data": [ 1 ],
-                "valid": true
-            },
-            {
-                "description": "array with two items is invalid",
-                "data": [ 1, "foo" ],
-                "valid": false
-            },
-            {
-                "description": "empty array is valid",
-                "data": [],
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "items and subitems",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "$defs": {
-                "item": {
-                    "type": "array",
-                    "additionalItems": false,
-                    "items": [
-                        { "$ref": "#/$defs/sub-item" },
-                        { "$ref": "#/$defs/sub-item" }
-                    ]
-                },
-                "sub-item": {
-                    "type": "object",
-                    "required": ["foo"]
-                }
-            },
-            "type": "array",
-            "additionalItems": false,
-            "items": [
-                { "$ref": "#/$defs/item" },
-                { "$ref": "#/$defs/item" },
-                { "$ref": "#/$defs/item" }
-            ]
-        },
-        "tests": [
-            {
-                "description": "valid items",
-                "data": [
-                    [ {"foo": null}, {"foo": null} ],
-                    [ {"foo": null}, {"foo": null} ],
-                    [ {"foo": null}, {"foo": null} ]
-                ],
-                "valid": true
-            },
-            {
-                "description": "too many items",
-                "data": [
-                    [ {"foo": null}, {"foo": null} ],
-                    [ {"foo": null}, {"foo": null} ],
-                    [ {"foo": null}, {"foo": null} ],
-                    [ {"foo": null}, {"foo": null} ]
-                ],
-                "valid": false
-            },
-            {
-                "description": "too many sub-items",
-                "data": [
-                    [ {"foo": null}, {"foo": null}, {"foo": null} ],
-                    [ {"foo": null}, {"foo": null} ],
-                    [ {"foo": null}, {"foo": null} ]
-                ],
-                "valid": false
-            },
-            {
-                "description": "wrong item",
-                "data": [
-                    {"foo": null},
-                    [ {"foo": null}, {"foo": null} ],
-                    [ {"foo": null}, {"foo": null} ]
-                ],
-                "valid": false
-            },
-            {
-                "description": "wrong sub-item",
-                "data": [
-                    [ {}, {"foo": null} ],
-                    [ {"foo": null}, {"foo": null} ],
-                    [ {"foo": null}, {"foo": null} ]
-                ],
-                "valid": false
-            },
-            {
-                "description": "fewer items is valid",
-                "data": [
-                    [ {"foo": null} ],
-                    [ {"foo": null} ]
-                ],
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "nested items",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "type": "array",
-            "items": {
-                "type": "array",
-                "items": {
-                    "type": "array",
-                    "items": {
-                        "type": "array",
-                        "items": {
-                            "type": "number"
-                        }
-                    }
-                }
-            }
-        },
-        "tests": [
-            {
-                "description": "valid nested array",
-                "data": [[[[1]], [[2],[3]]], [[[4], [5], [6]]]],
-                "valid": true
-            },
-            {
-                "description": "nested array with invalid type",
-                "data": [[[["1"]], [[2],[3]]], [[[4], [5], [6]]]],
-                "valid": false
-            },
-            {
-                "description": "not deep enough",
-                "data": [[[1], [2],[3]], [[4], [5], [6]]],
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "single-form items with null instance elements",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "items": {
-                "type": "null"
-            }
-        },
-        "tests": [
-            {
-                "description": "allows null elements",
-                "data": [ null ],
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "array-form items with null instance elements",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "items": [
-                {
-                    "type": "null"
-                }
-            ]
-        },
-        "tests": [
-            {
-                "description": "allows null elements",
-                "data": [ null ],
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft2019-09/maxContains.json b/json/tests/draft2019-09/maxContains.json
deleted file mode 100644
index ce4507c..0000000
--- a/json/tests/draft2019-09/maxContains.json
+++ /dev/null
@@ -1,102 +0,0 @@
-[
-    {
-        "description": "maxContains without contains is ignored",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "maxContains": 1
-        },
-        "tests": [
-            {
-                "description": "one item valid against lone maxContains",
-                "data": [ 1 ],
-                "valid": true
-            },
-            {
-                "description": "two items still valid against lone maxContains",
-                "data": [ 1, 2 ],
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "maxContains with contains",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "contains": {"const": 1},
-            "maxContains": 1
-        },
-        "tests": [
-            {
-                "description": "empty data",
-                "data": [ ],
-                "valid": false
-            },
-            {
-                "description": "all elements match, valid maxContains",
-                "data": [ 1 ],
-                "valid": true
-            },
-            {
-                "description": "all elements match, invalid maxContains",
-                "data": [ 1, 1 ],
-                "valid": false
-            },
-            {
-                "description": "some elements match, valid maxContains",
-                "data": [ 1, 2 ],
-                "valid": true
-            },
-            {
-                "description": "some elements match, invalid maxContains",
-                "data": [ 1, 2, 1 ],
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "maxContains with contains, value with a decimal",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "contains": {"const": 1},
-            "maxContains": 1.0
-        },
-        "tests": [
-            {
-                "description": "one element matches, valid maxContains",
-                "data": [ 1 ],
-                "valid": true
-            },
-            {
-                "description": "too many elements match, invalid maxContains",
-                "data": [ 1, 1 ],
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "minContains < maxContains",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "contains": {"const": 1},
-            "minContains": 1,
-            "maxContains": 3
-        },
-        "tests": [
-            {
-                "description": "actual < minContains < maxContains",
-                "data": [ ],
-                "valid": false
-            },
-            {
-                "description": "minContains < actual < maxContains",
-                "data": [ 1, 1 ],
-                "valid": true
-            },
-            {
-                "description": "minContains < maxContains < actual",
-                "data": [ 1, 1, 1, 1 ],
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft2019-09/maxItems.json b/json/tests/draft2019-09/maxItems.json
deleted file mode 100644
index d9ed157..0000000
--- a/json/tests/draft2019-09/maxItems.json
+++ /dev/null
@@ -1,50 +0,0 @@
-[
-    {
-        "description": "maxItems validation",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "maxItems": 2
-        },
-        "tests": [
-            {
-                "description": "shorter is valid",
-                "data": [1],
-                "valid": true
-            },
-            {
-                "description": "exact length is valid",
-                "data": [1, 2],
-                "valid": true
-            },
-            {
-                "description": "too long is invalid",
-                "data": [1, 2, 3],
-                "valid": false
-            },
-            {
-                "description": "ignores non-arrays",
-                "data": "foobar",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "maxItems validation with a decimal",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "maxItems": 2.0
-        },
-        "tests": [
-            {
-                "description": "shorter is valid",
-                "data": [1],
-                "valid": true
-            },
-            {
-                "description": "too long is invalid",
-                "data": [1, 2, 3],
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft2019-09/maxLength.json b/json/tests/draft2019-09/maxLength.json
deleted file mode 100644
index f242c3e..0000000
--- a/json/tests/draft2019-09/maxLength.json
+++ /dev/null
@@ -1,55 +0,0 @@
-[
-    {
-        "description": "maxLength validation",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "maxLength": 2
-        },
-        "tests": [
-            {
-                "description": "shorter is valid",
-                "data": "f",
-                "valid": true
-            },
-            {
-                "description": "exact length is valid",
-                "data": "fo",
-                "valid": true
-            },
-            {
-                "description": "too long is invalid",
-                "data": "foo",
-                "valid": false
-            },
-            {
-                "description": "ignores non-strings",
-                "data": 100,
-                "valid": true
-            },
-            {
-                "description": "two supplementary Unicode code points is long enough",
-                "data": "\uD83D\uDCA9\uD83D\uDCA9",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "maxLength validation with a decimal",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "maxLength": 2.0
-        },
-        "tests": [
-            {
-                "description": "shorter is valid",
-                "data": "f",
-                "valid": true
-            },
-            {
-                "description": "too long is invalid",
-                "data": "foo",
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft2019-09/maxProperties.json b/json/tests/draft2019-09/maxProperties.json
deleted file mode 100644
index 5b31474..0000000
--- a/json/tests/draft2019-09/maxProperties.json
+++ /dev/null
@@ -1,79 +0,0 @@
-[
-    {
-        "description": "maxProperties validation",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "maxProperties": 2
-        },
-        "tests": [
-            {
-                "description": "shorter is valid",
-                "data": {"foo": 1},
-                "valid": true
-            },
-            {
-                "description": "exact length is valid",
-                "data": {"foo": 1, "bar": 2},
-                "valid": true
-            },
-            {
-                "description": "too long is invalid",
-                "data": {"foo": 1, "bar": 2, "baz": 3},
-                "valid": false
-            },
-            {
-                "description": "ignores arrays",
-                "data": [1, 2, 3],
-                "valid": true
-            },
-            {
-                "description": "ignores strings",
-                "data": "foobar",
-                "valid": true
-            },
-            {
-                "description": "ignores other non-objects",
-                "data": 12,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "maxProperties validation with a decimal",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "maxProperties": 2.0
-        },
-        "tests": [
-            {
-                "description": "shorter is valid",
-                "data": {"foo": 1},
-                "valid": true
-            },
-            {
-                "description": "too long is invalid",
-                "data": {"foo": 1, "bar": 2, "baz": 3},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "maxProperties = 0 means the object is empty",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "maxProperties": 0
-        },
-        "tests": [
-            {
-                "description": "no properties is valid",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "one property is invalid",
-                "data": { "foo": 1 },
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft2019-09/maximum.json b/json/tests/draft2019-09/maximum.json
deleted file mode 100644
index c1f1dfd..0000000
--- a/json/tests/draft2019-09/maximum.json
+++ /dev/null
@@ -1,60 +0,0 @@
-[
-    {
-        "description": "maximum validation",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "maximum": 3.0
-        },
-        "tests": [
-            {
-                "description": "below the maximum is valid",
-                "data": 2.6,
-                "valid": true
-            },
-            {
-                "description": "boundary point is valid",
-                "data": 3.0,
-                "valid": true
-            },
-            {
-                "description": "above the maximum is invalid",
-                "data": 3.5,
-                "valid": false
-            },
-            {
-                "description": "ignores non-numbers",
-                "data": "x",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "maximum validation with unsigned integer",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "maximum": 300
-        },
-        "tests":  [
-            {
-                "description": "below the maximum is invalid",
-                "data": 299.97,
-                "valid": true
-            },
-            {
-                "description": "boundary point integer is valid",
-                "data": 300,
-                "valid": true
-            },
-            {
-                "description": "boundary point float is valid",
-                "data": 300.00,
-                "valid": true
-            },
-            {
-                "description": "above the maximum is invalid",
-                "data": 300.5,
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft2019-09/minContains.json b/json/tests/draft2019-09/minContains.json
deleted file mode 100644
index 8d3093c..0000000
--- a/json/tests/draft2019-09/minContains.json
+++ /dev/null
@@ -1,224 +0,0 @@
-[
-    {
-        "description": "minContains without contains is ignored",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "minContains": 1
-        },
-        "tests": [
-            {
-                "description": "one item valid against lone minContains",
-                "data": [ 1 ],
-                "valid": true
-            },
-            {
-                "description": "zero items still valid against lone minContains",
-                "data": [],
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "minContains=1 with contains",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "contains": {"const": 1},
-            "minContains": 1
-        },
-        "tests": [
-            {
-                "description": "empty data",
-                "data": [ ],
-                "valid": false
-            },
-            {
-                "description": "no elements match",
-                "data": [ 2 ],
-                "valid": false
-            },
-            {
-                "description": "single element matches, valid minContains",
-                "data": [ 1 ],
-                "valid": true
-            },
-            {
-                "description": "some elements match, valid minContains",
-                "data": [ 1, 2 ],
-                "valid": true
-            },
-            {
-                "description": "all elements match, valid minContains",
-                "data": [ 1, 1 ],
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "minContains=2 with contains",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "contains": {"const": 1},
-            "minContains": 2
-        },
-        "tests": [
-            {
-                "description": "empty data",
-                "data": [ ],
-                "valid": false
-            },
-            {
-                "description": "all elements match, invalid minContains",
-                "data": [ 1 ],
-                "valid": false
-            },
-            {
-                "description": "some elements match, invalid minContains",
-                "data": [ 1, 2 ],
-                "valid": false
-            },
-            {
-                "description": "all elements match, valid minContains (exactly as needed)",
-                "data": [ 1, 1 ],
-                "valid": true
-            },
-            {
-                "description": "all elements match, valid minContains (more than needed)",
-                "data": [ 1, 1, 1 ],
-                "valid": true
-            },
-            {
-                "description": "some elements match, valid minContains",
-                "data": [ 1, 2, 1 ],
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "minContains=2 with contains with a decimal value",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "contains": {"const": 1},
-            "minContains": 2.0
-        },
-        "tests": [
-            {
-                "description": "one element matches, invalid minContains",
-                "data": [ 1 ],
-                "valid": false
-            },
-            {
-                "description": "both elements match, valid minContains",
-                "data": [ 1, 1 ],
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "maxContains = minContains",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "contains": {"const": 1},
-            "maxContains": 2,
-            "minContains": 2
-        },
-        "tests": [
-            {
-                "description": "empty data",
-                "data": [ ],
-                "valid": false
-            },
-            {
-                "description": "all elements match, invalid minContains",
-                "data": [ 1 ],
-                "valid": false
-            },
-            {
-                "description": "all elements match, invalid maxContains",
-                "data": [ 1, 1, 1 ],
-                "valid": false
-            },
-            {
-                "description": "all elements match, valid maxContains and minContains",
-                "data": [ 1, 1 ],
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "maxContains < minContains",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "contains": {"const": 1},
-            "maxContains": 1,
-            "minContains": 3
-        },
-        "tests": [
-            {
-                "description": "empty data",
-                "data": [ ],
-                "valid": false
-            },
-            {
-                "description": "invalid minContains",
-                "data": [ 1 ],
-                "valid": false
-            },
-            {
-                "description": "invalid maxContains",
-                "data": [ 1, 1, 1 ],
-                "valid": false
-            },
-            {
-                "description": "invalid maxContains and minContains",
-                "data": [ 1, 1 ],
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "minContains = 0 with no maxContains",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "contains": {"const": 1},
-            "minContains": 0
-        },
-        "tests": [
-            {
-                "description": "empty data",
-                "data": [ ],
-                "valid": true
-            },
-            {
-                "description": "minContains = 0 makes contains always pass",
-                "data": [ 2 ],
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "minContains = 0 with maxContains",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "contains": {"const": 1},
-            "minContains": 0,
-            "maxContains": 1
-        },
-        "tests": [
-            {
-                "description": "empty data",
-                "data": [ ],
-                "valid": true
-            },
-            {
-                "description": "not more than maxContains",
-                "data": [ 1 ],
-                "valid": true
-            },
-            {
-                "description": "too many",
-                "data": [ 1, 1 ],
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft2019-09/minItems.json b/json/tests/draft2019-09/minItems.json
deleted file mode 100644
index 07817cc..0000000
--- a/json/tests/draft2019-09/minItems.json
+++ /dev/null
@@ -1,50 +0,0 @@
-[
-    {
-        "description": "minItems validation",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "minItems": 1
-        },
-        "tests": [
-            {
-                "description": "longer is valid",
-                "data": [1, 2],
-                "valid": true
-            },
-            {
-                "description": "exact length is valid",
-                "data": [1],
-                "valid": true
-            },
-            {
-                "description": "too short is invalid",
-                "data": [],
-                "valid": false
-            },
-            {
-                "description": "ignores non-arrays",
-                "data": "",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "minItems validation with a decimal",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "minItems": 1.0
-        },
-        "tests": [
-            {
-                "description": "longer is valid",
-                "data": [1, 2],
-                "valid": true
-            },
-            {
-                "description": "too short is invalid",
-                "data": [],
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft2019-09/minLength.json b/json/tests/draft2019-09/minLength.json
deleted file mode 100644
index 19dec2c..0000000
--- a/json/tests/draft2019-09/minLength.json
+++ /dev/null
@@ -1,55 +0,0 @@
-[
-    {
-        "description": "minLength validation",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "minLength": 2
-        },
-        "tests": [
-            {
-                "description": "longer is valid",
-                "data": "foo",
-                "valid": true
-            },
-            {
-                "description": "exact length is valid",
-                "data": "fo",
-                "valid": true
-            },
-            {
-                "description": "too short is invalid",
-                "data": "f",
-                "valid": false
-            },
-            {
-                "description": "ignores non-strings",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "one supplementary Unicode code point is not long enough",
-                "data": "\uD83D\uDCA9",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "minLength validation with a decimal",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "minLength": 2.0
-        },
-        "tests": [
-            {
-                "description": "longer is valid",
-                "data": "foo",
-                "valid": true
-            },
-            {
-                "description": "too short is invalid",
-                "data": "f",
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft2019-09/minProperties.json b/json/tests/draft2019-09/minProperties.json
deleted file mode 100644
index 20e01a9..0000000
--- a/json/tests/draft2019-09/minProperties.json
+++ /dev/null
@@ -1,60 +0,0 @@
-[
-    {
-        "description": "minProperties validation",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "minProperties": 1
-        },
-        "tests": [
-            {
-                "description": "longer is valid",
-                "data": {"foo": 1, "bar": 2},
-                "valid": true
-            },
-            {
-                "description": "exact length is valid",
-                "data": {"foo": 1},
-                "valid": true
-            },
-            {
-                "description": "too short is invalid",
-                "data": {},
-                "valid": false
-            },
-            {
-                "description": "ignores arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "ignores strings",
-                "data": "",
-                "valid": true
-            },
-            {
-                "description": "ignores other non-objects",
-                "data": 12,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "minProperties validation with a decimal",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "minProperties": 1.0
-        },
-        "tests": [
-            {
-                "description": "longer is valid",
-                "data": {"foo": 1, "bar": 2},
-                "valid": true
-            },
-            {
-                "description": "too short is invalid",
-                "data": {},
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft2019-09/minimum.json b/json/tests/draft2019-09/minimum.json
deleted file mode 100644
index afb5f20..0000000
--- a/json/tests/draft2019-09/minimum.json
+++ /dev/null
@@ -1,75 +0,0 @@
-[
-    {
-        "description": "minimum validation",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "minimum": 1.1
-        },
-        "tests": [
-            {
-                "description": "above the minimum is valid",
-                "data": 2.6,
-                "valid": true
-            },
-            {
-                "description": "boundary point is valid",
-                "data": 1.1,
-                "valid": true
-            },
-            {
-                "description": "below the minimum is invalid",
-                "data": 0.6,
-                "valid": false
-            },
-            {
-                "description": "ignores non-numbers",
-                "data": "x",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "minimum validation with signed integer",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "minimum": -2
-        },
-        "tests": [
-            {
-                "description": "negative above the minimum is valid",
-                "data": -1,
-                "valid": true
-            },
-            {
-                "description": "positive above the minimum is valid",
-                "data": 0,
-                "valid": true
-            },
-            {
-                "description": "boundary point is valid",
-                "data": -2,
-                "valid": true
-            },
-            {
-                "description": "boundary point with float is valid",
-                "data": -2.0,
-                "valid": true
-            },
-            {
-                "description": "float below the minimum is invalid",
-                "data": -2.0001,
-                "valid": false
-            },
-            {
-                "description": "int below the minimum is invalid",
-                "data": -3,
-                "valid": false
-            },
-            {
-                "description": "ignores non-numbers",
-                "data": "x",
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft2019-09/multipleOf.json b/json/tests/draft2019-09/multipleOf.json
deleted file mode 100644
index 94af169..0000000
--- a/json/tests/draft2019-09/multipleOf.json
+++ /dev/null
@@ -1,83 +0,0 @@
-[
-    {
-        "description": "by int",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "multipleOf": 2
-        },
-        "tests": [
-            {
-                "description": "int by int",
-                "data": 10,
-                "valid": true
-            },
-            {
-                "description": "int by int fail",
-                "data": 7,
-                "valid": false
-            },
-            {
-                "description": "ignores non-numbers",
-                "data": "foo",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "by number",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "multipleOf": 1.5
-        },
-        "tests": [
-            {
-                "description": "zero is multiple of anything",
-                "data": 0,
-                "valid": true
-            },
-            {
-                "description": "4.5 is multiple of 1.5",
-                "data": 4.5,
-                "valid": true
-            },
-            {
-                "description": "35 is not multiple of 1.5",
-                "data": 35,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "by small number",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "multipleOf": 0.0001
-        },
-        "tests": [
-            {
-                "description": "0.0075 is multiple of 0.0001",
-                "data": 0.0075,
-                "valid": true
-            },
-            {
-                "description": "0.00751 is not multiple of 0.0001",
-                "data": 0.00751,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "float division = inf",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "type": "integer", "multipleOf": 0.123456789
-        },
-        "tests": [
-            {
-                "description": "always invalid, but naive implementations may raise an overflow error",
-                "data": 1e308,
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft2019-09/not.json b/json/tests/draft2019-09/not.json
deleted file mode 100644
index f76f763..0000000
--- a/json/tests/draft2019-09/not.json
+++ /dev/null
@@ -1,127 +0,0 @@
-[
-    {
-        "description": "not",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "not": {"type": "integer"}
-        },
-        "tests": [
-            {
-                "description": "allowed",
-                "data": "foo",
-                "valid": true
-            },
-            {
-                "description": "disallowed",
-                "data": 1,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "not multiple types",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "not": {"type": ["integer", "boolean"]}
-        },
-        "tests": [
-            {
-                "description": "valid",
-                "data": "foo",
-                "valid": true
-            },
-            {
-                "description": "mismatch",
-                "data": 1,
-                "valid": false
-            },
-            {
-                "description": "other mismatch",
-                "data": true,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "not more complex schema",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "not": {
-                "type": "object",
-                "properties": {
-                    "foo": {
-                        "type": "string"
-                    }
-                }
-             }
-        },
-        "tests": [
-            {
-                "description": "match",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "other match",
-                "data": {"foo": 1},
-                "valid": true
-            },
-            {
-                "description": "mismatch",
-                "data": {"foo": "bar"},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "forbidden property",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "properties": {
-                "foo": { 
-                    "not": {}
-                }
-            }
-        },
-        "tests": [
-            {
-                "description": "property present",
-                "data": {"foo": 1, "bar": 2},
-                "valid": false
-            },
-            {
-                "description": "property absent",
-                "data": {"bar": 1, "baz": 2},
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "not with boolean schema true",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "not": true
-        },
-        "tests": [
-            {
-                "description": "any value is invalid",
-                "data": "foo",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "not with boolean schema false",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "not": false
-        },
-        "tests": [
-            {
-                "description": "any value is valid",
-                "data": "foo",
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft2019-09/oneOf.json b/json/tests/draft2019-09/oneOf.json
deleted file mode 100644
index 9b7a220..0000000
--- a/json/tests/draft2019-09/oneOf.json
+++ /dev/null
@@ -1,293 +0,0 @@
-[
-    {
-        "description": "oneOf",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "oneOf": [
-                {
-                    "type": "integer"
-                },
-                {
-                    "minimum": 2
-                }
-            ]
-        },
-        "tests": [
-            {
-                "description": "first oneOf valid",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "second oneOf valid",
-                "data": 2.5,
-                "valid": true
-            },
-            {
-                "description": "both oneOf valid",
-                "data": 3,
-                "valid": false
-            },
-            {
-                "description": "neither oneOf valid",
-                "data": 1.5,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "oneOf with base schema",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "type": "string",
-            "oneOf" : [
-                {
-                    "minLength": 2
-                },
-                {
-                    "maxLength": 4
-                }
-            ]
-        },
-        "tests": [
-            {
-                "description": "mismatch base schema",
-                "data": 3,
-                "valid": false
-            },
-            {
-                "description": "one oneOf valid",
-                "data": "foobar",
-                "valid": true
-            },
-            {
-                "description": "both oneOf valid",
-                "data": "foo",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "oneOf with boolean schemas, all true",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "oneOf": [true, true, true]
-        },
-        "tests": [
-            {
-                "description": "any value is invalid",
-                "data": "foo",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "oneOf with boolean schemas, one true",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "oneOf": [true, false, false]
-        },
-        "tests": [
-            {
-                "description": "any value is valid",
-                "data": "foo",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "oneOf with boolean schemas, more than one true",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "oneOf": [true, true, false]
-        },
-        "tests": [
-            {
-                "description": "any value is invalid",
-                "data": "foo",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "oneOf with boolean schemas, all false",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "oneOf": [false, false, false]
-        },
-        "tests": [
-            {
-                "description": "any value is invalid",
-                "data": "foo",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "oneOf complex types",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "oneOf": [
-                {
-                    "properties": {
-                        "bar": {"type": "integer"}
-                    },
-                    "required": ["bar"]
-                },
-                {
-                    "properties": {
-                        "foo": {"type": "string"}
-                    },
-                    "required": ["foo"]
-                }
-            ]
-        },
-        "tests": [
-            {
-                "description": "first oneOf valid (complex)",
-                "data": {"bar": 2},
-                "valid": true
-            },
-            {
-                "description": "second oneOf valid (complex)",
-                "data": {"foo": "baz"},
-                "valid": true
-            },
-            {
-                "description": "both oneOf valid (complex)",
-                "data": {"foo": "baz", "bar": 2},
-                "valid": false
-            },
-            {
-                "description": "neither oneOf valid (complex)",
-                "data": {"foo": 2, "bar": "quux"},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "oneOf with empty schema",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "oneOf": [
-                { "type": "number" },
-                {}
-            ]
-        },
-        "tests": [
-            {
-                "description": "one valid - valid",
-                "data": "foo",
-                "valid": true
-            },
-            {
-                "description": "both valid - invalid",
-                "data": 123,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "oneOf with required",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "type": "object",
-            "oneOf": [
-                { "required": ["foo", "bar"] },
-                { "required": ["foo", "baz"] }
-            ]
-        },
-        "tests": [
-            {
-                "description": "both invalid - invalid",
-                "data": {"bar": 2},
-                "valid": false
-            },
-            {
-                "description": "first valid - valid",
-                "data": {"foo": 1, "bar": 2},
-                "valid": true
-            },
-            {
-                "description": "second valid - valid",
-                "data": {"foo": 1, "baz": 3},
-                "valid": true
-            },
-            {
-                "description": "both valid - invalid",
-                "data": {"foo": 1, "bar": 2, "baz" : 3},
-                "valid": false
-            }
-        ]
-    },
-	{
-        "description": "oneOf with missing optional property",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "oneOf": [
-                {
-                    "properties": {
-                        "bar": true,
-                        "baz": true
-                    },
-                    "required": ["bar"]
-                },
-                {
-                    "properties": {
-                        "foo": true
-                    },
-                    "required": ["foo"]
-                }
-            ]
-        },
-        "tests": [
-            {
-                "description": "first oneOf valid",
-                "data": {"bar": 8},
-                "valid": true
-            },
-            {
-                "description": "second oneOf valid",
-                "data": {"foo": "foo"},
-                "valid": true
-            },
-            {
-                "description": "both oneOf valid",
-                "data": {"foo": "foo", "bar": 8},
-                "valid": false
-            },
-            {
-                "description": "neither oneOf valid",
-                "data": {"baz": "quux"},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "nested oneOf, to check validation semantics",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "oneOf": [
-                {
-                    "oneOf": [
-                        {
-                            "type": "null"
-                        }
-                    ]
-                }
-            ]
-        },
-        "tests": [
-            {
-                "description": "null is valid",
-                "data": null,
-                "valid": true
-            },
-            {
-                "description": "anything non-null is invalid",
-                "data": 123,
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft2019-09/optional/bignum.json b/json/tests/draft2019-09/optional/bignum.json
deleted file mode 100644
index 8b06467..0000000
--- a/json/tests/draft2019-09/optional/bignum.json
+++ /dev/null
@@ -1,110 +0,0 @@
-[
-    {
-        "description": "integer",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "type": "integer"
-        },
-        "tests": [
-            {
-                "description": "a bignum is an integer",
-                "data": 12345678910111213141516171819202122232425262728293031,
-                "valid": true
-            },
-            {
-                "description": "a negative bignum is an integer",
-                "data": -12345678910111213141516171819202122232425262728293031,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "number",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "type": "number"
-        },
-        "tests": [
-            {
-                "description": "a bignum is a number",
-                "data": 98249283749234923498293171823948729348710298301928331,
-                "valid": true
-            },
-            {
-                "description": "a negative bignum is a number",
-                "data": -98249283749234923498293171823948729348710298301928331,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "string",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "type": "string"
-        },
-        "tests": [
-            {
-                "description": "a bignum is not a string",
-                "data": 98249283749234923498293171823948729348710298301928331,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "maximum integer comparison",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "maximum": 18446744073709551615
-        },
-        "tests": [
-            {
-                "description": "comparison works for high numbers",
-                "data": 18446744073709551600,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "float comparison with high precision",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "exclusiveMaximum": 972783798187987123879878123.18878137
-        },
-        "tests": [
-            {
-                "description": "comparison works for high numbers",
-                "data": 972783798187987123879878123.188781371,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "minimum integer comparison",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "minimum": -18446744073709551615
-        },
-        "tests": [
-            {
-                "description": "comparison works for very negative numbers",
-                "data": -18446744073709551600,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "float comparison with high precision on negative numbers",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "exclusiveMinimum": -972783798187987123879878123.18878137
-        },
-        "tests": [
-            {
-                "description": "comparison works for very negative numbers",
-                "data": -972783798187987123879878123.188781371,
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft2019-09/optional/cross-draft.json b/json/tests/draft2019-09/optional/cross-draft.json
deleted file mode 100644
index efd3f87..0000000
--- a/json/tests/draft2019-09/optional/cross-draft.json
+++ /dev/null
@@ -1,41 +0,0 @@
-[
-    {
-        "description": "refs to future drafts are processed as future drafts",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "type": "array",
-            "$ref": "http://localhost:1234/draft2020-12/prefixItems.json"
-        },
-        "tests": [
-            {
-                "description": "first item not a string is invalid",
-                "comment": "if the implementation is not processing the $ref as a 2020-12 schema, this test will fail",
-                "data": [1, 2, 3],
-                "valid": false
-            },
-            {
-                "description": "first item is a string is valid",
-                "data": ["a string", 1, 2, 3],
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "refs to historic drafts are processed as historic drafts",
-        "schema": {
-            "type": "object",
-            "allOf": [
-                { "properties": { "foo": true } },
-                { "$ref": "http://localhost:1234/draft7/ignore-dependentRequired.json" }
-            ]
-        },
-        "tests": [
-            {
-                "description": "missing bar is valid",
-                "comment": "if the implementation is not processing the $ref as a draft 7 schema, this test will fail",
-                "data": {"foo": "any value"},
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft2019-09/optional/dependencies-compatibility.json b/json/tests/draft2019-09/optional/dependencies-compatibility.json
deleted file mode 100644
index 5bfbd05..0000000
--- a/json/tests/draft2019-09/optional/dependencies-compatibility.json
+++ /dev/null
@@ -1,282 +0,0 @@
-[
-    {
-        "description": "single dependency",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "dependencies": {"bar": ["foo"]}
-        },
-        "tests": [
-            {
-                "description": "neither",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "nondependant",
-                "data": {"foo": 1},
-                "valid": true
-            },
-            {
-                "description": "with dependency",
-                "data": {"foo": 1, "bar": 2},
-                "valid": true
-            },
-            {
-                "description": "missing dependency",
-                "data": {"bar": 2},
-                "valid": false
-            },
-            {
-                "description": "ignores arrays",
-                "data": ["bar"],
-                "valid": true
-            },
-            {
-                "description": "ignores strings",
-                "data": "foobar",
-                "valid": true
-            },
-            {
-                "description": "ignores other non-objects",
-                "data": 12,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "empty dependents",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "dependencies": {"bar": []}
-        },
-        "tests": [
-            {
-                "description": "empty object",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "object with one property",
-                "data": {"bar": 2},
-                "valid": true
-            },
-            {
-                "description": "non-object is valid",
-                "data": 1,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "multiple dependents required",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "dependencies": {"quux": ["foo", "bar"]}
-        },
-        "tests": [
-            {
-                "description": "neither",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "nondependants",
-                "data": {"foo": 1, "bar": 2},
-                "valid": true
-            },
-            {
-                "description": "with dependencies",
-                "data": {"foo": 1, "bar": 2, "quux": 3},
-                "valid": true
-            },
-            {
-                "description": "missing dependency",
-                "data": {"foo": 1, "quux": 2},
-                "valid": false
-            },
-            {
-                "description": "missing other dependency",
-                "data": {"bar": 1, "quux": 2},
-                "valid": false
-            },
-            {
-                "description": "missing both dependencies",
-                "data": {"quux": 1},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "dependencies with escaped characters",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "dependencies": {
-                "foo\nbar": ["foo\rbar"],
-                "foo\"bar": ["foo'bar"]
-            }
-        },
-        "tests": [
-            {
-                "description": "CRLF",
-                "data": {
-                    "foo\nbar": 1,
-                    "foo\rbar": 2
-                },
-                "valid": true
-            },
-            {
-                "description": "quoted quotes",
-                "data": {
-                    "foo'bar": 1,
-                    "foo\"bar": 2
-                },
-                "valid": true
-            },
-            {
-                "description": "CRLF missing dependent",
-                "data": {
-                    "foo\nbar": 1,
-                    "foo": 2
-                },
-                "valid": false
-            },
-            {
-                "description": "quoted quotes missing dependent",
-                "data": {
-                    "foo\"bar": 2
-                },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "single schema dependency",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "dependencies": {
-                "bar": {
-                    "properties": {
-                        "foo": {"type": "integer"},
-                        "bar": {"type": "integer"}
-                    }
-                }
-            }
-        },
-        "tests": [
-            {
-                "description": "valid",
-                "data": {"foo": 1, "bar": 2},
-                "valid": true
-            },
-            {
-                "description": "no dependency",
-                "data": {"foo": "quux"},
-                "valid": true
-            },
-            {
-                "description": "wrong type",
-                "data": {"foo": "quux", "bar": 2},
-                "valid": false
-            },
-            {
-                "description": "wrong type other",
-                "data": {"foo": 2, "bar": "quux"},
-                "valid": false
-            },
-            {
-                "description": "wrong type both",
-                "data": {"foo": "quux", "bar": "quux"},
-                "valid": false
-            },
-            {
-                "description": "ignores arrays",
-                "data": ["bar"],
-                "valid": true
-            },
-            {
-                "description": "ignores strings",
-                "data": "foobar",
-                "valid": true
-            },
-            {
-                "description": "ignores other non-objects",
-                "data": 12,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "boolean subschemas",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "dependencies": {
-                "foo": true,
-                "bar": false
-            }
-        },
-        "tests": [
-            {
-                "description": "object with property having schema true is valid",
-                "data": {"foo": 1},
-                "valid": true
-            },
-            {
-                "description": "object with property having schema false is invalid",
-                "data": {"bar": 2},
-                "valid": false
-            },
-            {
-                "description": "object with both properties is invalid",
-                "data": {"foo": 1, "bar": 2},
-                "valid": false
-            },
-            {
-                "description": "empty object is valid",
-                "data": {},
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "schema dependencies with escaped characters",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "dependencies": {
-                "foo\tbar": {"minProperties": 4},
-                "foo'bar": {"required": ["foo\"bar"]}
-            }
-        },
-        "tests": [
-            {
-                "description": "quoted tab",
-                "data": {
-                    "foo\tbar": 1,
-                    "a": 2,
-                    "b": 3,
-                    "c": 4
-                },
-                "valid": true
-            },
-            {
-                "description": "quoted quote",
-                "data": {
-                    "foo'bar": {"foo\"bar": 1}
-                },
-                "valid": false
-            },
-            {
-                "description": "quoted tab invalid under dependent schema",
-                "data": {
-                    "foo\tbar": 1,
-                    "a": 2
-                },
-                "valid": false
-            },
-            {
-                "description": "quoted quote invalid under dependent schema",
-                "data": {"foo'bar": 1},
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft2019-09/optional/ecmascript-regex.json b/json/tests/draft2019-09/optional/ecmascript-regex.json
deleted file mode 100644
index be1059c..0000000
--- a/json/tests/draft2019-09/optional/ecmascript-regex.json
+++ /dev/null
@@ -1,582 +0,0 @@
-[
-    {
-        "description": "ECMA 262 regex $ does not match trailing newline",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "type": "string",
-            "pattern": "^abc$"
-        },
-        "tests": [
-            {
-                "description": "matches in Python, but not in ECMA 262",
-                "data": "abc\\n",
-                "valid": false
-            },
-            {
-                "description": "matches",
-                "data": "abc",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "ECMA 262 regex converts \\t to horizontal tab",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "type": "string",
-            "pattern": "^\\t$"
-        },
-        "tests": [
-            {
-                "description": "does not match",
-                "data": "\\t",
-                "valid": false
-            },
-            {
-                "description": "matches",
-                "data": "\u0009",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "ECMA 262 regex escapes control codes with \\c and upper letter",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "type": "string",
-            "pattern": "^\\cC$"
-        },
-        "tests": [
-            {
-                "description": "does not match",
-                "data": "\\cC",
-                "valid": false
-            },
-            {
-                "description": "matches",
-                "data": "\u0003",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "ECMA 262 regex escapes control codes with \\c and lower letter",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "type": "string",
-            "pattern": "^\\cc$"
-        },
-        "tests": [
-            {
-                "description": "does not match",
-                "data": "\\cc",
-                "valid": false
-            },
-            {
-                "description": "matches",
-                "data": "\u0003",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "ECMA 262 \\d matches ascii digits only",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "type": "string",
-            "pattern": "^\\d$"
-        },
-        "tests": [
-            {
-                "description": "ASCII zero matches",
-                "data": "0",
-                "valid": true
-            },
-            {
-                "description": "NKO DIGIT ZERO does not match (unlike e.g. Python)",
-                "data": "߀",
-                "valid": false
-            },
-            {
-                "description": "NKO DIGIT ZERO (as \\u escape) does not match",
-                "data": "\u07c0",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "ECMA 262 \\D matches everything but ascii digits",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "type": "string",
-            "pattern": "^\\D$"
-        },
-        "tests": [
-            {
-                "description": "ASCII zero does not match",
-                "data": "0",
-                "valid": false
-            },
-            {
-                "description": "NKO DIGIT ZERO matches (unlike e.g. Python)",
-                "data": "߀",
-                "valid": true
-            },
-            {
-                "description": "NKO DIGIT ZERO (as \\u escape) matches",
-                "data": "\u07c0",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "ECMA 262 \\w matches ascii letters only",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "type": "string",
-            "pattern": "^\\w$"
-        },
-        "tests": [
-            {
-                "description": "ASCII 'a' matches",
-                "data": "a",
-                "valid": true
-            },
-            {
-                "description": "latin-1 e-acute does not match (unlike e.g. Python)",
-                "data": "é",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "ECMA 262 \\W matches everything but ascii letters",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "type": "string",
-            "pattern": "^\\W$"
-        },
-        "tests": [
-            {
-                "description": "ASCII 'a' does not match",
-                "data": "a",
-                "valid": false
-            },
-            {
-                "description": "latin-1 e-acute matches (unlike e.g. Python)",
-                "data": "é",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "ECMA 262 \\s matches whitespace",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "type": "string",
-            "pattern": "^\\s$"
-        },
-        "tests": [
-            {
-                "description": "ASCII space matches",
-                "data": " ",
-                "valid": true
-            },
-            {
-                "description": "Character tabulation matches",
-                "data": "\t",
-                "valid": true
-            },
-            {
-                "description": "Line tabulation matches",
-                "data": "\u000b",
-                "valid": true
-            },
-            {
-                "description": "Form feed matches",
-                "data": "\u000c",
-                "valid": true
-            },
-            {
-                "description": "latin-1 non-breaking-space matches",
-                "data": "\u00a0",
-                "valid": true
-            },
-            {
-                "description": "zero-width whitespace matches",
-                "data": "\ufeff",
-                "valid": true
-            },
-            {
-                "description": "line feed matches (line terminator)",
-                "data": "\u000a",
-                "valid": true
-            },
-            {
-                "description": "paragraph separator matches (line terminator)",
-                "data": "\u2029",
-                "valid": true
-            },
-            {
-                "description": "EM SPACE matches (Space_Separator)",
-                "data": "\u2003",
-                "valid": true
-            },
-            {
-                "description": "Non-whitespace control does not match",
-                "data": "\u0001",
-                "valid": false
-            },
-            {
-                "description": "Non-whitespace does not match",
-                "data": "\u2013",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "ECMA 262 \\S matches everything but whitespace",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "type": "string",
-            "pattern": "^\\S$"
-        },
-        "tests": [
-            {
-                "description": "ASCII space does not match",
-                "data": " ",
-                "valid": false
-            },
-            {
-                "description": "Character tabulation does not match",
-                "data": "\t",
-                "valid": false
-            },
-            {
-                "description": "Line tabulation does not match",
-                "data": "\u000b",
-                "valid": false
-            },
-            {
-                "description": "Form feed does not match",
-                "data": "\u000c",
-                "valid": false
-            },
-            {
-                "description": "latin-1 non-breaking-space does not match",
-                "data": "\u00a0",
-                "valid": false
-            },
-            {
-                "description": "zero-width whitespace does not match",
-                "data": "\ufeff",
-                "valid": false
-            },
-            {
-                "description": "line feed does not match (line terminator)",
-                "data": "\u000a",
-                "valid": false
-            },
-            {
-                "description": "paragraph separator does not match (line terminator)",
-                "data": "\u2029",
-                "valid": false
-            },
-            {
-                "description": "EM SPACE does not match (Space_Separator)",
-                "data": "\u2003",
-                "valid": false
-            },
-            {
-                "description": "Non-whitespace control matches",
-                "data": "\u0001",
-                "valid": true
-            },
-            {
-                "description": "Non-whitespace matches",
-                "data": "\u2013",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "patterns always use unicode semantics with pattern",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "pattern": "\\p{Letter}cole"
-        },
-        "tests": [
-            {
-                "description": "ascii character in json string",
-                "data": "Les hivers de mon enfance etaient des saisons longues, longues. Nous vivions en trois lieux: l'ecole, l'eglise et la patinoire; mais la vraie vie etait sur la patinoire.",
-                "valid": true
-            },
-            {
-                "description": "literal unicode character in json string",
-                "data": "Les hivers de mon enfance étaient des saisons longues, longues. Nous vivions en trois lieux: l'école, l'église et la patinoire; mais la vraie vie était sur la patinoire.",
-                "valid": true
-            },
-            {
-                "description": "unicode character in hex format in string",
-                "data": "Les hivers de mon enfance étaient des saisons longues, longues. Nous vivions en trois lieux: l'\u00e9cole, l'église et la patinoire; mais la vraie vie était sur la patinoire.",
-                "valid": true
-            },
-            {
-                "description": "unicode matching is case-sensitive",
-                "data": "LES HIVERS DE MON ENFANCE ÉTAIENT DES SAISONS LONGUES, LONGUES. NOUS VIVIONS EN TROIS LIEUX: L'ÉCOLE, L'ÉGLISE ET LA PATINOIRE; MAIS LA VRAIE VIE ÉTAIT SUR LA PATINOIRE.",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "\\w in patterns matches [A-Za-z0-9_], not unicode letters",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "pattern": "\\wcole"
-        },
-        "tests": [
-            {
-                "description": "ascii character in json string",
-                "data": "Les hivers de mon enfance etaient des saisons longues, longues. Nous vivions en trois lieux: l'ecole, l'eglise et la patinoire; mais la vraie vie etait sur la patinoire.",
-                "valid": true
-            },
-            {
-                "description": "literal unicode character in json string",
-                "data": "Les hivers de mon enfance étaient des saisons longues, longues. Nous vivions en trois lieux: l'école, l'église et la patinoire; mais la vraie vie était sur la patinoire.",
-                "valid": false
-            },
-            {
-                "description": "unicode character in hex format in string",
-                "data": "Les hivers de mon enfance étaient des saisons longues, longues. Nous vivions en trois lieux: l'\u00e9cole, l'église et la patinoire; mais la vraie vie était sur la patinoire.",
-                "valid": false
-            },
-            {
-                "description": "unicode matching is case-sensitive",
-                "data": "LES HIVERS DE MON ENFANCE ÉTAIENT DES SAISONS LONGUES, LONGUES. NOUS VIVIONS EN TROIS LIEUX: L'ÉCOLE, L'ÉGLISE ET LA PATINOIRE; MAIS LA VRAIE VIE ÉTAIT SUR LA PATINOIRE.",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "pattern with ASCII ranges",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "pattern": "[a-z]cole"
-        },
-        "tests": [
-            {
-                "description": "literal unicode character in json string",
-                "data": "Les hivers de mon enfance étaient des saisons longues, longues. Nous vivions en trois lieux: l'école, l'église et la patinoire; mais la vraie vie était sur la patinoire.",
-                "valid": false
-            },
-            {
-                "description": "unicode character in hex format in string",
-                "data": "Les hivers de mon enfance étaient des saisons longues, longues. Nous vivions en trois lieux: l'\u00e9cole, l'église et la patinoire; mais la vraie vie était sur la patinoire.",
-                "valid": false
-            },
-            {
-                "description": "ascii characters match",
-                "data": "Les hivers de mon enfance etaient des saisons longues, longues. Nous vivions en trois lieux: l'ecole, l'eglise et la patinoire; mais la vraie vie etait sur la patinoire.",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "\\d in pattern matches [0-9], not unicode digits",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "pattern": "^\\d+$"
-        },
-        "tests": [
-            {
-                "description": "ascii digits",
-                "data": "42",
-                "valid": true
-            },
-            {
-                "description": "ascii non-digits",
-                "data": "-%#",
-                "valid": false
-            },
-            {
-                "description": "non-ascii digits (BENGALI DIGIT FOUR, BENGALI DIGIT TWO)",
-                "data": "৪২",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "pattern with non-ASCII digits",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "pattern": "^\\p{digit}+$"
-        },
-        "tests": [
-            {
-                "description": "ascii digits",
-                "data": "42",
-                "valid": true
-            },
-            {
-                "description": "ascii non-digits",
-                "data": "-%#",
-                "valid": false
-            },
-            {
-                "description": "non-ascii digits (BENGALI DIGIT FOUR, BENGALI DIGIT TWO)",
-                "data": "৪২",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "patterns always use unicode semantics with patternProperties",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "type": "object",
-            "patternProperties": {
-                "\\p{Letter}cole": true
-            },
-            "additionalProperties": false
-        },
-        "tests": [
-            {
-                "description": "ascii character in json string",
-                "data": { "l'ecole": "pas de vraie vie" },
-                "valid": true
-            },
-            {
-                "description": "literal unicode character in json string",
-                "data": { "l'école": "pas de vraie vie" },
-                "valid": true
-            },
-            {
-                "description": "unicode character in hex format in string",
-                "data": { "l'\u00e9cole": "pas de vraie vie" },
-                "valid": true
-            },
-            {
-                "description": "unicode matching is case-sensitive",
-                "data": { "L'ÉCOLE": "PAS DE VRAIE VIE" },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "\\w in patternProperties matches [A-Za-z0-9_], not unicode letters",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "type": "object",
-            "patternProperties": {
-                "\\wcole": true
-            },
-            "additionalProperties": false
-        },
-        "tests": [
-            {
-                "description": "ascii character in json string",
-                "data": { "l'ecole": "pas de vraie vie" },
-                "valid": true
-            },
-            {
-                "description": "literal unicode character in json string",
-                "data": { "l'école": "pas de vraie vie" },
-                "valid": false
-            },
-            {
-                "description": "unicode character in hex format in string",
-                "data": { "l'\u00e9cole": "pas de vraie vie" },
-                "valid": false
-            },
-            {
-                "description": "unicode matching is case-sensitive",
-                "data": { "L'ÉCOLE": "PAS DE VRAIE VIE" },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "patternProperties with ASCII ranges",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "type": "object",
-            "patternProperties": {
-                "[a-z]cole": true
-            },
-            "additionalProperties": false
-        },
-        "tests": [
-            {
-                "description": "literal unicode character in json string",
-                "data": { "l'école": "pas de vraie vie" },
-                "valid": false
-            },
-            {
-                "description": "unicode character in hex format in string",
-                "data": { "l'\u00e9cole": "pas de vraie vie" },
-                "valid": false
-            },
-            {
-                "description": "ascii characters match",
-                "data": { "l'ecole": "pas de vraie vie" },
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "\\d in patternProperties matches [0-9], not unicode digits",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "type": "object",
-            "patternProperties": {
-                "^\\d+$": true
-            },
-            "additionalProperties": false
-        },
-        "tests": [
-            {
-                "description": "ascii digits",
-                "data": { "42": "life, the universe, and everything" },
-                "valid": true
-            },
-            {
-                "description": "ascii non-digits",
-                "data": { "-%#": "spending the year dead for tax reasons" },
-                "valid": false
-            },
-            {
-                "description": "non-ascii digits (BENGALI DIGIT FOUR, BENGALI DIGIT TWO)",
-                "data": { "৪২": "khajit has wares if you have coin" },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "patternProperties with non-ASCII digits",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "type": "object",
-            "patternProperties": {
-                "^\\p{digit}+$": true
-            },
-            "additionalProperties": false
-        },
-        "tests": [
-            {
-                "description": "ascii digits",
-                "data": { "42": "life, the universe, and everything" },
-                "valid": true
-            },
-            {
-                "description": "ascii non-digits",
-                "data": { "-%#": "spending the year dead for tax reasons" },
-                "valid": false
-            },
-            {
-                "description": "non-ascii digits (BENGALI DIGIT FOUR, BENGALI DIGIT TWO)",
-                "data": { "৪২": "khajit has wares if you have coin" },
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft2019-09/optional/float-overflow.json b/json/tests/draft2019-09/optional/float-overflow.json
deleted file mode 100644
index f5741fa..0000000
--- a/json/tests/draft2019-09/optional/float-overflow.json
+++ /dev/null
@@ -1,16 +0,0 @@
-[
-    {
-        "description": "all integers are multiples of 0.5, if overflow is handled",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "type": "integer", "multipleOf": 0.5
-        },
-        "tests": [
-            {
-                "description": "valid if optional overflow handling is implemented",
-                "data": 1e308,
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft2019-09/optional/format/date-time.json b/json/tests/draft2019-09/optional/format/date-time.json
deleted file mode 100644
index 731001d..0000000
--- a/json/tests/draft2019-09/optional/format/date-time.json
+++ /dev/null
@@ -1,136 +0,0 @@
-[
-    {
-        "description": "validation of date-time strings",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "format": "date-time"
-        },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            },
-            {
-                "description": "a valid date-time string",
-                "data": "1963-06-19T08:30:06.283185Z",
-                "valid": true
-            },
-            {
-                "description": "a valid date-time string without second fraction",
-                "data": "1963-06-19T08:30:06Z",
-                "valid": true
-            },
-            {
-                "description": "a valid date-time string with plus offset",
-                "data": "1937-01-01T12:00:27.87+00:20",
-                "valid": true
-            },
-            {
-                "description": "a valid date-time string with minus offset",
-                "data": "1990-12-31T15:59:50.123-08:00",
-                "valid": true
-            },
-            {
-                "description": "a valid date-time with a leap second, UTC",
-                "data": "1998-12-31T23:59:60Z",
-                "valid": true
-            },
-            {
-                "description": "a valid date-time with a leap second, with minus offset",
-                "data": "1998-12-31T15:59:60.123-08:00",
-                "valid": true
-            },
-            {
-                "description": "an invalid date-time past leap second, UTC",
-                "data": "1998-12-31T23:59:61Z",
-                "valid": false
-            },
-            {
-                "description": "an invalid date-time with leap second on a wrong minute, UTC",
-                "data": "1998-12-31T23:58:60Z",
-                "valid": false
-            },
-            {
-                "description": "an invalid date-time with leap second on a wrong hour, UTC",
-                "data": "1998-12-31T22:59:60Z",
-                "valid": false
-            },
-            {
-                "description": "an invalid day in date-time string",
-                "data": "1990-02-31T15:59:59.123-08:00",
-                "valid": false
-            },
-            {
-                "description": "an invalid offset in date-time string",
-                "data": "1990-12-31T15:59:59-24:00",
-                "valid": false
-            },
-            {
-                "description": "an invalid closing Z after time-zone offset",
-                "data": "1963-06-19T08:30:06.28123+01:00Z",
-                "valid": false
-            },
-            {
-                "description": "an invalid date-time string",
-                "data": "06/19/1963 08:30:06 PST",
-                "valid": false
-            },
-            {
-                "description": "case-insensitive T and Z",
-                "data": "1963-06-19t08:30:06.283185z",
-                "valid": true
-            },
-            {
-                "description": "only RFC3339 not all of ISO 8601 are valid",
-                "data": "2013-350T01:01:01",
-                "valid": false
-            },
-            {
-                "description": "invalid non-padded month dates",
-                "data": "1963-6-19T08:30:06.283185Z",
-                "valid": false
-            },
-            {
-                "description": "invalid non-padded day dates",
-                "data": "1963-06-1T08:30:06.283185Z",
-                "valid": false
-            },
-            {
-                "description": "invalid non-ASCII '৪' (a Bengali 4) in date portion",
-                "data": "1963-06-1৪T00:00:00Z",
-                "valid": false
-            },
-            {
-                "description": "invalid non-ASCII '৪' (a Bengali 4) in time portion",
-                "data": "1963-06-11T0৪:00:00Z",
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft2019-09/optional/format/date.json b/json/tests/draft2019-09/optional/format/date.json
deleted file mode 100644
index 64dbefb..0000000
--- a/json/tests/draft2019-09/optional/format/date.json
+++ /dev/null
@@ -1,226 +0,0 @@
-[
-    {
-        "description": "validation of date strings",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "format": "date"
-        },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            },
-            {
-                "description": "a valid date string",
-                "data": "1963-06-19",
-                "valid": true
-            },
-            {
-                "description": "a valid date string with 31 days in January",
-                "data": "2020-01-31",
-                "valid": true
-            },
-            {
-                "description": "a invalid date string with 32 days in January",
-                "data": "2020-01-32",
-                "valid": false
-            },
-            {
-                "description": "a valid date string with 28 days in February (normal)",
-                "data": "2021-02-28",
-                "valid": true
-            },
-            {
-                "description": "a invalid date string with 29 days in February (normal)",
-                "data": "2021-02-29",
-                "valid": false
-            },
-            {
-                "description": "a valid date string with 29 days in February (leap)",
-                "data": "2020-02-29",
-                "valid": true
-            },
-            {
-                "description": "a invalid date string with 30 days in February (leap)",
-                "data": "2020-02-30",
-                "valid": false
-            },
-            {
-                "description": "a valid date string with 31 days in March",
-                "data": "2020-03-31",
-                "valid": true
-            },
-            {
-                "description": "a invalid date string with 32 days in March",
-                "data": "2020-03-32",
-                "valid": false
-            },
-            {
-                "description": "a valid date string with 30 days in April",
-                "data": "2020-04-30",
-                "valid": true
-            },
-            {
-                "description": "a invalid date string with 31 days in April",
-                "data": "2020-04-31",
-                "valid": false
-            },
-            {
-                "description": "a valid date string with 31 days in May",
-                "data": "2020-05-31",
-                "valid": true
-            },
-            {
-                "description": "a invalid date string with 32 days in May",
-                "data": "2020-05-32",
-                "valid": false
-            },
-            {
-                "description": "a valid date string with 30 days in June",
-                "data": "2020-06-30",
-                "valid": true
-            },
-            {
-                "description": "a invalid date string with 31 days in June",
-                "data": "2020-06-31",
-                "valid": false
-            },
-            {
-                "description": "a valid date string with 31 days in July",
-                "data": "2020-07-31",
-                "valid": true
-            },
-            {
-                "description": "a invalid date string with 32 days in July",
-                "data": "2020-07-32",
-                "valid": false
-            },
-            {
-                "description": "a valid date string with 31 days in August",
-                "data": "2020-08-31",
-                "valid": true
-            },
-            {
-                "description": "a invalid date string with 32 days in August",
-                "data": "2020-08-32",
-                "valid": false
-            },
-            {
-                "description": "a valid date string with 30 days in September",
-                "data": "2020-09-30",
-                "valid": true
-            },
-            {
-                "description": "a invalid date string with 31 days in September",
-                "data": "2020-09-31",
-                "valid": false
-            },
-            {
-                "description": "a valid date string with 31 days in October",
-                "data": "2020-10-31",
-                "valid": true
-            },
-            {
-                "description": "a invalid date string with 32 days in October",
-                "data": "2020-10-32",
-                "valid": false
-            },
-            {
-                "description": "a valid date string with 30 days in November",
-                "data": "2020-11-30",
-                "valid": true
-            },
-            {
-                "description": "a invalid date string with 31 days in November",
-                "data": "2020-11-31",
-                "valid": false
-            },
-            {
-                "description": "a valid date string with 31 days in December",
-                "data": "2020-12-31",
-                "valid": true
-            },
-            {
-                "description": "a invalid date string with 32 days in December",
-                "data": "2020-12-32",
-                "valid": false
-            },
-            {
-                "description": "a invalid date string with invalid month",
-                "data": "2020-13-01",
-                "valid": false
-            },
-            {
-                "description": "an invalid date string",
-                "data": "06/19/1963",
-                "valid": false
-            },
-            {
-                "description": "only RFC3339 not all of ISO 8601 are valid",
-                "data": "2013-350",
-                "valid": false
-            },
-            {
-                "description": "non-padded month dates are not valid",
-                "data": "1998-1-20",
-                "valid": false
-            },
-            {
-                "description": "non-padded day dates are not valid",
-                "data": "1998-01-1",
-                "valid": false
-            },
-            {
-                "description": "invalid month",
-                "data": "1998-13-01",
-                "valid": false
-            },
-            {
-                "description": "invalid month-day combination",
-                "data": "1998-04-31",
-                "valid": false
-            },
-            {
-                "description": "2021 is not a leap year",
-                "data": "2021-02-29",
-                "valid": false
-            },
-            {
-                "description": "2020 is a leap year",
-                "data": "2020-02-29",
-                "valid": true
-            },
-            {
-                "description": "invalid non-ASCII '৪' (a Bengali 4)",
-                "data": "1963-06-1৪",
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft2019-09/optional/format/duration.json b/json/tests/draft2019-09/optional/format/duration.json
deleted file mode 100644
index 00d5f47..0000000
--- a/json/tests/draft2019-09/optional/format/duration.json
+++ /dev/null
@@ -1,136 +0,0 @@
-[
-    {
-        "description": "validation of duration strings",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "format": "duration"
-        },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            },
-            {
-                "description": "a valid duration string",
-                "data": "P4DT12H30M5S",
-                "valid": true
-            },
-            {
-                "description": "an invalid duration string",
-                "data": "PT1D",
-                "valid": false
-            },
-            {
-                "description": "no elements present",
-                "data": "P",
-                "valid": false
-            },
-            {
-                "description": "no time elements present",
-                "data": "P1YT",
-                "valid": false
-            },
-            {
-                "description": "no date or time elements present",
-                "data": "PT",
-                "valid": false
-            },
-            {
-                "description": "elements out of order",
-                "data": "P2D1Y",
-                "valid": false
-            },
-            {
-                "description": "missing time separator",
-                "data": "P1D2H",
-                "valid": false
-            },
-            {
-                "description": "time element in the date position",
-                "data": "P2S",
-                "valid": false
-            },
-            {
-                "description": "four years duration",
-                "data": "P4Y",
-                "valid": true
-            },
-            {
-                "description": "zero time, in seconds",
-                "data": "PT0S",
-                "valid": true
-            },
-            {
-                "description": "zero time, in days",
-                "data": "P0D",
-                "valid": true
-            },
-            {
-                "description": "one month duration",
-                "data": "P1M",
-                "valid": true
-            },
-            {
-                "description": "one minute duration",
-                "data": "PT1M",
-                "valid": true
-            },
-            {
-                "description": "one and a half days, in hours",
-                "data": "PT36H",
-                "valid": true
-            },
-            {
-                "description": "one and a half days, in days and hours",
-                "data": "P1DT12H",
-                "valid": true
-            },
-            {
-                "description": "two weeks",
-                "data": "P2W",
-                "valid": true
-            },
-            {
-                "description": "weeks cannot be combined with other units",
-                "data": "P1Y2W",
-                "valid": false
-            },
-            {
-                "description": "invalid non-ASCII '২' (a Bengali 2)",
-                "data": "P২Y",
-                "valid": false
-            },
-            {
-                "description": "element without unit",
-                "data": "P1",
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft2019-09/optional/format/email.json b/json/tests/draft2019-09/optional/format/email.json
deleted file mode 100644
index e6acc32..0000000
--- a/json/tests/draft2019-09/optional/format/email.json
+++ /dev/null
@@ -1,86 +0,0 @@
-[
-    {
-        "description": "validation of e-mail addresses",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "format": "email"
-        },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            },
-            {
-                "description": "a valid e-mail address",
-                "data": "joe.bloggs@example.com",
-                "valid": true
-            },
-            {
-                "description": "an invalid e-mail address",
-                "data": "2962",
-                "valid": false
-            },
-            {
-                "description": "tilde in local part is valid",
-                "data": "te~st@example.com",
-                "valid": true
-            },
-            {
-                "description": "tilde before local part is valid",
-                "data": "~test@example.com",
-                "valid": true
-            },
-            {
-                "description": "tilde after local part is valid",
-                "data": "test~@example.com",
-                "valid": true
-            },
-            {
-                "description": "dot before local part is not valid",
-                "data": ".test@example.com",
-                "valid": false
-            },
-            {
-                "description": "dot after local part is not valid",
-                "data": "test.@example.com",
-                "valid": false
-            },
-            {
-                "description": "two separated dots inside local part are valid",
-                "data": "te.s.t@example.com",
-                "valid": true
-            },
-            {
-                "description": "two subsequent dots inside local part are not valid",
-                "data": "te..st@example.com",
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft2019-09/optional/format/hostname.json b/json/tests/draft2019-09/optional/format/hostname.json
deleted file mode 100644
index eac8cac..0000000
--- a/json/tests/draft2019-09/optional/format/hostname.json
+++ /dev/null
@@ -1,101 +0,0 @@
-[
-    {
-        "description": "validation of host names",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "format": "hostname"
-        },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            },
-            {
-                "description": "a valid host name",
-                "data": "www.example.com",
-                "valid": true
-            },
-            {
-                "description": "a valid punycoded IDN hostname",
-                "data": "xn--4gbwdl.xn--wgbh1c",
-                "valid": true
-            },
-            {
-                "description": "a host name starting with an illegal character",
-                "data": "-a-host-name-that-starts-with--",
-                "valid": false
-            },
-            {
-                "description": "a host name containing illegal characters",
-                "data": "not_a_valid_host_name",
-                "valid": false
-            },
-            {
-                "description": "a host name with a component too long",
-                "data": "a-vvvvvvvvvvvvvvvveeeeeeeeeeeeeeeerrrrrrrrrrrrrrrryyyyyyyyyyyyyyyy-long-host-name-component",
-                "valid": false
-            },
-            {
-                "description": "starts with hyphen",
-                "data": "-hostname",
-                "valid": false
-            },
-            {
-                "description": "ends with hyphen",
-                "data": "hostname-",
-                "valid": false
-            },
-            {
-                "description": "starts with underscore",
-                "data": "_hostname",
-                "valid": false
-            },
-            {
-                "description": "ends with underscore",
-                "data": "hostname_",
-                "valid": false
-            },
-            {
-                "description": "contains underscore",
-                "data": "host_name",
-                "valid": false
-            },
-            {
-                "description": "maximum label length",
-                "data": "abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijk.com",
-                "valid": true
-            },
-            {
-                "description": "exceeds maximum label length",
-                "data": "abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijkl.com",
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft2019-09/optional/format/idn-email.json b/json/tests/draft2019-09/optional/format/idn-email.json
deleted file mode 100644
index baf01d0..0000000
--- a/json/tests/draft2019-09/optional/format/idn-email.json
+++ /dev/null
@@ -1,61 +0,0 @@
-[
-    {
-        "description": "validation of an internationalized e-mail addresses",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "format": "idn-email"
-        },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            },
-            {
-                "description": "a valid idn e-mail (example@example.test in Hangul)",
-                "data": "실례@실례.테스트",
-                "valid": true
-            },
-            {
-                "description": "an invalid idn e-mail address",
-                "data": "2962",
-                "valid": false
-            },
-            {
-                "description": "a valid e-mail address",
-                "data": "joe.bloggs@example.com",
-                "valid": true
-            },
-            {
-                "description": "an invalid e-mail address",
-                "data": "2962",
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft2019-09/optional/format/idn-hostname.json b/json/tests/draft2019-09/optional/format/idn-hostname.json
deleted file mode 100644
index 72f1797..0000000
--- a/json/tests/draft2019-09/optional/format/idn-hostname.json
+++ /dev/null
@@ -1,307 +0,0 @@
-[
-    {
-        "description": "validation of internationalized host names",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "format": "idn-hostname"
-        },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            },
-            {
-                "description": "a valid host name (example.test in Hangul)",
-                "data": "실례.테스트",
-                "valid": true
-            },
-            {
-                "description": "illegal first char U+302E Hangul single dot tone mark",
-                "data": "〮실례.테스트",
-                "valid": false
-            },
-            {
-                "description": "contains illegal char U+302E Hangul single dot tone mark",
-                "data": "실〮례.테스트",
-                "valid": false
-            },
-            {
-                "description": "a host name with a component too long",
-                "data": "실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실례례테스트례례례례례례례례례례례례례례례례례테스트례례례례례례례례례례례례례례례례례례례테스트례례례례례례례례례례례례테스트례례실례.테스트",
-                "valid": false
-            },
-            {
-                "description": "invalid label, correct Punycode",
-                "comment": "https://tools.ietf.org/html/rfc5890#section-2.3.2.1 https://tools.ietf.org/html/rfc5891#section-4.4 https://tools.ietf.org/html/rfc3492#section-7.1",
-                "data": "-> $1.00 <--",
-                "valid": false
-            },
-            {
-                "description": "valid Chinese Punycode",
-                "comment": "https://tools.ietf.org/html/rfc5890#section-2.3.2.1 https://tools.ietf.org/html/rfc5891#section-4.4",
-                "data": "xn--ihqwcrb4cv8a8dqg056pqjye",
-                "valid": true
-            },
-            {
-                "description": "invalid Punycode",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.4 https://tools.ietf.org/html/rfc5890#section-2.3.2.1",
-                "data": "xn--X",
-                "valid": false
-            },
-            {
-                "description": "U-label contains \"--\" in the 3rd and 4th position",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.2.3.1 https://tools.ietf.org/html/rfc5890#section-2.3.2.1",
-                "data": "XN--aa---o47jg78q",
-                "valid": false
-            },
-            {
-                "description": "U-label starts with a dash",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.2.3.1",
-                "data": "-hello",
-                "valid": false
-            },
-            {
-                "description": "U-label ends with a dash",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.2.3.1",
-                "data": "hello-",
-                "valid": false
-            },
-            {
-                "description": "U-label starts and ends with a dash",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.2.3.1",
-                "data": "-hello-",
-                "valid": false
-            },
-            {
-                "description": "Begins with a Spacing Combining Mark",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.2.3.2",
-                "data": "\u0903hello",
-                "valid": false
-            },
-            {
-                "description": "Begins with a Nonspacing Mark",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.2.3.2",
-                "data": "\u0300hello",
-                "valid": false
-            },
-            {
-                "description": "Begins with an Enclosing Mark",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.2.3.2",
-                "data": "\u0488hello",
-                "valid": false
-            },
-            {
-                "description": "Exceptions that are PVALID, left-to-right chars",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.2.2 https://tools.ietf.org/html/rfc5892#section-2.6",
-                "data": "\u00df\u03c2\u0f0b\u3007",
-                "valid": true
-            },
-            {
-                "description": "Exceptions that are PVALID, right-to-left chars",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.2.2 https://tools.ietf.org/html/rfc5892#section-2.6",
-                "data": "\u06fd\u06fe",
-                "valid": true
-            },
-            {
-                "description": "Exceptions that are DISALLOWED, right-to-left chars",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.2.2 https://tools.ietf.org/html/rfc5892#section-2.6",
-                "data": "\u0640\u07fa",
-                "valid": false
-            },
-            {
-                "description": "Exceptions that are DISALLOWED, left-to-right chars",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.2.2 https://tools.ietf.org/html/rfc5892#section-2.6 Note: The two combining marks (U+302E and U+302F) are in the middle and not at the start",
-                "data": "\u3031\u3032\u3033\u3034\u3035\u302e\u302f\u303b",
-                "valid": false
-            },
-            {
-                "description": "MIDDLE DOT with no preceding 'l'",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.2.3.3 https://tools.ietf.org/html/rfc5892#appendix-A.3",
-                "data": "a\u00b7l",
-                "valid": false
-            },
-            {
-                "description": "MIDDLE DOT with nothing preceding",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.2.3.3 https://tools.ietf.org/html/rfc5892#appendix-A.3",
-                "data": "\u00b7l",
-                "valid": false
-            },
-            {
-                "description": "MIDDLE DOT with no following 'l'",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.2.3.3 https://tools.ietf.org/html/rfc5892#appendix-A.3",
-                "data": "l\u00b7a",
-                "valid": false
-            },
-            {
-                "description": "MIDDLE DOT with nothing following",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.2.3.3 https://tools.ietf.org/html/rfc5892#appendix-A.3",
-                "data": "l\u00b7",
-                "valid": false
-            },
-            {
-                "description": "MIDDLE DOT with surrounding 'l's",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.2.3.3 https://tools.ietf.org/html/rfc5892#appendix-A.3",
-                "data": "l\u00b7l",
-                "valid": true
-            },
-            {
-                "description": "Greek KERAIA not followed by Greek",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.2.3.3 https://tools.ietf.org/html/rfc5892#appendix-A.4",
-                "data": "\u03b1\u0375S",
-                "valid": false
-            },
-            {
-                "description": "Greek KERAIA not followed by anything",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.2.3.3 https://tools.ietf.org/html/rfc5892#appendix-A.4",
-                "data": "\u03b1\u0375",
-                "valid": false
-            },
-            {
-                "description": "Greek KERAIA followed by Greek",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.2.3.3 https://tools.ietf.org/html/rfc5892#appendix-A.4",
-                "data": "\u03b1\u0375\u03b2",
-                "valid": true
-            },
-            {
-                "description": "Hebrew GERESH not preceded by Hebrew",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.2.3.3 https://tools.ietf.org/html/rfc5892#appendix-A.5",
-                "data": "A\u05f3\u05d1",
-                "valid": false
-            },
-            {
-                "description": "Hebrew GERESH not preceded by anything",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.2.3.3 https://tools.ietf.org/html/rfc5892#appendix-A.5",
-                "data": "\u05f3\u05d1",
-                "valid": false
-            },
-            {
-                "description": "Hebrew GERESH preceded by Hebrew",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.2.3.3 https://tools.ietf.org/html/rfc5892#appendix-A.5",
-                "data": "\u05d0\u05f3\u05d1",
-                "valid": true
-            },
-            {
-                "description": "Hebrew GERSHAYIM not preceded by Hebrew",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.2.3.3 https://tools.ietf.org/html/rfc5892#appendix-A.6",
-                "data": "A\u05f4\u05d1",
-                "valid": false
-            },
-            {
-                "description": "Hebrew GERSHAYIM not preceded by anything",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.2.3.3 https://tools.ietf.org/html/rfc5892#appendix-A.6",
-                "data": "\u05f4\u05d1",
-                "valid": false
-            },
-            {
-                "description": "Hebrew GERSHAYIM preceded by Hebrew",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.2.3.3 https://tools.ietf.org/html/rfc5892#appendix-A.6",
-                "data": "\u05d0\u05f4\u05d1",
-                "valid": true
-            },
-            {
-                "description": "KATAKANA MIDDLE DOT with no Hiragana, Katakana, or Han",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.2.3.3 https://tools.ietf.org/html/rfc5892#appendix-A.7",
-                "data": "def\u30fbabc",
-                "valid": false
-            },
-            {
-                "description": "KATAKANA MIDDLE DOT with no other characters",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.2.3.3 https://tools.ietf.org/html/rfc5892#appendix-A.7",
-                "data": "\u30fb",
-                "valid": false
-            },
-            {
-                "description": "KATAKANA MIDDLE DOT with Hiragana",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.2.3.3 https://tools.ietf.org/html/rfc5892#appendix-A.7",
-                "data": "\u30fb\u3041",
-                "valid": true
-            },
-            {
-                "description": "KATAKANA MIDDLE DOT with Katakana",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.2.3.3 https://tools.ietf.org/html/rfc5892#appendix-A.7",
-                "data": "\u30fb\u30a1",
-                "valid": true
-            },
-            {
-                "description": "KATAKANA MIDDLE DOT with Han",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.2.3.3 https://tools.ietf.org/html/rfc5892#appendix-A.7",
-                "data": "\u30fb\u4e08",
-                "valid": true
-            },
-            {
-                "description": "Arabic-Indic digits mixed with Extended Arabic-Indic digits",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.2.3.3 https://tools.ietf.org/html/rfc5892#appendix-A.8",
-                "data": "\u0660\u06f0",
-                "valid": false
-            },
-            {
-                "description": "Arabic-Indic digits not mixed with Extended Arabic-Indic digits",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.2.3.3 https://tools.ietf.org/html/rfc5892#appendix-A.8",
-                "data": "\u0628\u0660\u0628",
-                "valid": true
-            },
-            {
-                "description": "Extended Arabic-Indic digits not mixed with Arabic-Indic digits",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.2.3.3 https://tools.ietf.org/html/rfc5892#appendix-A.9",
-                "data": "\u06f00",
-                "valid": true
-            },
-            {
-                "description": "ZERO WIDTH JOINER not preceded by Virama",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.2.3.3 https://tools.ietf.org/html/rfc5892#appendix-A.2 https://www.unicode.org/review/pr-37.pdf",
-                "data": "\u0915\u200d\u0937",
-                "valid": false
-            },
-            {
-                "description": "ZERO WIDTH JOINER not preceded by anything",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.2.3.3 https://tools.ietf.org/html/rfc5892#appendix-A.2 https://www.unicode.org/review/pr-37.pdf",
-                "data": "\u200d\u0937",
-                "valid": false
-            },
-            {
-                "description": "ZERO WIDTH JOINER preceded by Virama",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.2.3.3 https://tools.ietf.org/html/rfc5892#appendix-A.2 https://www.unicode.org/review/pr-37.pdf",
-                "data": "\u0915\u094d\u200d\u0937",
-                "valid": true
-            },
-            {
-                "description": "ZERO WIDTH NON-JOINER preceded by Virama",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.2.3.3 https://tools.ietf.org/html/rfc5892#appendix-A.1",
-                "data": "\u0915\u094d\u200c\u0937",
-                "valid": true
-            },
-            {
-                "description": "ZERO WIDTH NON-JOINER not preceded by Virama but matches regexp",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.2.3.3 https://tools.ietf.org/html/rfc5892#appendix-A.1 https://www.w3.org/TR/alreq/#h_disjoining_enforcement",
-                "data": "\u0628\u064a\u200c\u0628\u064a",
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft2019-09/optional/format/ipv4.json b/json/tests/draft2019-09/optional/format/ipv4.json
deleted file mode 100644
index ac1e14c..0000000
--- a/json/tests/draft2019-09/optional/format/ipv4.json
+++ /dev/null
@@ -1,87 +0,0 @@
-[
-    {
-        "description": "validation of IP addresses",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "format": "ipv4"
-        },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            },
-            {
-                "description": "a valid IP address",
-                "data": "192.168.0.1",
-                "valid": true
-            },
-            {
-                "description": "an IP address with too many components",
-                "data": "127.0.0.0.1",
-                "valid": false
-            },
-            {
-                "description": "an IP address with out-of-range values",
-                "data": "256.256.256.256",
-                "valid": false
-            },
-            {
-                "description": "an IP address without 4 components",
-                "data": "127.0",
-                "valid": false
-            },
-            {
-                "description": "an IP address as an integer",
-                "data": "0x7f000001",
-                "valid": false
-            },
-            {
-                "description": "an IP address as an integer (decimal)",
-                "data": "2130706433",
-                "valid": false
-            },
-            {
-                "description": "invalid leading zeroes, as they are treated as octals",
-                "comment": "see https://sick.codes/universal-netmask-npm-package-used-by-270000-projects-vulnerable-to-octal-input-data-server-side-request-forgery-remote-file-inclusion-local-file-inclusion-and-more-cve-2021-28918/",
-                "data": "087.10.0.1",
-                "valid": false
-            },
-            {
-                "description": "value without leading zero is valid",
-                "data": "87.10.0.1",
-                "valid": true
-            },
-            {
-                "description": "invalid non-ASCII '২' (a Bengali 2)",
-                "data": "1২7.0.0.1",
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft2019-09/optional/format/ipv6.json b/json/tests/draft2019-09/optional/format/ipv6.json
deleted file mode 100644
index 0486091..0000000
--- a/json/tests/draft2019-09/optional/format/ipv6.json
+++ /dev/null
@@ -1,211 +0,0 @@
-[
-    {
-        "description": "validation of IPv6 addresses",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "format": "ipv6"
-        },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            },
-            {
-                "description": "a valid IPv6 address",
-                "data": "::1",
-                "valid": true
-            },
-            {
-                "description": "an IPv6 address with out-of-range values",
-                "data": "12345::",
-                "valid": false
-            },
-            {
-                "description": "trailing 4 hex symbols is valid",
-                "data": "::abef",
-                "valid": true
-            },
-            {
-                "description": "trailing 5 hex symbols is invalid",
-                "data": "::abcef",
-                "valid": false
-            },
-            {
-                "description": "an IPv6 address with too many components",
-                "data": "1:1:1:1:1:1:1:1:1:1:1:1:1:1:1:1",
-                "valid": false
-            },
-            {
-                "description": "an IPv6 address containing illegal characters",
-                "data": "::laptop",
-                "valid": false
-            },
-            {
-                "description": "no digits is valid",
-                "data": "::",
-                "valid": true
-            },
-            {
-                "description": "leading colons is valid",
-                "data": "::42:ff:1",
-                "valid": true
-            },
-            {
-                "description": "trailing colons is valid",
-                "data": "d6::",
-                "valid": true
-            },
-            {
-                "description": "missing leading octet is invalid",
-                "data": ":2:3:4:5:6:7:8",
-                "valid": false
-            },
-            {
-                "description": "missing trailing octet is invalid",
-                "data": "1:2:3:4:5:6:7:",
-                "valid": false
-            },
-            {
-                "description": "missing leading octet with omitted octets later",
-                "data": ":2:3:4::8",
-                "valid": false
-            },
-            {
-                "description": "single set of double colons in the middle is valid",
-                "data": "1:d6::42",
-                "valid": true
-            },
-            {
-                "description": "two sets of double colons is invalid",
-                "data": "1::d6::42",
-                "valid": false
-            },
-            {
-                "description": "mixed format with the ipv4 section as decimal octets",
-                "data": "1::d6:192.168.0.1",
-                "valid": true
-            },
-            {
-                "description": "mixed format with double colons between the sections",
-                "data": "1:2::192.168.0.1",
-                "valid": true
-            },
-            {
-                "description": "mixed format with ipv4 section with octet out of range",
-                "data": "1::2:192.168.256.1",
-                "valid": false
-            },
-            {
-                "description": "mixed format with ipv4 section with a hex octet",
-                "data": "1::2:192.168.ff.1",
-                "valid": false
-            },
-            {
-                "description": "mixed format with leading double colons (ipv4-mapped ipv6 address)",
-                "data": "::ffff:192.168.0.1",
-                "valid": true
-            },
-            {
-                "description": "triple colons is invalid",
-                "data": "1:2:3:4:5:::8",
-                "valid": false
-            },
-            {
-                "description": "8 octets",
-                "data": "1:2:3:4:5:6:7:8",
-                "valid": true
-            },
-            {
-                "description": "insufficient octets without double colons",
-                "data": "1:2:3:4:5:6:7",
-                "valid": false
-            },
-            {
-                "description": "no colons is invalid",
-                "data": "1",
-                "valid": false
-            },
-            {
-                "description": "ipv4 is not ipv6",
-                "data": "127.0.0.1",
-                "valid": false
-            },
-            {
-                "description": "ipv4 segment must have 4 octets",
-                "data": "1:2:3:4:1.2.3",
-                "valid": false
-            },
-            {
-                "description": "leading whitespace is invalid",
-                "data": "  ::1",
-                "valid": false
-            },
-            {
-                "description": "trailing whitespace is invalid",
-                "data": "::1  ",
-                "valid": false
-            },
-            {
-                "description": "netmask is not a part of ipv6 address",
-                "data": "fe80::/64",
-                "valid": false
-            },
-            {
-                "description": "zone id is not a part of ipv6 address",
-                "data": "fe80::a%eth1",
-                "valid": false
-            },
-            {
-                "description": "a long valid ipv6",
-                "data": "1000:1000:1000:1000:1000:1000:255.255.255.255",
-                "valid": true
-            },
-            {
-                "description": "a long invalid ipv6, below length limit, first",
-                "data": "100:100:100:100:100:100:255.255.255.255.255",
-                "valid": false
-            },
-            {
-                "description": "a long invalid ipv6, below length limit, second",
-                "data": "100:100:100:100:100:100:100:255.255.255.255",
-                "valid": false
-            },
-            {
-                "description": "invalid non-ASCII '৪' (a Bengali 4)",
-                "data": "1:2:3:4:5:6:7:৪",
-                "valid": false
-            },
-            {
-                "description": "invalid non-ASCII '৪' (a Bengali 4) in the IPv4 portion",
-                "data": "1:2::192.16৪.0.1",
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft2019-09/optional/format/iri-reference.json b/json/tests/draft2019-09/optional/format/iri-reference.json
deleted file mode 100644
index 6914210..0000000
--- a/json/tests/draft2019-09/optional/format/iri-reference.json
+++ /dev/null
@@ -1,76 +0,0 @@
-[
-    {
-        "description": "validation of IRI References",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "format": "iri-reference"
-        },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            },
-            {
-                "description": "a valid IRI",
-                "data": "http://ƒøø.ßår/?∂éœ=πîx#πîüx",
-                "valid": true
-            },
-            {
-                "description": "a valid protocol-relative IRI Reference",
-                "data": "//ƒøø.ßår/?∂éœ=πîx#πîüx",
-                "valid": true
-            },
-            {
-                "description": "a valid relative IRI Reference",
-                "data": "/âππ",
-                "valid": true
-            },
-            {
-                "description": "an invalid IRI Reference",
-                "data": "\\\\WINDOWS\\filëßåré",
-                "valid": false
-            },
-            {
-                "description": "a valid IRI Reference",
-                "data": "âππ",
-                "valid": true
-            },
-            {
-                "description": "a valid IRI fragment",
-                "data": "#ƒrägmênt",
-                "valid": true
-            },
-            {
-                "description": "an invalid IRI fragment",
-                "data": "#ƒräg\\mênt",
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft2019-09/optional/format/iri.json b/json/tests/draft2019-09/optional/format/iri.json
deleted file mode 100644
index ad4c79e..0000000
--- a/json/tests/draft2019-09/optional/format/iri.json
+++ /dev/null
@@ -1,86 +0,0 @@
-[
-    {
-        "description": "validation of IRIs",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "format": "iri"
-        },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            },
-            {
-                "description": "a valid IRI with anchor tag",
-                "data": "http://ƒøø.ßår/?∂éœ=πîx#πîüx",
-                "valid": true
-            },
-            {
-                "description": "a valid IRI with anchor tag and parentheses",
-                "data": "http://ƒøø.com/blah_(wîkïpédiå)_blah#ßité-1",
-                "valid": true
-            },
-            {
-                "description": "a valid IRI with URL-encoded stuff",
-                "data": "http://ƒøø.ßår/?q=Test%20URL-encoded%20stuff",
-                "valid": true
-            },
-            {
-                "description": "a valid IRI with many special characters",
-                "data": "http://-.~_!$&'()*+,;=:%40:80%2f::::::@example.com",
-                "valid": true
-            },
-            {
-                "description": "a valid IRI based on IPv6",
-                "data": "http://[2001:0db8:85a3:0000:0000:8a2e:0370:7334]",
-                "valid": true
-            },
-            {
-                "description": "an invalid IRI based on IPv6",
-                "data": "http://2001:0db8:85a3:0000:0000:8a2e:0370:7334",
-                "valid": false
-            },
-            {
-                "description": "an invalid relative IRI Reference",
-                "data": "/abc",
-                "valid": false
-            },
-            {
-                "description": "an invalid IRI",
-                "data": "\\\\WINDOWS\\filëßåré",
-                "valid": false
-            },
-            {
-                "description": "an invalid IRI though valid IRI reference",
-                "data": "âππ",
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft2019-09/optional/format/json-pointer.json b/json/tests/draft2019-09/optional/format/json-pointer.json
deleted file mode 100644
index 39f1cc9..0000000
--- a/json/tests/draft2019-09/optional/format/json-pointer.json
+++ /dev/null
@@ -1,201 +0,0 @@
-[
-    {
-        "description": "validation of JSON-pointers (JSON String Representation)",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "format": "json-pointer"
-        },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            },
-            {
-                "description": "a valid JSON-pointer",
-                "data": "/foo/bar~0/baz~1/%a",
-                "valid": true
-            },
-            {
-                "description": "not a valid JSON-pointer (~ not escaped)",
-                "data": "/foo/bar~",
-                "valid": false
-            },
-            {
-                "description": "valid JSON-pointer with empty segment",
-                "data": "/foo//bar",
-                "valid": true
-            },
-            {
-                "description": "valid JSON-pointer with the last empty segment",
-                "data": "/foo/bar/",
-                "valid": true
-            },
-            {
-                "description": "valid JSON-pointer as stated in RFC 6901 #1",
-                "data": "",
-                "valid": true
-            },
-            {
-                "description": "valid JSON-pointer as stated in RFC 6901 #2",
-                "data": "/foo",
-                "valid": true
-            },
-            {
-                "description": "valid JSON-pointer as stated in RFC 6901 #3",
-                "data": "/foo/0",
-                "valid": true
-            },
-            {
-                "description": "valid JSON-pointer as stated in RFC 6901 #4",
-                "data": "/",
-                "valid": true
-            },
-            {
-                "description": "valid JSON-pointer as stated in RFC 6901 #5",
-                "data": "/a~1b",
-                "valid": true
-            },
-            {
-                "description": "valid JSON-pointer as stated in RFC 6901 #6",
-                "data": "/c%d",
-                "valid": true
-            },
-            {
-                "description": "valid JSON-pointer as stated in RFC 6901 #7",
-                "data": "/e^f",
-                "valid": true
-            },
-            {
-                "description": "valid JSON-pointer as stated in RFC 6901 #8",
-                "data": "/g|h",
-                "valid": true
-            },
-            {
-                "description": "valid JSON-pointer as stated in RFC 6901 #9",
-                "data": "/i\\j",
-                "valid": true
-            },
-            {
-                "description": "valid JSON-pointer as stated in RFC 6901 #10",
-                "data": "/k\"l",
-                "valid": true
-            },
-            {
-                "description": "valid JSON-pointer as stated in RFC 6901 #11",
-                "data": "/ ",
-                "valid": true
-            },
-            {
-                "description": "valid JSON-pointer as stated in RFC 6901 #12",
-                "data": "/m~0n",
-                "valid": true
-            },
-            {
-                "description": "valid JSON-pointer used adding to the last array position",
-                "data": "/foo/-",
-                "valid": true
-            },
-            {
-                "description": "valid JSON-pointer (- used as object member name)",
-                "data": "/foo/-/bar",
-                "valid": true
-            },
-            {
-                "description": "valid JSON-pointer (multiple escaped characters)",
-                "data": "/~1~0~0~1~1",
-                "valid": true
-            },
-            {
-                "description": "valid JSON-pointer (escaped with fraction part) #1",
-                "data": "/~1.1",
-                "valid": true
-            },
-            {
-                "description": "valid JSON-pointer (escaped with fraction part) #2",
-                "data": "/~0.1",
-                "valid": true
-            },
-            {
-                "description": "not a valid JSON-pointer (URI Fragment Identifier) #1",
-                "data": "#",
-                "valid": false
-            },
-            {
-                "description": "not a valid JSON-pointer (URI Fragment Identifier) #2",
-                "data": "#/",
-                "valid": false
-            },
-            {
-                "description": "not a valid JSON-pointer (URI Fragment Identifier) #3",
-                "data": "#a",
-                "valid": false
-            },
-            {
-                "description": "not a valid JSON-pointer (some escaped, but not all) #1",
-                "data": "/~0~",
-                "valid": false
-            },
-            {
-                "description": "not a valid JSON-pointer (some escaped, but not all) #2",
-                "data": "/~0/~",
-                "valid": false
-            },
-            {
-                "description": "not a valid JSON-pointer (wrong escape character) #1",
-                "data": "/~2",
-                "valid": false
-            },
-            {
-                "description": "not a valid JSON-pointer (wrong escape character) #2",
-                "data": "/~-1",
-                "valid": false
-            },
-            {
-                "description": "not a valid JSON-pointer (multiple characters not escaped)",
-                "data": "/~~",
-                "valid": false
-            },
-            {
-                "description": "not a valid JSON-pointer (isn't empty nor starts with /) #1",
-                "data": "a",
-                "valid": false
-            },
-            {
-                "description": "not a valid JSON-pointer (isn't empty nor starts with /) #2",
-                "data": "0",
-                "valid": false
-            },
-            {
-                "description": "not a valid JSON-pointer (isn't empty nor starts with /) #3",
-                "data": "a/a",
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft2019-09/optional/format/regex.json b/json/tests/draft2019-09/optional/format/regex.json
deleted file mode 100644
index da32401..0000000
--- a/json/tests/draft2019-09/optional/format/regex.json
+++ /dev/null
@@ -1,51 +0,0 @@
-[
-    {
-        "description": "validation of regular expressions",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "format": "regex"
-        },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            },
-            {
-                "description": "a valid regular expression",
-                "data": "([abc])+\\s+$",
-                "valid": true
-            },
-            {
-                "description": "a regular expression with unclosed parens is invalid",
-                "data": "^(abc]",
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft2019-09/optional/format/relative-json-pointer.json b/json/tests/draft2019-09/optional/format/relative-json-pointer.json
deleted file mode 100644
index ba97d2a..0000000
--- a/json/tests/draft2019-09/optional/format/relative-json-pointer.json
+++ /dev/null
@@ -1,101 +0,0 @@
-[
-    {
-        "description": "validation of Relative JSON Pointers (RJP)",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "format": "relative-json-pointer"
-        },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            },
-            {
-                "description": "a valid upwards RJP",
-                "data": "1",
-                "valid": true
-            },
-            {
-                "description": "a valid downwards RJP",
-                "data": "0/foo/bar",
-                "valid": true
-            },
-            {
-                "description": "a valid up and then down RJP, with array index",
-                "data": "2/0/baz/1/zip",
-                "valid": true
-            },
-            {
-                "description": "a valid RJP taking the member or index name",
-                "data": "0#",
-                "valid": true
-            },
-            {
-                "description": "an invalid RJP that is a valid JSON Pointer",
-                "data": "/foo/bar",
-                "valid": false
-            },
-            {
-                "description": "negative prefix",
-                "data": "-1/foo/bar",
-                "valid": false
-            },
-            {
-                "description": "explicit positive prefix",
-                "data": "+1/foo/bar",
-                "valid": false
-            },
-            {
-                "description": "## is not a valid json-pointer",
-                "data": "0##",
-                "valid": false
-            },
-            {
-                "description": "zero cannot be followed by other digits, plus json-pointer",
-                "data": "01/a",
-                "valid": false
-            },
-            {
-                "description": "zero cannot be followed by other digits, plus octothorpe",
-                "data": "01#",
-                "valid": false
-            },
-            {
-                "description": "empty string",
-                "data": "",
-                "valid": false
-            },
-            {
-                "description": "multi-digit integer prefix",
-                "data": "120/foo/bar",
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft2019-09/optional/format/time.json b/json/tests/draft2019-09/optional/format/time.json
deleted file mode 100644
index 3056376..0000000
--- a/json/tests/draft2019-09/optional/format/time.json
+++ /dev/null
@@ -1,216 +0,0 @@
-[
-    {
-        "description": "validation of time strings",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "format": "time"
-        },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            },
-            {
-                "description": "a valid time string",
-                "data": "08:30:06Z",
-                "valid": true
-            },
-            {
-                "description": "a valid time string with leap second, Zulu",
-                "data": "23:59:60Z",
-                "valid": true
-            },
-            {
-                "description": "invalid leap second, Zulu (wrong hour)",
-                "data": "22:59:60Z",
-                "valid": false
-            },
-            {
-                "description": "invalid leap second, Zulu (wrong minute)",
-                "data": "23:58:60Z",
-                "valid": false
-            },
-            {
-                "description": "valid leap second, zero time-offset",
-                "data": "23:59:60+00:00",
-                "valid": true
-            },
-            {
-                "description": "invalid leap second, zero time-offset (wrong hour)",
-                "data": "22:59:60+00:00",
-                "valid": false
-            },
-            {
-                "description": "invalid leap second, zero time-offset (wrong minute)",
-                "data": "23:58:60+00:00",
-                "valid": false
-            },
-            {
-                "description": "valid leap second, positive time-offset",
-                "data": "01:29:60+01:30",
-                "valid": true
-            },
-            {
-                "description": "valid leap second, large positive time-offset",
-                "data": "23:29:60+23:30",
-                "valid": true
-            },
-            {
-                "description": "invalid leap second, positive time-offset (wrong hour)",
-                "data": "23:59:60+01:00",
-                "valid": false
-            },
-            {
-                "description": "invalid leap second, positive time-offset (wrong minute)",
-                "data": "23:59:60+00:30",
-                "valid": false
-            },
-            {
-                "description": "valid leap second, negative time-offset",
-                "data": "15:59:60-08:00",
-                "valid": true
-            },
-            {
-                "description": "valid leap second, large negative time-offset",
-                "data": "00:29:60-23:30",
-                "valid": true
-            },
-            {
-                "description": "invalid leap second, negative time-offset (wrong hour)",
-                "data": "23:59:60-01:00",
-                "valid": false
-            },
-            {
-                "description": "invalid leap second, negative time-offset (wrong minute)",
-                "data": "23:59:60-00:30",
-                "valid": false
-            },
-            {
-                "description": "a valid time string with second fraction",
-                "data": "23:20:50.52Z",
-                "valid": true
-            },
-            {
-                "description": "a valid time string with precise second fraction",
-                "data": "08:30:06.283185Z",
-                "valid": true
-            },
-            {
-                "description": "a valid time string with plus offset",
-                "data": "08:30:06+00:20",
-                "valid": true
-            },
-            {
-                "description": "a valid time string with minus offset",
-                "data": "08:30:06-08:00",
-                "valid": true
-            },
-            {
-                "description": "a valid time string with case-insensitive Z",
-                "data": "08:30:06z",
-                "valid": true
-            },
-            {
-                "description": "an invalid time string with invalid hour",
-                "data": "24:00:00Z",
-                "valid": false
-            },
-            {
-                "description": "an invalid time string with invalid minute",
-                "data": "00:60:00Z",
-                "valid": false
-            },
-            {
-                "description": "an invalid time string with invalid second",
-                "data": "00:00:61Z",
-                "valid": false
-            },
-            {
-                "description": "an invalid time string with invalid leap second (wrong hour)",
-                "data": "22:59:60Z",
-                "valid": false
-            },
-            {
-                "description": "an invalid time string with invalid leap second (wrong minute)",
-                "data": "23:58:60Z",
-                "valid": false
-            },
-            {
-                "description": "an invalid time string with invalid time numoffset hour",
-                "data": "01:02:03+24:00",
-                "valid": false
-            },
-            {
-                "description": "an invalid time string with invalid time numoffset minute",
-                "data": "01:02:03+00:60",
-                "valid": false
-            },
-            {
-                "description": "an invalid time string with invalid time with both Z and numoffset",
-                "data": "01:02:03Z+00:30",
-                "valid": false
-            },
-            {
-                "description": "an invalid offset indicator",
-                "data": "08:30:06 PST",
-                "valid": false
-            },
-            {
-                "description": "only RFC3339 not all of ISO 8601 are valid",
-                "data": "01:01:01,1111",
-                "valid": false
-            },
-            {
-                "description": "no time offset",
-                "data": "12:00:00",
-                "valid": false
-            },
-            {
-                "description": "no time offset with second fraction",
-                "data": "12:00:00.52",
-                "valid": false
-            },
-            {
-                "description": "invalid non-ASCII '২' (a Bengali 2)",
-                "data": "1২:00:00Z",
-                "valid": false
-            },
-            {
-                "description": "offset not starting with plus or minus",
-                "data": "08:30:06#00:20",
-                "valid": false
-            },
-            {
-                "description": "contains letters",
-                "data": "ab:cd:ef",
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft2019-09/optional/format/unknown.json b/json/tests/draft2019-09/optional/format/unknown.json
deleted file mode 100644
index c89f730..0000000
--- a/json/tests/draft2019-09/optional/format/unknown.json
+++ /dev/null
@@ -1,46 +0,0 @@
-[
-    {
-        "description": "unknown format",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "format": "unknown"
-        },
-        "tests": [
-            {
-                "description": "unknown formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "unknown formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "unknown formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "unknown formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "unknown formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "unknown formats ignore nulls",
-                "data": null,
-                "valid": true
-            },
-            {
-                "description": "unknown formats ignore strings",
-                "data": "string",
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft2019-09/optional/format/uri-reference.json b/json/tests/draft2019-09/optional/format/uri-reference.json
deleted file mode 100644
index 2c49da6..0000000
--- a/json/tests/draft2019-09/optional/format/uri-reference.json
+++ /dev/null
@@ -1,76 +0,0 @@
-[
-    {
-        "description": "validation of URI References",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "format": "uri-reference"
-        },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            },
-            {
-                "description": "a valid URI",
-                "data": "http://foo.bar/?baz=qux#quux",
-                "valid": true
-            },
-            {
-                "description": "a valid protocol-relative URI Reference",
-                "data": "//foo.bar/?baz=qux#quux",
-                "valid": true
-            },
-            {
-                "description": "a valid relative URI Reference",
-                "data": "/abc",
-                "valid": true
-            },
-            {
-                "description": "an invalid URI Reference",
-                "data": "\\\\WINDOWS\\fileshare",
-                "valid": false
-            },
-            {
-                "description": "a valid URI Reference",
-                "data": "abc",
-                "valid": true
-            },
-            {
-                "description": "a valid URI fragment",
-                "data": "#fragment",
-                "valid": true
-            },
-            {
-                "description": "an invalid URI fragment",
-                "data": "#frag\\ment",
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft2019-09/optional/format/uri-template.json b/json/tests/draft2019-09/optional/format/uri-template.json
deleted file mode 100644
index f4aee10..0000000
--- a/json/tests/draft2019-09/optional/format/uri-template.json
+++ /dev/null
@@ -1,61 +0,0 @@
-[
-    {
-        "description": "format: uri-template",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "format": "uri-template"
-        },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            },
-            {
-                "description": "a valid uri-template",
-                "data": "http://example.com/dictionary/{term:1}/{term}",
-                "valid": true
-            },
-            {
-                "description": "an invalid uri-template",
-                "data": "http://example.com/dictionary/{term:1}/{term",
-                "valid": false
-            },
-            {
-                "description": "a valid uri-template without variables",
-                "data": "http://example.com/dictionary",
-                "valid": true
-            },
-            {
-                "description": "a valid relative uri-template",
-                "data": "dictionary/{term:1}/{term}",
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft2019-09/optional/format/uri.json b/json/tests/draft2019-09/optional/format/uri.json
deleted file mode 100644
index ad67840..0000000
--- a/json/tests/draft2019-09/optional/format/uri.json
+++ /dev/null
@@ -1,141 +0,0 @@
-[
-    {
-        "description": "validation of URIs",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "format": "uri"
-        },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            },
-            {
-                "description": "a valid URL with anchor tag",
-                "data": "http://foo.bar/?baz=qux#quux",
-                "valid": true
-            },
-            {
-                "description": "a valid URL with anchor tag and parentheses",
-                "data": "http://foo.com/blah_(wikipedia)_blah#cite-1",
-                "valid": true
-            },
-            {
-                "description": "a valid URL with URL-encoded stuff",
-                "data": "http://foo.bar/?q=Test%20URL-encoded%20stuff",
-                "valid": true
-            },
-            {
-                "description": "a valid puny-coded URL ",
-                "data": "http://xn--nw2a.xn--j6w193g/",
-                "valid": true
-            },
-            {
-                "description": "a valid URL with many special characters",
-                "data": "http://-.~_!$&'()*+,;=:%40:80%2f::::::@example.com",
-                "valid": true
-            },
-            {
-                "description": "a valid URL based on IPv4",
-                "data": "http://223.255.255.254",
-                "valid": true
-            },
-            {
-                "description": "a valid URL with ftp scheme",
-                "data": "ftp://ftp.is.co.za/rfc/rfc1808.txt",
-                "valid": true
-            },
-            {
-                "description": "a valid URL for a simple text file",
-                "data": "http://www.ietf.org/rfc/rfc2396.txt",
-                "valid": true
-            },
-            {
-                "description": "a valid URL ",
-                "data": "ldap://[2001:db8::7]/c=GB?objectClass?one",
-                "valid": true
-            },
-            {
-                "description": "a valid mailto URI",
-                "data": "mailto:John.Doe@example.com",
-                "valid": true
-            },
-            {
-                "description": "a valid newsgroup URI",
-                "data": "news:comp.infosystems.www.servers.unix",
-                "valid": true
-            },
-            {
-                "description": "a valid tel URI",
-                "data": "tel:+1-816-555-1212",
-                "valid": true
-            },
-            {
-                "description": "a valid URN",
-                "data": "urn:oasis:names:specification:docbook:dtd:xml:4.1.2",
-                "valid": true
-            },
-            {
-                "description": "an invalid protocol-relative URI Reference",
-                "data": "//foo.bar/?baz=qux#quux",
-                "valid": false
-            },
-            {
-                "description": "an invalid relative URI Reference",
-                "data": "/abc",
-                "valid": false
-            },
-            {
-                "description": "an invalid URI",
-                "data": "\\\\WINDOWS\\fileshare",
-                "valid": false
-            },
-            {
-                "description": "an invalid URI though valid URI reference",
-                "data": "abc",
-                "valid": false
-            },
-            {
-                "description": "an invalid URI with spaces",
-                "data": "http:// shouldfail.com",
-                "valid": false
-            },
-            {
-                "description": "an invalid URI with spaces and missing scheme",
-                "data": ":// should fail",
-                "valid": false
-            },
-            {
-                "description": "an invalid URI with comma in scheme",
-                "data": "bar,baz:foo",
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft2019-09/optional/format/uuid.json b/json/tests/draft2019-09/optional/format/uuid.json
deleted file mode 100644
index dc6fb7e..0000000
--- a/json/tests/draft2019-09/optional/format/uuid.json
+++ /dev/null
@@ -1,116 +0,0 @@
-[
-    {
-        "description": "uuid format",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "format": "uuid"
-        },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            },
-            {
-                "description": "all upper-case",
-                "data": "2EB8AA08-AA98-11EA-B4AA-73B441D16380",
-                "valid": true
-            },
-            {
-                "description": "all lower-case",
-                "data": "2eb8aa08-aa98-11ea-b4aa-73b441d16380",
-                "valid": true
-            },
-            {
-                "description": "mixed case",
-                "data": "2eb8aa08-AA98-11ea-B4Aa-73B441D16380",
-                "valid": true
-            },
-            {
-                "description": "all zeroes is valid",
-                "data": "00000000-0000-0000-0000-000000000000",
-                "valid": true
-            },
-            {
-                "description": "wrong length",
-                "data": "2eb8aa08-aa98-11ea-b4aa-73b441d1638",
-                "valid": false
-            },
-            {
-                "description": "missing section",
-                "data": "2eb8aa08-aa98-11ea-73b441d16380",
-                "valid": false
-            },
-            {
-                "description": "bad characters (not hex)",
-                "data": "2eb8aa08-aa98-11ea-b4ga-73b441d16380",
-                "valid": false
-            },
-            {
-                "description": "no dashes",
-                "data": "2eb8aa08aa9811eab4aa73b441d16380",
-                "valid": false
-            },
-            {
-                "description": "too few dashes",
-                "data": "2eb8aa08aa98-11ea-b4aa73b441d16380",
-                "valid": false
-            },
-            {
-                "description": "too many dashes",
-                "data": "2eb8-aa08-aa98-11ea-b4aa73b44-1d16380",
-                "valid": false
-            },
-            {
-                "description": "dashes in the wrong spot",
-                "data": "2eb8aa08aa9811eab4aa73b441d16380----",
-                "valid": false
-            },
-            {
-                "description": "valid version 4",
-                "data": "98d80576-482e-427f-8434-7f86890ab222",
-                "valid": true
-            },
-            {
-                "description": "valid version 5",
-                "data": "99c17cbb-656f-564a-940f-1a4568f03487",
-                "valid": true
-            },
-            {
-                "description": "hypothetical version 6",
-                "data": "99c17cbb-656f-664a-940f-1a4568f03487",
-                "valid": true
-            },
-            {
-                "description": "hypothetical version 15",
-                "data": "99c17cbb-656f-f64a-940f-1a4568f03487",
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft2019-09/optional/no-schema.json b/json/tests/draft2019-09/optional/no-schema.json
deleted file mode 100644
index 676e6b5..0000000
--- a/json/tests/draft2019-09/optional/no-schema.json
+++ /dev/null
@@ -1,26 +0,0 @@
-[
-    {
-        "description": "validation without $schema",
-        "comment": "minLength is the same across all drafts",
-        "schema": {
-            "minLength": 2
-        },
-        "tests": [
-            {
-                "description": "a 3-character string is valid",
-                "data": "foo",
-                "valid": true
-            },
-            {
-                "description": "a 1-character string is not valid",
-                "data": "a",
-                "valid": false
-            },
-            {
-                "description": "a non-string is valid",
-                "data": 5,
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft2019-09/optional/non-bmp-regex.json b/json/tests/draft2019-09/optional/non-bmp-regex.json
deleted file mode 100644
index ef25000..0000000
--- a/json/tests/draft2019-09/optional/non-bmp-regex.json
+++ /dev/null
@@ -1,86 +0,0 @@
-[
-    {
-        "description": "Proper UTF-16 surrogate pair handling: pattern",
-        "comment": "Optional because .Net doesn't correctly handle 32-bit Unicode characters",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "pattern": "^🐲*$"
-        },
-        "tests": [
-            {
-                "description": "matches empty",
-                "data": "",
-                "valid": true
-            },
-            {
-                "description": "matches single",
-                "data": "🐲",
-                "valid": true
-            },
-            {
-                "description": "matches two",
-                "data": "🐲🐲",
-                "valid": true
-            },
-            {
-                "description": "doesn't match one",
-                "data": "🐉",
-                "valid": false
-            },
-            {
-                "description": "doesn't match two",
-                "data": "🐉🐉",
-                "valid": false
-            },
-            {
-                "description": "doesn't match one ASCII",
-                "data": "D",
-                "valid": false
-            },
-            {
-                "description": "doesn't match two ASCII",
-                "data": "DD",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "Proper UTF-16 surrogate pair handling: patternProperties",
-        "comment": "Optional because .Net doesn't correctly handle 32-bit Unicode characters",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "patternProperties": {
-                "^🐲*$": {
-                    "type": "integer"
-                }
-            }
-        },
-        "tests": [
-            {
-                "description": "matches empty",
-                "data": { "": 1 },
-                "valid": true
-            },
-            {
-                "description": "matches single",
-                "data": { "🐲": 1 },
-                "valid": true
-            },
-            {
-                "description": "matches two",
-                "data": { "🐲🐲": 1 },
-                "valid": true
-            },
-            {
-                "description": "doesn't match one",
-                "data": { "🐲": "hello" },
-                "valid": false
-            },
-            {
-                "description": "doesn't match two",
-                "data": { "🐲🐲": "hello" },
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft2019-09/optional/refOfUnknownKeyword.json b/json/tests/draft2019-09/optional/refOfUnknownKeyword.json
deleted file mode 100644
index eee1c33..0000000
--- a/json/tests/draft2019-09/optional/refOfUnknownKeyword.json
+++ /dev/null
@@ -1,46 +0,0 @@
-[
-    {
-        "description": "reference of a root arbitrary keyword ",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "unknown-keyword": {"type": "integer"},
-            "properties": {
-                "bar": {"$ref": "#/unknown-keyword"}
-            }
-        },
-        "tests": [
-            {
-                "description": "match",
-                "data": {"bar": 3},
-                "valid": true
-            },
-            {
-                "description": "mismatch",
-                "data": {"bar": true},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "reference of an arbitrary keyword of a sub-schema",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "properties": {
-                "foo": {"unknown-keyword": {"type": "integer"}},
-                "bar": {"$ref": "#/properties/foo/unknown-keyword"}
-            }
-        },
-        "tests": [
-            {
-                "description": "match",
-                "data": {"bar": 3},
-                "valid": true
-            },
-            {
-                "description": "mismatch",
-                "data": {"bar": true},
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft2019-09/pattern.json b/json/tests/draft2019-09/pattern.json
deleted file mode 100644
index cfb8774..0000000
--- a/json/tests/draft2019-09/pattern.json
+++ /dev/null
@@ -1,65 +0,0 @@
-[
-    {
-        "description": "pattern validation",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "pattern": "^a*$"
-        },
-        "tests": [
-            {
-                "description": "a matching pattern is valid",
-                "data": "aaa",
-                "valid": true
-            },
-            {
-                "description": "a non-matching pattern is invalid",
-                "data": "abc",
-                "valid": false
-            },
-            {
-                "description": "ignores booleans",
-                "data": true,
-                "valid": true
-            },
-            {
-                "description": "ignores integers",
-                "data": 123,
-                "valid": true
-            },
-            {
-                "description": "ignores floats",
-                "data": 1.0,
-                "valid": true
-            },
-            {
-                "description": "ignores objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "ignores arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "ignores null",
-                "data": null,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "pattern is not anchored",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "pattern": "a+"
-        },
-        "tests": [
-            {
-                "description": "matches a substring",
-                "data": "xxaayy",
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft2019-09/patternProperties.json b/json/tests/draft2019-09/patternProperties.json
deleted file mode 100644
index 354bb48..0000000
--- a/json/tests/draft2019-09/patternProperties.json
+++ /dev/null
@@ -1,176 +0,0 @@
-[
-    {
-        "description":
-            "patternProperties validates properties matching a regex",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "patternProperties": {
-                "f.*o": {"type": "integer"}
-            }
-        },
-        "tests": [
-            {
-                "description": "a single valid match is valid",
-                "data": {"foo": 1},
-                "valid": true
-            },
-            {
-                "description": "multiple valid matches is valid",
-                "data": {"foo": 1, "foooooo" : 2},
-                "valid": true
-            },
-            {
-                "description": "a single invalid match is invalid",
-                "data": {"foo": "bar", "fooooo": 2},
-                "valid": false
-            },
-            {
-                "description": "multiple invalid matches is invalid",
-                "data": {"foo": "bar", "foooooo" : "baz"},
-                "valid": false
-            },
-            {
-                "description": "ignores arrays",
-                "data": ["foo"],
-                "valid": true
-            },
-            {
-                "description": "ignores strings",
-                "data": "foo",
-                "valid": true
-            },
-            {
-                "description": "ignores other non-objects",
-                "data": 12,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "multiple simultaneous patternProperties are validated",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "patternProperties": {
-                "a*": {"type": "integer"},
-                "aaa*": {"maximum": 20}
-            }
-        },
-        "tests": [
-            {
-                "description": "a single valid match is valid",
-                "data": {"a": 21},
-                "valid": true
-            },
-            {
-                "description": "a simultaneous match is valid",
-                "data": {"aaaa": 18},
-                "valid": true
-            },
-            {
-                "description": "multiple matches is valid",
-                "data": {"a": 21, "aaaa": 18},
-                "valid": true
-            },
-            {
-                "description": "an invalid due to one is invalid",
-                "data": {"a": "bar"},
-                "valid": false
-            },
-            {
-                "description": "an invalid due to the other is invalid",
-                "data": {"aaaa": 31},
-                "valid": false
-            },
-            {
-                "description": "an invalid due to both is invalid",
-                "data": {"aaa": "foo", "aaaa": 31},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "regexes are not anchored by default and are case sensitive",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "patternProperties": {
-                "[0-9]{2,}": { "type": "boolean" },
-                "X_": { "type": "string" }
-            }
-        },
-        "tests": [
-            {
-                "description": "non recognized members are ignored",
-                "data": { "answer 1": "42" },
-                "valid": true
-            },
-            {
-                "description": "recognized members are accounted for",
-                "data": { "a31b": null },
-                "valid": false
-            },
-            {
-                "description": "regexes are case sensitive",
-                "data": { "a_x_3": 3 },
-                "valid": true
-            },
-            {
-                "description": "regexes are case sensitive, 2",
-                "data": { "a_X_3": 3 },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "patternProperties with boolean schemas",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "patternProperties": {
-                "f.*": true,
-                "b.*": false
-            }
-        },
-        "tests": [
-            {
-                "description": "object with property matching schema true is valid",
-                "data": {"foo": 1},
-                "valid": true
-            },
-            {
-                "description": "object with property matching schema false is invalid",
-                "data": {"bar": 2},
-                "valid": false
-            },
-            {
-                "description": "object with both properties is invalid",
-                "data": {"foo": 1, "bar": 2},
-                "valid": false
-            },
-            {
-                "description": "object with a property matching both true and false is invalid",
-                "data": {"foobar":1},
-                "valid": false
-            },
-            {
-                "description": "empty object is valid",
-                "data": {},
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "patternProperties with null valued instance properties",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "patternProperties": {
-                "^.*bar$": {"type": "null"}
-            }
-        },
-        "tests": [
-            {
-                "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
deleted file mode 100644
index a53429c..0000000
--- a/json/tests/draft2019-09/properties.json
+++ /dev/null
@@ -1,242 +0,0 @@
-[
-    {
-        "description": "object properties validation",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "properties": {
-                "foo": {"type": "integer"},
-                "bar": {"type": "string"}
-            }
-        },
-        "tests": [
-            {
-                "description": "both properties present and valid is valid",
-                "data": {"foo": 1, "bar": "baz"},
-                "valid": true
-            },
-            {
-                "description": "one property invalid is invalid",
-                "data": {"foo": 1, "bar": {}},
-                "valid": false
-            },
-            {
-                "description": "both properties invalid is invalid",
-                "data": {"foo": [], "bar": {}},
-                "valid": false
-            },
-            {
-                "description": "doesn't invalidate other properties",
-                "data": {"quux": []},
-                "valid": true
-            },
-            {
-                "description": "ignores arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "ignores other non-objects",
-                "data": 12,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description":
-            "properties, patternProperties, additionalProperties interaction",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "properties": {
-                "foo": {"type": "array", "maxItems": 3},
-                "bar": {"type": "array"}
-            },
-            "patternProperties": {"f.o": {"minItems": 2}},
-            "additionalProperties": {"type": "integer"}
-        },
-        "tests": [
-            {
-                "description": "property validates property",
-                "data": {"foo": [1, 2]},
-                "valid": true
-            },
-            {
-                "description": "property invalidates property",
-                "data": {"foo": [1, 2, 3, 4]},
-                "valid": false
-            },
-            {
-                "description": "patternProperty invalidates property",
-                "data": {"foo": []},
-                "valid": false
-            },
-            {
-                "description": "patternProperty validates nonproperty",
-                "data": {"fxo": [1, 2]},
-                "valid": true
-            },
-            {
-                "description": "patternProperty invalidates nonproperty",
-                "data": {"fxo": []},
-                "valid": false
-            },
-            {
-                "description": "additionalProperty ignores property",
-                "data": {"bar": []},
-                "valid": true
-            },
-            {
-                "description": "additionalProperty validates others",
-                "data": {"quux": 3},
-                "valid": true
-            },
-            {
-                "description": "additionalProperty invalidates others",
-                "data": {"quux": "foo"},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "properties with boolean schema",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "properties": {
-                "foo": true,
-                "bar": false
-            }
-        },
-        "tests": [
-            {
-                "description": "no property present is valid",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "only 'true' property present is valid",
-                "data": {"foo": 1},
-                "valid": true
-            },
-            {
-                "description": "only 'false' property present is invalid",
-                "data": {"bar": 2},
-                "valid": false
-            },
-            {
-                "description": "both properties present is invalid",
-                "data": {"foo": 1, "bar": 2},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "properties with escaped characters",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "properties": {
-                "foo\nbar": {"type": "number"},
-                "foo\"bar": {"type": "number"},
-                "foo\\bar": {"type": "number"},
-                "foo\rbar": {"type": "number"},
-                "foo\tbar": {"type": "number"},
-                "foo\fbar": {"type": "number"}
-            }
-        },
-        "tests": [
-            {
-                "description": "object with all numbers is valid",
-                "data": {
-                    "foo\nbar": 1,
-                    "foo\"bar": 1,
-                    "foo\\bar": 1,
-                    "foo\rbar": 1,
-                    "foo\tbar": 1,
-                    "foo\fbar": 1
-                },
-                "valid": true
-            },
-            {
-                "description": "object with strings is invalid",
-                "data": {
-                    "foo\nbar": "1",
-                    "foo\"bar": "1",
-                    "foo\\bar": "1",
-                    "foo\rbar": "1",
-                    "foo\tbar": "1",
-                    "foo\fbar": "1"
-                },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "properties with null valued instance properties",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "properties": {
-                "foo": {"type": "null"}
-            }
-        },
-        "tests": [
-            {
-                "description": "allows null values",
-                "data": {"foo": null},
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "properties whose names are Javascript object property names",
-        "comment": "Ensure JS implementations don't universally consider e.g. __proto__ to always be present in an object.",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "properties": {
-                "__proto__": {"type": "number"},
-                "toString": {
-                    "properties": { "length": { "type": "string" } }
-                },
-                "constructor": {"type": "number"}
-            }
-        },
-        "tests": [
-            {
-                "description": "ignores arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "ignores other non-objects",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "none of the properties mentioned",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "__proto__ not valid",
-                "data": { "__proto__": "foo" },
-                "valid": false
-            },
-            {
-                "description": "toString not valid",
-                "data": { "toString": { "length": 37 } },
-                "valid": false
-            },
-            {
-                "description": "constructor not valid",
-                "data": { "constructor": { "length": 37 } },
-                "valid": false
-            },
-            {
-                "description": "all present and valid",
-                "data": { 
-                    "__proto__": 12,
-                    "toString": { "length": "foo" },
-                    "constructor": 37
-                },
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft2019-09/propertyNames.json b/json/tests/draft2019-09/propertyNames.json
deleted file mode 100644
index b7fecbf..0000000
--- a/json/tests/draft2019-09/propertyNames.json
+++ /dev/null
@@ -1,115 +0,0 @@
-[
-    {
-        "description": "propertyNames validation",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "propertyNames": {"maxLength": 3}
-        },
-        "tests": [
-            {
-                "description": "all property names valid",
-                "data": {
-                    "f": {},
-                    "foo": {}
-                },
-                "valid": true
-            },
-            {
-                "description": "some property names invalid",
-                "data": {
-                    "foo": {},
-                    "foobar": {}
-                },
-                "valid": false
-            },
-            {
-                "description": "object without properties is valid",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "ignores arrays",
-                "data": [1, 2, 3, 4],
-                "valid": true
-            },
-            {
-                "description": "ignores strings",
-                "data": "foobar",
-                "valid": true
-            },
-            {
-                "description": "ignores other non-objects",
-                "data": 12,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "propertyNames validation with pattern",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "propertyNames": { "pattern": "^a+$" }
-        },
-        "tests": [
-            {
-                "description": "matching property names valid",
-                "data": {
-                    "a": {},
-                    "aa": {},
-                    "aaa": {}
-                },
-                "valid": true
-            },
-            {
-                "description": "non-matching property name is invalid",
-                "data": {
-                    "aaA": {}
-                },
-                "valid": false
-            },
-            {
-                "description": "object without properties is valid",
-                "data": {},
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "propertyNames with boolean schema true",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "propertyNames": true
-        },
-        "tests": [
-            {
-                "description": "object with any properties is valid",
-                "data": {"foo": 1},
-                "valid": true
-            },
-            {
-                "description": "empty object is valid",
-                "data": {},
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "propertyNames with boolean schema false",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "propertyNames": false
-        },
-        "tests": [
-            {
-                "description": "object with any properties is invalid",
-                "data": {"foo": 1},
-                "valid": false
-            },
-            {
-                "description": "empty object is valid",
-                "data": {},
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft2019-09/recursiveRef.json b/json/tests/draft2019-09/recursiveRef.json
deleted file mode 100644
index 1e713ff..0000000
--- a/json/tests/draft2019-09/recursiveRef.json
+++ /dev/null
@@ -1,408 +0,0 @@
-[
-    {
-        "description": "$recursiveRef without $recursiveAnchor works like $ref",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "properties": {
-                "foo": { "$recursiveRef": "#" }
-            },
-            "additionalProperties": false
-        },
-        "tests": [
-            {
-                "description": "match",
-                "data": {"foo": false},
-                "valid": true
-            },
-            {
-                "description": "recursive match",
-                "data": { "foo": { "foo": false } },
-                "valid": true
-            },
-            {
-                "description": "mismatch",
-                "data": { "bar": false },
-                "valid": false
-            },
-            {
-                "description": "recursive mismatch",
-                "data": { "foo": { "bar": false } },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "$recursiveRef without using nesting",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "$id": "http://localhost:4242/draft2019-09/recursiveRef2/schema.json",
-            "$defs": {
-                "myobject": {
-                    "$id": "myobject.json",
-                    "$recursiveAnchor": true,
-                    "anyOf": [
-                        { "type": "string" },
-                        {
-                            "type": "object",
-                            "additionalProperties": { "$recursiveRef": "#" }
-                        }
-                    ]
-                }
-            },
-            "anyOf": [
-                { "type": "integer" },
-                { "$ref": "#/$defs/myobject" }
-            ]
-        },
-        "tests": [
-            {
-                "description": "integer matches at the outer level",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "single level match",
-                "data": { "foo": "hi" },
-                "valid": true
-            },
-            {
-                "description": "integer does not match as a property value",
-                "data": { "foo": 1 },
-                "valid": false
-            },
-            {
-                "description": "two levels, properties match with inner definition",
-                "data": { "foo": { "bar": "hi" } },
-                "valid": true
-            },
-            {
-                "description": "two levels, no match",
-                "data": { "foo": { "bar": 1 } },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "$recursiveRef with nesting",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "$id": "http://localhost:4242/draft2019-09/recursiveRef3/schema.json",
-            "$recursiveAnchor": true,
-            "$defs": {
-                "myobject": {
-                    "$id": "myobject.json",
-                    "$recursiveAnchor": true,
-                    "anyOf": [
-                        { "type": "string" },
-                        {
-                            "type": "object",
-                            "additionalProperties": { "$recursiveRef": "#" }
-                        }
-                    ]
-                }
-            },
-            "anyOf": [
-                { "type": "integer" },
-                { "$ref": "#/$defs/myobject" }
-            ]
-        },
-        "tests": [
-            {
-                "description": "integer matches at the outer level",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "single level match",
-                "data": { "foo": "hi" },
-                "valid": true
-            },
-            {
-                "description": "integer now matches as a property value",
-                "data": { "foo": 1 },
-                "valid": true
-            },
-            {
-                "description": "two levels, properties match with inner definition",
-                "data": { "foo": { "bar": "hi" } },
-                "valid": true
-            },
-            {
-                "description": "two levels, properties match with $recursiveRef",
-                "data": { "foo": { "bar": 1 } },
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "$recursiveRef with $recursiveAnchor: false works like $ref",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "$id": "http://localhost:4242/draft2019-09/recursiveRef4/schema.json",
-            "$recursiveAnchor": false,
-            "$defs": {
-                "myobject": {
-                    "$id": "myobject.json",
-                    "$recursiveAnchor": false,
-                    "anyOf": [
-                        { "type": "string" },
-                        {
-                            "type": "object",
-                            "additionalProperties": { "$recursiveRef": "#" }
-                        }
-                    ]
-                }
-            },
-            "anyOf": [
-                { "type": "integer" },
-                { "$ref": "#/$defs/myobject" }
-            ]
-        },
-        "tests": [
-            {
-                "description": "integer matches at the outer level",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "single level match",
-                "data": { "foo": "hi" },
-                "valid": true
-            },
-            {
-                "description": "integer does not match as a property value",
-                "data": { "foo": 1 },
-                "valid": false
-            },
-            {
-                "description": "two levels, properties match with inner definition",
-                "data": { "foo": { "bar": "hi" } },
-                "valid": true
-            },
-            {
-                "description": "two levels, integer does not match as a property value",
-                "data": { "foo": { "bar": 1 } },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "$recursiveRef with no $recursiveAnchor works like $ref",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "$id": "http://localhost:4242/draft2019-09/recursiveRef5/schema.json",
-            "$defs": {
-                "myobject": {
-                    "$id": "myobject.json",
-                    "$recursiveAnchor": false,
-                    "anyOf": [
-                        { "type": "string" },
-                        {
-                            "type": "object",
-                            "additionalProperties": { "$recursiveRef": "#" }
-                        }
-                    ]
-                }
-            },
-            "anyOf": [
-                { "type": "integer" },
-                { "$ref": "#/$defs/myobject" }
-            ]
-        },
-        "tests": [
-            {
-                "description": "integer matches at the outer level",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "single level match",
-                "data": { "foo": "hi" },
-                "valid": true
-            },
-            {
-                "description": "integer does not match as a property value",
-                "data": { "foo": 1 },
-                "valid": false
-            },
-            {
-                "description": "two levels, properties match with inner definition",
-                "data": { "foo": { "bar": "hi" } },
-                "valid": true
-            },
-            {
-                "description": "two levels, integer does not match as a property value",
-                "data": { "foo": { "bar": 1 } },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "$recursiveRef with no $recursiveAnchor in the initial target schema resource",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "$id": "http://localhost:4242/draft2019-09/recursiveRef6/base.json",
-            "$recursiveAnchor": true,
-            "anyOf": [
-                { "type": "boolean" },
-                {
-                    "type": "object",
-                    "additionalProperties": {
-                        "$id": "http://localhost:4242/draft2019-09/recursiveRef6/inner.json",
-                        "$comment": "there is no $recursiveAnchor: true here, so we do NOT recurse to the base",
-                        "anyOf": [
-                            { "type": "integer" },
-                            { "type": "object", "additionalProperties": { "$recursiveRef": "#" } }
-                        ]
-                    }
-                }
-            ]
-        },
-        "tests": [
-            {
-                "description": "leaf node does not match; no recursion",
-                "data": { "foo": true },
-                "valid": false
-            },
-            {
-                "description": "leaf node matches: recursion uses the inner schema",
-                "data": { "foo": { "bar": 1 } },
-                "valid": true
-            },
-            {
-                "description": "leaf node does not match: recursion uses the inner schema",
-                "data": { "foo": { "bar": true } },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "$recursiveRef with no $recursiveAnchor in the outer schema resource",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "$id": "http://localhost:4242/draft2019-09/recursiveRef7/base.json",
-            "anyOf": [
-                { "type": "boolean" },
-                {
-                    "type": "object",
-                    "additionalProperties": {
-                        "$id": "http://localhost:4242/draft2019-09/recursiveRef7/inner.json",
-                        "$recursiveAnchor": true,
-                        "anyOf": [
-                            { "type": "integer" },
-                            { "type": "object", "additionalProperties": { "$recursiveRef": "#" } }
-                        ]
-                    }
-                }
-            ]
-        },
-        "tests": [
-            {
-                "description": "leaf node does not match; no recursion",
-                "data": { "foo": true },
-                "valid": false
-            },
-            {
-                "description": "leaf node matches: recursion only uses inner schema",
-                "data": { "foo": { "bar": 1 } },
-                "valid": true
-            },
-            {
-                "description": "leaf node does not match: recursion only uses inner schema",
-                "data": { "foo": { "bar": true } },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "multiple dynamic paths to the $recursiveRef keyword",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "$id": "recursiveRef8_main.json",
-            "$defs": {
-                "inner": {
-                    "$id": "recursiveRef8_inner.json",
-                    "$recursiveAnchor": true,
-                    "title": "inner",
-                    "additionalProperties": {
-                        "$recursiveRef": "#"
-                    }
-                }
-            },
-            "if": {
-                "propertyNames": {
-                    "pattern": "^[a-m]"
-                }
-            },
-            "then": {
-                "title": "any type of node",
-                "$id": "recursiveRef8_anyLeafNode.json",
-                "$recursiveAnchor": true,
-                "$ref": "recursiveRef8_inner.json"
-            },
-            "else": {
-                "title": "integer node",
-                "$id": "recursiveRef8_integerNode.json",
-                "$recursiveAnchor": true,
-                "type": [ "object", "integer" ],
-                "$ref": "recursiveRef8_inner.json"
-            }
-        },
-        "tests": [
-            {
-                "description": "recurse to anyLeafNode - floats are allowed",
-                "data": { "alpha": 1.1 },
-                "valid": true
-            },
-            {
-                "description": "recurse to integerNode - floats are not allowed",
-                "data": { "november": 1.1 },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "dynamic $recursiveRef destination (not predictable at schema compile time)",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "$id": "main.json",
-            "$defs": {
-                "inner": {
-                    "$id": "inner.json",
-                    "$recursiveAnchor": true,
-                    "title": "inner",
-                    "additionalProperties": {
-                        "$recursiveRef": "#"
-                    }
-                }
-
-            },
-            "if": { "propertyNames": { "pattern": "^[a-m]" } },
-            "then": {
-                "title": "any type of node",
-                "$id": "anyLeafNode.json",
-                "$recursiveAnchor": true,
-                "$ref": "main.json#/$defs/inner"
-            },
-            "else": {
-                "title": "integer node",
-                "$id": "integerNode.json",
-                "$recursiveAnchor": true,
-                "type": [ "object", "integer" ],
-                "$ref": "main.json#/$defs/inner"
-            }
-        },
-        "tests": [
-            {
-                "description": "numeric node",
-                "data": { "alpha": 1.1 },
-                "valid": true
-            },
-            {
-                "description": "integer node",
-                "data": { "november": 1.1 },
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft2019-09/ref.json b/json/tests/draft2019-09/ref.json
deleted file mode 100644
index f8c03be..0000000
--- a/json/tests/draft2019-09/ref.json
+++ /dev/null
@@ -1,887 +0,0 @@
-[
-    {
-        "description": "root pointer ref",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "properties": {
-                "foo": {"$ref": "#"}
-            },
-            "additionalProperties": false
-        },
-        "tests": [
-            {
-                "description": "match",
-                "data": {"foo": false},
-                "valid": true
-            },
-            {
-                "description": "recursive match",
-                "data": {"foo": {"foo": false}},
-                "valid": true
-            },
-            {
-                "description": "mismatch",
-                "data": {"bar": false},
-                "valid": false
-            },
-            {
-                "description": "recursive mismatch",
-                "data": {"foo": {"bar": false}},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "relative pointer ref to object",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "properties": {
-                "foo": {"type": "integer"},
-                "bar": {"$ref": "#/properties/foo"}
-            }
-        },
-        "tests": [
-            {
-                "description": "match",
-                "data": {"bar": 3},
-                "valid": true
-            },
-            {
-                "description": "mismatch",
-                "data": {"bar": true},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "relative pointer ref to array",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "items": [
-                {"type": "integer"},
-                {"$ref": "#/items/0"}
-            ]
-        },
-        "tests": [
-            {
-                "description": "match array",
-                "data": [1, 2],
-                "valid": true
-            },
-            {
-                "description": "mismatch array",
-                "data": [1, "foo"],
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "escaped pointer ref",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "$defs": {
-                "tilde~field": {"type": "integer"},
-                "slash/field": {"type": "integer"},
-                "percent%field": {"type": "integer"}
-            },
-            "properties": {
-                "tilde": {"$ref": "#/$defs/tilde~0field"},
-                "slash": {"$ref": "#/$defs/slash~1field"},
-                "percent": {"$ref": "#/$defs/percent%25field"}
-            }
-        },
-        "tests": [
-            {
-                "description": "slash invalid",
-                "data": {"slash": "aoeu"},
-                "valid": false
-            },
-            {
-                "description": "tilde invalid",
-                "data": {"tilde": "aoeu"},
-                "valid": false
-            },
-            {
-                "description": "percent invalid",
-                "data": {"percent": "aoeu"},
-                "valid": false
-            },
-            {
-                "description": "slash valid",
-                "data": {"slash": 123},
-                "valid": true
-            },
-            {
-                "description": "tilde valid",
-                "data": {"tilde": 123},
-                "valid": true
-            },
-            {
-                "description": "percent valid",
-                "data": {"percent": 123},
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "nested refs",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "$defs": {
-                "a": {"type": "integer"},
-                "b": {"$ref": "#/$defs/a"},
-                "c": {"$ref": "#/$defs/b"}
-            },
-            "$ref": "#/$defs/c"
-        },
-        "tests": [
-            {
-                "description": "nested ref valid",
-                "data": 5,
-                "valid": true
-            },
-            {
-                "description": "nested ref invalid",
-                "data": "a",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "ref applies alongside sibling keywords",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "$defs": {
-                "reffed": {
-                    "type": "array"
-                }
-            },
-            "properties": {
-                "foo": {
-                    "$ref": "#/$defs/reffed",
-                    "maxItems": 2
-                }
-            }
-        },
-        "tests": [
-            {
-                "description": "ref valid, maxItems valid",
-                "data": { "foo": [] },
-                "valid": true
-            },
-            {
-                "description": "ref valid, maxItems invalid",
-                "data": { "foo": [1, 2, 3] },
-                "valid": false
-            },
-            {
-                "description": "ref invalid",
-                "data": { "foo": "string" },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "remote ref, containing refs itself",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "$ref": "https://json-schema.org/draft/2019-09/schema"
-        },
-        "tests": [
-            {
-                "description": "remote ref valid",
-                "data": {"minLength": 1},
-                "valid": true
-            },
-            {
-                "description": "remote ref invalid",
-                "data": {"minLength": -1},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "property named $ref that is not a reference",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "properties": {
-                "$ref": {"type": "string"}
-            }
-        },
-        "tests": [
-            {
-                "description": "property named $ref valid",
-                "data": {"$ref": "a"},
-                "valid": true
-            },
-            {
-                "description": "property named $ref invalid",
-                "data": {"$ref": 2},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "property named $ref, containing an actual $ref",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "properties": {
-                "$ref": {"$ref": "#/$defs/is-string"}
-            },
-            "$defs": {
-                "is-string": {
-                    "type": "string"
-                }
-            }
-        },
-        "tests": [
-            {
-                "description": "property named $ref valid",
-                "data": {"$ref": "a"},
-                "valid": true
-            },
-            {
-                "description": "property named $ref invalid",
-                "data": {"$ref": 2},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "$ref to boolean schema true",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "$ref": "#/$defs/bool",
-            "$defs": {
-                "bool": true
-            }
-        },
-        "tests": [
-            {
-                "description": "any value is valid",
-                "data": "foo",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "$ref to boolean schema false",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "$ref": "#/$defs/bool",
-            "$defs": {
-                "bool": false
-            }
-        },
-        "tests": [
-            {
-                "description": "any value is invalid",
-                "data": "foo",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "Recursive references between schemas",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "$id": "http://localhost:1234/draft2019-09/tree",
-            "description": "tree of nodes",
-            "type": "object",
-            "properties": {
-                "meta": {"type": "string"},
-                "nodes": {
-                    "type": "array",
-                    "items": {"$ref": "node"}
-                }
-            },
-            "required": ["meta", "nodes"],
-            "$defs": {
-                "node": {
-                    "$id": "http://localhost:1234/draft2019-09/node",
-                    "description": "node",
-                    "type": "object",
-                    "properties": {
-                        "value": {"type": "number"},
-                        "subtree": {"$ref": "tree"}
-                    },
-                    "required": ["value"]
-                }
-            }
-        },
-        "tests": [
-            {
-                "description": "valid tree",
-                "data": {
-                    "meta": "root",
-                    "nodes": [
-                        {
-                            "value": 1,
-                            "subtree": {
-                                "meta": "child",
-                                "nodes": [
-                                    {"value": 1.1},
-                                    {"value": 1.2}
-                                ]
-                            }
-                        },
-                        {
-                            "value": 2,
-                            "subtree": {
-                                "meta": "child",
-                                "nodes": [
-                                    {"value": 2.1},
-                                    {"value": 2.2}
-                                ]
-                            }
-                        }
-                    ]
-                },
-                "valid": true
-            },
-            {
-                "description": "invalid tree",
-                "data": {
-                    "meta": "root",
-                    "nodes": [
-                        {
-                            "value": 1,
-                            "subtree": {
-                                "meta": "child",
-                                "nodes": [
-                                    {"value": "string is invalid"},
-                                    {"value": 1.2}
-                                ]
-                            }
-                        },
-                        {
-                            "value": 2,
-                            "subtree": {
-                                "meta": "child",
-                                "nodes": [
-                                    {"value": 2.1},
-                                    {"value": 2.2}
-                                ]
-                            }
-                        }
-                    ]
-                },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "refs with quote",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "properties": {
-                "foo\"bar": {"$ref": "#/$defs/foo%22bar"}
-            },
-            "$defs": {
-                "foo\"bar": {"type": "number"}
-            }
-        },
-        "tests": [
-            {
-                "description": "object with numbers is valid",
-                "data": {
-                    "foo\"bar": 1
-                },
-                "valid": true
-            },
-            {
-                "description": "object with strings is invalid",
-                "data": {
-                    "foo\"bar": "1"
-                },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "ref creates new scope when adjacent to keywords",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "$defs": {
-                "A": {
-                    "unevaluatedProperties": false
-                }
-            },
-            "properties": {
-                "prop1": {
-                    "type": "string"
-                }
-            },
-            "$ref": "#/$defs/A"
-        },
-        "tests": [
-            {
-                "description": "referenced subschema doesn't see annotations from properties",
-                "data": {
-                    "prop1": "match"
-                },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "naive replacement of $ref with its destination is not correct",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "$defs": {
-                "a_string": { "type": "string" }
-            },
-            "enum": [
-                { "$ref": "#/$defs/a_string" }
-            ]
-        },
-        "tests": [
-            {
-                "description": "do not evaluate the $ref inside the enum, matching any string",
-                "data": "this is a string",
-                "valid": false
-            },
-            {
-                "description": "do not evaluate the $ref inside the enum, definition exact match",
-                "data": { "type": "string" },
-                "valid": false
-            },
-            {
-                "description": "match the enum exactly",
-                "data": { "$ref": "#/$defs/a_string" },
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "refs with relative uris and defs",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "$id": "http://example.com/schema-relative-uri-defs1.json",
-            "properties": {
-                "foo": {
-                    "$id": "schema-relative-uri-defs2.json",
-                    "$defs": {
-                        "inner": {
-                            "properties": {
-                                "bar": { "type": "string" }
-                            }
-                        }
-                    },
-                    "$ref": "#/$defs/inner"
-                }
-            },
-            "$ref": "schema-relative-uri-defs2.json"
-        },
-        "tests": [
-            {
-                "description": "invalid on inner field",
-                "data": {
-                    "foo": {
-                        "bar": 1
-                    },
-                    "bar": "a"
-                },
-                "valid": false
-            },
-            {
-                "description": "invalid on outer field",
-                "data": {
-                    "foo": {
-                        "bar": "a"
-                    },
-                    "bar": 1
-                },
-                "valid": false
-            },
-            {
-                "description": "valid on both fields",
-                "data": {
-                    "foo": {
-                        "bar": "a"
-                    },
-                    "bar": "a"
-                },
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "relative refs with absolute uris and defs",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "$id": "http://example.com/schema-refs-absolute-uris-defs1.json",
-            "properties": {
-                "foo": {
-                    "$id": "http://example.com/schema-refs-absolute-uris-defs2.json",
-                    "$defs": {
-                        "inner": {
-                            "properties": {
-                                "bar": { "type": "string" }
-                            }
-                        }
-                    },
-                    "$ref": "#/$defs/inner"
-                }
-            },
-            "$ref": "schema-refs-absolute-uris-defs2.json"
-        },
-        "tests": [
-            {
-                "description": "invalid on inner field",
-                "data": {
-                    "foo": {
-                        "bar": 1
-                    },
-                    "bar": "a"
-                },
-                "valid": false
-            },
-            {
-                "description": "invalid on outer field",
-                "data": {
-                    "foo": {
-                        "bar": "a"
-                    },
-                    "bar": 1
-                },
-                "valid": false
-            },
-            {
-                "description": "valid on both fields",
-                "data": {
-                    "foo": {
-                        "bar": "a"
-                    },
-                    "bar": "a"
-                },
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "$id must be resolved against nearest parent, not just immediate parent",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "$id": "http://example.com/a.json",
-            "$defs": {
-                "x": {
-                    "$id": "http://example.com/b/c.json",
-                    "not": {
-                        "$defs": {
-                            "y": {
-                                "$id": "d.json",
-                                "type": "number"
-                            }
-                        }
-                    }
-                }
-            },
-            "allOf": [
-                {
-                    "$ref": "http://example.com/b/d.json"
-                }
-            ]
-        },
-        "tests": [
-            {
-                "description": "number is valid",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "non-number is invalid",
-                "data": "a",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "order of evaluation: $id and $ref",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "$comment": "$id must be evaluated before $ref to get the proper $ref destination",
-            "$id": "/draft2019-09/ref-and-id1/base.json",
-            "$ref": "int.json",
-            "$defs": {
-                "bigint": {
-                    "$comment": "canonical uri: /draft2019-09/ref-and-id1/int.json",
-                    "$id": "int.json",
-                    "maximum": 10
-                },
-                "smallint": {
-                    "$comment": "canonical uri: /draft2019-09/ref-and-id1-int.json",
-                    "$id": "/draft2019-09/ref-and-id1-int.json",
-                    "maximum": 2
-                }
-            }
-        },
-        "tests": [
-            {
-                "description": "data is valid against first definition",
-                "data": 5,
-                "valid": true
-            },
-            {
-                "description": "data is invalid against first definition",
-                "data": 50,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "order of evaluation: $id and $anchor and $ref",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "$comment": "$id must be evaluated before $ref to get the proper $ref destination",
-            "$id": "/draft2019-09/ref-and-id2/base.json",
-            "$ref": "#bigint",
-            "$defs": {
-                "bigint": {
-                    "$comment": "canonical uri: /draft2019-09/ref-and-id2/base.json#/$defs/bigint; another valid uri for this location: /ref-and-id2/base.json#bigint",
-                    "$anchor": "bigint",
-                    "maximum": 10
-                },
-                "smallint": {
-                    "$comment": "canonical uri: /draft2019-09/ref-and-id2#/$defs/smallint; another valid uri for this location: /ref-and-id2/#bigint",
-                    "$id": "/draft2019-09/ref-and-id2/",
-                    "$anchor": "bigint",
-                    "maximum": 2
-                }
-            }
-        },
-        "tests": [
-            {
-                "description": "data is valid against first definition",
-                "data": 5,
-                "valid": true
-            },
-            {
-                "description": "data is invalid against first definition",
-                "data": 50,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "simple URN base URI with $ref via the URN",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "$comment": "URIs do not have to have HTTP(s) schemes",
-            "$id": "urn:uuid:deadbeef-1234-ffff-ffff-4321feebdaed",
-            "minimum": 30,
-            "properties": {
-                "foo": {"$ref": "urn:uuid:deadbeef-1234-ffff-ffff-4321feebdaed"}
-            }
-        },
-        "tests": [
-            {
-                "description": "valid under the URN IDed schema",
-                "data": {"foo": 37},
-                "valid": true
-            },
-            {
-                "description": "invalid under the URN IDed schema",
-                "data": {"foo": 12},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "simple URN base URI with JSON pointer",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "$comment": "URIs do not have to have HTTP(s) schemes",
-            "$id": "urn:uuid:deadbeef-1234-00ff-ff00-4321feebdaed",
-            "properties": {
-                "foo": {"$ref": "#/$defs/bar"}
-            },
-            "$defs": {
-                "bar": {"type": "string"}
-            }
-        },
-        "tests": [
-            {
-                "description": "a string is valid",
-                "data": {"foo": "bar"},
-                "valid": true
-            },
-            {
-                "description": "a non-string is invalid",
-                "data": {"foo": 12},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "URN base URI with NSS",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "$comment": "RFC 8141 §2.2",
-            "$id": "urn:example:1/406/47452/2",
-            "properties": {
-                "foo": {"$ref": "#/$defs/bar"}
-            },
-            "$defs": {
-                "bar": {"type": "string"}
-            }
-        },
-        "tests": [
-            {
-                "description": "a string is valid",
-                "data": {"foo": "bar"},
-                "valid": true
-            },
-            {
-                "description": "a non-string is invalid",
-                "data": {"foo": 12},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "URN base URI with r-component",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "$comment": "RFC 8141 §2.3.1",
-            "$id": "urn:example:foo-bar-baz-qux?+CCResolve:cc=uk",
-            "properties": {
-                "foo": {"$ref": "#/$defs/bar"}
-            },
-            "$defs": {
-                "bar": {"type": "string"}
-            }
-        },
-        "tests": [
-            {
-                "description": "a string is valid",
-                "data": {"foo": "bar"},
-                "valid": true
-            },
-            {
-                "description": "a non-string is invalid",
-                "data": {"foo": 12},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "URN base URI with q-component",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "$comment": "RFC 8141 §2.3.2",
-            "$id": "urn:example:weather?=op=map&lat=39.56&lon=-104.85&datetime=1969-07-21T02:56:15Z",
-            "properties": {
-                "foo": {"$ref": "#/$defs/bar"}
-            },
-            "$defs": {
-                "bar": {"type": "string"}
-            }
-        },
-        "tests": [
-            {
-                "description": "a string is valid",
-                "data": {"foo": "bar"},
-                "valid": true
-            },
-            {
-                "description": "a non-string is invalid",
-                "data": {"foo": 12},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "URN base URI with f-component",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "$comment": "RFC 8141 §2.3.3, but we don't allow fragments",
-            "$ref": "https://json-schema.org/draft/2019-09/schema"
-        },
-        "tests": [
-            {
-                "description": "is invalid",
-                "data": {"$id": "urn:example:foo-bar-baz-qux#somepart"},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "URN base URI with URN and JSON pointer ref",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "$id": "urn:uuid:deadbeef-1234-0000-0000-4321feebdaed",
-            "properties": {
-                "foo": {"$ref": "urn:uuid:deadbeef-1234-0000-0000-4321feebdaed#/$defs/bar"}
-            },
-            "$defs": {
-                "bar": {"type": "string"}
-            }
-        },
-        "tests": [
-            {
-                "description": "a string is valid",
-                "data": {"foo": "bar"},
-                "valid": true
-            },
-            {
-                "description": "a non-string is invalid",
-                "data": {"foo": 12},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "URN base URI with URN and anchor ref",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "$id": "urn:uuid:deadbeef-1234-ff00-00ff-4321feebdaed",
-            "properties": {
-                "foo": {"$ref": "urn:uuid:deadbeef-1234-ff00-00ff-4321feebdaed#something"}
-            },
-            "$defs": {
-                "bar": {
-                    "$anchor": "something",
-                    "type": "string"
-                }
-            }
-        },
-        "tests": [
-            {
-                "description": "a string is valid",
-                "data": {"foo": "bar"},
-                "valid": true
-            },
-            {
-                "description": "a non-string is invalid",
-                "data": {"foo": 12},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "URN ref with nested pointer ref",
-        "schema": {
-            "$ref": "urn:uuid:deadbeef-4321-ffff-ffff-1234feebdaed",
-            "$defs": {
-                "foo": {
-                    "$id": "urn:uuid:deadbeef-4321-ffff-ffff-1234feebdaed",
-                    "$defs": {"bar": {"type": "string"}},
-                    "$ref": "#/$defs/bar"
-                }
-            }
-        },
-        "tests": [
-            {
-                "description": "a string is valid",
-                "data": "bar",
-                "valid": true
-            },
-            {
-                "description": "a non-string is invalid",
-                "data": 12,
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft2019-09/refRemote.json b/json/tests/draft2019-09/refRemote.json
deleted file mode 100644
index 7f45b0b..0000000
--- a/json/tests/draft2019-09/refRemote.json
+++ /dev/null
@@ -1,295 +0,0 @@
-[
-    {
-        "description": "remote ref",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "$ref": "http://localhost:1234/draft2019-09/integer.json"
-        },
-        "tests": [
-            {
-                "description": "remote ref valid",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "remote ref invalid",
-                "data": "a",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "fragment within remote ref",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "$ref": "http://localhost:1234/draft2019-09/subSchemas-defs.json#/$defs/integer"
-        },
-        "tests": [
-            {
-                "description": "remote fragment valid",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "remote fragment invalid",
-                "data": "a",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "ref within remote ref",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "$ref": "http://localhost:1234/draft2019-09/subSchemas-defs.json#/$defs/refToInteger"
-        },
-        "tests": [
-            {
-                "description": "ref within ref valid",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "ref within ref invalid",
-                "data": "a",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "base URI change",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "$id": "http://localhost:1234/draft2019-09/",
-            "items": {
-                "$id": "baseUriChange/",
-                "items": {"$ref": "folderInteger.json"}
-            }
-        },
-        "tests": [
-            {
-                "description": "base URI change ref valid",
-                "data": [[1]],
-                "valid": true
-            },
-            {
-                "description": "base URI change ref invalid",
-                "data": [["a"]],
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "base URI change - change folder",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "$id": "http://localhost:1234/draft2019-09/scope_change_defs1.json",
-            "type" : "object",
-            "properties": {"list": {"$ref": "baseUriChangeFolder/"}},
-            "$defs": {
-                "baz": {
-                    "$id": "baseUriChangeFolder/",
-                    "type": "array",
-                    "items": {"$ref": "folderInteger.json"}
-                }
-            }
-        },
-        "tests": [
-            {
-                "description": "number is valid",
-                "data": {"list": [1]},
-                "valid": true
-            },
-            {
-                "description": "string is invalid",
-                "data": {"list": ["a"]},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "base URI change - change folder in subschema",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "$id": "http://localhost:1234/draft2019-09/scope_change_defs2.json",
-            "type" : "object",
-            "properties": {"list": {"$ref": "baseUriChangeFolderInSubschema/#/$defs/bar"}},
-            "$defs": {
-                "baz": {
-                    "$id": "baseUriChangeFolderInSubschema/",
-                    "$defs": {
-                        "bar": {
-                            "type": "array",
-                            "items": {"$ref": "folderInteger.json"}
-                        }
-                    }
-                }
-            }
-        },
-        "tests": [
-            {
-                "description": "number is valid",
-                "data": {"list": [1]},
-                "valid": true
-            },
-            {
-                "description": "string is invalid",
-                "data": {"list": ["a"]},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "root ref in remote ref",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "$id": "http://localhost:1234/draft2019-09/object",
-            "type": "object",
-            "properties": {
-                "name": {"$ref": "name-defs.json#/$defs/orNull"}
-            }
-        },
-        "tests": [
-            {
-                "description": "string is valid",
-                "data": {
-                    "name": "foo"
-                },
-                "valid": true
-            },
-            {
-                "description": "null is valid",
-                "data": {
-                    "name": null
-                },
-                "valid": true
-            },
-            {
-                "description": "object is invalid",
-                "data": {
-                    "name": {
-                        "name": null
-                    }
-                },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "remote ref with ref to defs",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "$id": "http://localhost:1234/draft2019-09/schema-remote-ref-ref-defs1.json",
-            "$ref": "ref-and-defs.json"
-        },
-        "tests": [
-            {
-                "description": "invalid",
-                "data": {
-                    "bar": 1
-                },
-                "valid": false
-            },
-            {
-                "description": "valid",
-                "data": {
-                    "bar": "a"
-                },
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "Location-independent identifier in remote ref",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "$ref": "http://localhost:1234/draft2019-09/locationIndependentIdentifier.json#/$defs/refToInteger"
-        },
-        "tests": [
-            {
-                "description": "integer is valid",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "string is invalid",
-                "data": "foo",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "retrieved nested refs resolve relative to their URI not $id",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "$id": "http://localhost:1234/draft2019-09/some-id",
-            "properties": {
-                "name": {"$ref": "nested/foo-ref-string.json"}
-            }
-        },
-        "tests": [
-            {
-                "description": "number is invalid",
-                "data": {
-                    "name": {"foo":  1}
-                },
-                "valid": false
-            },
-            {
-                "description": "string is valid",
-                "data": {
-                    "name": {"foo":  "a"}
-                },
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "remote HTTP ref with different $id",
-        "schema": {"$ref": "http://localhost:1234/different-id-ref-string.json"},
-        "tests": [
-            {
-                "description": "number is invalid",
-                "data": 1,
-                "valid": false
-            },
-            {
-                "description": "string is valid",
-                "data": "foo",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "remote HTTP ref with different URN $id",
-        "schema": {"$ref": "http://localhost:1234/urn-ref-string.json"},
-        "tests": [
-            {
-                "description": "number is invalid",
-                "data": 1,
-                "valid": false
-            },
-            {
-                "description": "string is valid",
-                "data": "foo",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "remote HTTP ref with nested absolute ref",
-        "schema": {"$ref": "http://localhost:1234/nested-absolute-ref-to-string.json"},
-        "tests": [
-            {
-                "description": "number is invalid",
-                "data": 1,
-                "valid": false
-            },
-            {
-                "description": "string is valid",
-                "data": "foo",
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft2019-09/required.json b/json/tests/draft2019-09/required.json
deleted file mode 100644
index bca98a9..0000000
--- a/json/tests/draft2019-09/required.json
+++ /dev/null
@@ -1,158 +0,0 @@
-[
-    {
-        "description": "required validation",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "properties": {
-                "foo": {},
-                "bar": {}
-            },
-            "required": ["foo"]
-        },
-        "tests": [
-            {
-                "description": "present required property is valid",
-                "data": {"foo": 1},
-                "valid": true
-            },
-            {
-                "description": "non-present required property is invalid",
-                "data": {"bar": 1},
-                "valid": false
-            },
-            {
-                "description": "ignores arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "ignores strings",
-                "data": "",
-                "valid": true
-            },
-            {
-                "description": "ignores other non-objects",
-                "data": 12,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "required default validation",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "properties": {
-                "foo": {}
-            }
-        },
-        "tests": [
-            {
-                "description": "not required by default",
-                "data": {},
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "required with empty array",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "properties": {
-                "foo": {}
-            },
-            "required": []
-        },
-        "tests": [
-            {
-                "description": "property not required",
-                "data": {},
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "required with escaped characters",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "required": [
-                "foo\nbar",
-                "foo\"bar",
-                "foo\\bar",
-                "foo\rbar",
-                "foo\tbar",
-                "foo\fbar"
-            ]
-        },
-        "tests": [
-            {
-                "description": "object with all properties present is valid",
-                "data": {
-                    "foo\nbar": 1,
-                    "foo\"bar": 1,
-                    "foo\\bar": 1,
-                    "foo\rbar": 1,
-                    "foo\tbar": 1,
-                    "foo\fbar": 1
-                },
-                "valid": true
-            },
-            {
-                "description": "object with some properties missing is invalid",
-                "data": {
-                    "foo\nbar": "1",
-                    "foo\"bar": "1"
-                },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "required properties whose names are Javascript object property names",
-        "comment": "Ensure JS implementations don't universally consider e.g. __proto__ to always be present in an object.",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "required": ["__proto__", "toString", "constructor"]
-        },
-        "tests": [
-            {
-                "description": "ignores arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "ignores other non-objects",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "none of the properties mentioned",
-                "data": {},
-                "valid": false
-            },
-            {
-                "description": "__proto__ present",
-                "data": { "__proto__": "foo" },
-                "valid": false
-            },
-            {
-                "description": "toString present",
-                "data": { "toString": { "length": 37 } },
-                "valid": false
-            },
-            {
-                "description": "constructor present",
-                "data": { "constructor": { "length": 37 } },
-                "valid": false
-            },
-            {
-                "description": "all present",
-                "data": { 
-                    "__proto__": 12,
-                    "toString": { "length": "foo" },
-                    "constructor": 37
-                },
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft2019-09/type.json b/json/tests/draft2019-09/type.json
deleted file mode 100644
index 92c6be8..0000000
--- a/json/tests/draft2019-09/type.json
+++ /dev/null
@@ -1,501 +0,0 @@
-[
-    {
-        "description": "integer type matches integers",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "type": "integer"
-        },
-        "tests": [
-            {
-                "description": "an integer is an integer",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "a float with zero fractional part is an integer",
-                "data": 1.0,
-                "valid": true
-            },
-            {
-                "description": "a float is not an integer",
-                "data": 1.1,
-                "valid": false
-            },
-            {
-                "description": "a string is not an integer",
-                "data": "foo",
-                "valid": false
-            },
-            {
-                "description": "a string is still not an integer, even if it looks like one",
-                "data": "1",
-                "valid": false
-            },
-            {
-                "description": "an object is not an integer",
-                "data": {},
-                "valid": false
-            },
-            {
-                "description": "an array is not an integer",
-                "data": [],
-                "valid": false
-            },
-            {
-                "description": "a boolean is not an integer",
-                "data": true,
-                "valid": false
-            },
-            {
-                "description": "null is not an integer",
-                "data": null,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "number type matches numbers",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "type": "number"
-        },
-        "tests": [
-            {
-                "description": "an integer is a number",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "a float with zero fractional part is a number (and an integer)",
-                "data": 1.0,
-                "valid": true
-            },
-            {
-                "description": "a float is a number",
-                "data": 1.1,
-                "valid": true
-            },
-            {
-                "description": "a string is not a number",
-                "data": "foo",
-                "valid": false
-            },
-            {
-                "description": "a string is still not a number, even if it looks like one",
-                "data": "1",
-                "valid": false
-            },
-            {
-                "description": "an object is not a number",
-                "data": {},
-                "valid": false
-            },
-            {
-                "description": "an array is not a number",
-                "data": [],
-                "valid": false
-            },
-            {
-                "description": "a boolean is not a number",
-                "data": true,
-                "valid": false
-            },
-            {
-                "description": "null is not a number",
-                "data": null,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "string type matches strings",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "type": "string"
-        },
-        "tests": [
-            {
-                "description": "1 is not a string",
-                "data": 1,
-                "valid": false
-            },
-            {
-                "description": "a float is not a string",
-                "data": 1.1,
-                "valid": false
-            },
-            {
-                "description": "a string is a string",
-                "data": "foo",
-                "valid": true
-            },
-            {
-                "description": "a string is still a string, even if it looks like a number",
-                "data": "1",
-                "valid": true
-            },
-            {
-                "description": "an empty string is still a string",
-                "data": "",
-                "valid": true
-            },
-            {
-                "description": "an object is not a string",
-                "data": {},
-                "valid": false
-            },
-            {
-                "description": "an array is not a string",
-                "data": [],
-                "valid": false
-            },
-            {
-                "description": "a boolean is not a string",
-                "data": true,
-                "valid": false
-            },
-            {
-                "description": "null is not a string",
-                "data": null,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "object type matches objects",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "type": "object"
-        },
-        "tests": [
-            {
-                "description": "an integer is not an object",
-                "data": 1,
-                "valid": false
-            },
-            {
-                "description": "a float is not an object",
-                "data": 1.1,
-                "valid": false
-            },
-            {
-                "description": "a string is not an object",
-                "data": "foo",
-                "valid": false
-            },
-            {
-                "description": "an object is an object",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "an array is not an object",
-                "data": [],
-                "valid": false
-            },
-            {
-                "description": "a boolean is not an object",
-                "data": true,
-                "valid": false
-            },
-            {
-                "description": "null is not an object",
-                "data": null,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "array type matches arrays",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "type": "array"
-        },
-        "tests": [
-            {
-                "description": "an integer is not an array",
-                "data": 1,
-                "valid": false
-            },
-            {
-                "description": "a float is not an array",
-                "data": 1.1,
-                "valid": false
-            },
-            {
-                "description": "a string is not an array",
-                "data": "foo",
-                "valid": false
-            },
-            {
-                "description": "an object is not an array",
-                "data": {},
-                "valid": false
-            },
-            {
-                "description": "an array is an array",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "a boolean is not an array",
-                "data": true,
-                "valid": false
-            },
-            {
-                "description": "null is not an array",
-                "data": null,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "boolean type matches booleans",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "type": "boolean"
-        },
-        "tests": [
-            {
-                "description": "an integer is not a boolean",
-                "data": 1,
-                "valid": false
-            },
-            {
-                "description": "zero is not a boolean",
-                "data": 0,
-                "valid": false
-            },
-            {
-                "description": "a float is not a boolean",
-                "data": 1.1,
-                "valid": false
-            },
-            {
-                "description": "a string is not a boolean",
-                "data": "foo",
-                "valid": false
-            },
-            {
-                "description": "an empty string is not a boolean",
-                "data": "",
-                "valid": false
-            },
-            {
-                "description": "an object is not a boolean",
-                "data": {},
-                "valid": false
-            },
-            {
-                "description": "an array is not a boolean",
-                "data": [],
-                "valid": false
-            },
-            {
-                "description": "true is a boolean",
-                "data": true,
-                "valid": true
-            },
-            {
-                "description": "false is a boolean",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "null is not a boolean",
-                "data": null,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "null type matches only the null object",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "type": "null"
-        },
-        "tests": [
-            {
-                "description": "an integer is not null",
-                "data": 1,
-                "valid": false
-            },
-            {
-                "description": "a float is not null",
-                "data": 1.1,
-                "valid": false
-            },
-            {
-                "description": "zero is not null",
-                "data": 0,
-                "valid": false
-            },
-            {
-                "description": "a string is not null",
-                "data": "foo",
-                "valid": false
-            },
-            {
-                "description": "an empty string is not null",
-                "data": "",
-                "valid": false
-            },
-            {
-                "description": "an object is not null",
-                "data": {},
-                "valid": false
-            },
-            {
-                "description": "an array is not null",
-                "data": [],
-                "valid": false
-            },
-            {
-                "description": "true is not null",
-                "data": true,
-                "valid": false
-            },
-            {
-                "description": "false is not null",
-                "data": false,
-                "valid": false
-            },
-            {
-                "description": "null is null",
-                "data": null,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "multiple types can be specified in an array",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "type": ["integer", "string"]
-        },
-        "tests": [
-            {
-                "description": "an integer is valid",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "a string is valid",
-                "data": "foo",
-                "valid": true
-            },
-            {
-                "description": "a float is invalid",
-                "data": 1.1,
-                "valid": false
-            },
-            {
-                "description": "an object is invalid",
-                "data": {},
-                "valid": false
-            },
-            {
-                "description": "an array is invalid",
-                "data": [],
-                "valid": false
-            },
-            {
-                "description": "a boolean is invalid",
-                "data": true,
-                "valid": false
-            },
-            {
-                "description": "null is invalid",
-                "data": null,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "type as array with one item",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "type": ["string"]
-        },
-        "tests": [
-            {
-                "description": "string is valid",
-                "data": "foo",
-                "valid": true
-            },
-            {
-                "description": "number is invalid",
-                "data": 123,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "type: array or object",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "type": ["array", "object"]
-        },
-        "tests": [
-            {
-                "description": "array is valid",
-                "data": [1,2,3],
-                "valid": true
-            },
-            {
-                "description": "object is valid",
-                "data": {"foo": 123},
-                "valid": true
-            },
-            {
-                "description": "number is invalid",
-                "data": 123,
-                "valid": false
-            },
-            {
-                "description": "string is invalid",
-                "data": "foo",
-                "valid": false
-            },
-            {
-                "description": "null is invalid",
-                "data": null,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "type: array, object or null",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "type": ["array", "object", "null"]
-        },
-        "tests": [
-            {
-                "description": "array is valid",
-                "data": [1,2,3],
-                "valid": true
-            },
-            {
-                "description": "object is valid",
-                "data": {"foo": 123},
-                "valid": true
-            },
-            {
-                "description": "null is valid",
-                "data": null,
-                "valid": true
-            },
-            {
-                "description": "number is invalid",
-                "data": 123,
-                "valid": false
-            },
-            {
-                "description": "string is invalid",
-                "data": "foo",
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft2019-09/unevaluatedItems.json b/json/tests/draft2019-09/unevaluatedItems.json
deleted file mode 100644
index 55d33e2..0000000
--- a/json/tests/draft2019-09/unevaluatedItems.json
+++ /dev/null
@@ -1,562 +0,0 @@
-[
-    {
-        "description": "unevaluatedItems true",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "unevaluatedItems": true
-        },
-        "tests": [
-            {
-                "description": "with no unevaluated items",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "with unevaluated items",
-                "data": ["foo"],
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "unevaluatedItems false",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "unevaluatedItems": false
-        },
-        "tests": [
-            {
-                "description": "with no unevaluated items",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "with unevaluated items",
-                "data": ["foo"],
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "unevaluatedItems as schema",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "unevaluatedItems": { "type": "string" }
-        },
-        "tests": [
-            {
-                "description": "with no unevaluated items",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "with valid unevaluated items",
-                "data": ["foo"],
-                "valid": true
-            },
-            {
-                "description": "with invalid unevaluated items",
-                "data": [42],
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "unevaluatedItems with uniform items",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "items": { "type": "string" },
-            "unevaluatedItems": false
-        },
-        "tests": [
-            {
-                "description": "unevaluatedItems doesn't apply",
-                "data": ["foo", "bar"],
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "unevaluatedItems with tuple",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "items": [
-                { "type": "string" }
-            ],
-            "unevaluatedItems": false
-        },
-        "tests": [
-            {
-                "description": "with no unevaluated items",
-                "data": ["foo"],
-                "valid": true
-            },
-            {
-                "description": "with unevaluated items",
-                "data": ["foo", "bar"],
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "unevaluatedItems with additionalItems",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "items": [
-                { "type": "string" }
-            ],
-            "additionalItems": true,
-            "unevaluatedItems": false
-        },
-        "tests": [
-            {
-                "description": "unevaluatedItems doesn't apply",
-                "data": ["foo", 42],
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "unevaluatedItems with nested tuple",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "items": [
-                { "type": "string" }
-            ],
-            "allOf": [
-                {
-                    "items": [
-                        true,
-                        { "type": "number" }
-                    ]
-                }
-            ],
-            "unevaluatedItems": false
-        },
-        "tests": [
-            {
-                "description": "with no unevaluated items",
-                "data": ["foo", 42],
-                "valid": true
-            },
-            {
-                "description": "with unevaluated items",
-                "data": ["foo", 42, true],
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "unevaluatedItems with nested items",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "unevaluatedItems": {"type": "boolean"},
-            "anyOf": [
-                { "items": {"type": "string"} },
-                true
-            ]
-        },
-        "tests": [
-            {
-                "description": "with only (valid) additional items",
-                "data": [true, false],
-                "valid": true
-            },
-            {
-                "description": "with no additional items",
-                "data": ["yes", "no"],
-                "valid": true
-            },
-            {
-                "description": "with invalid additional item",
-                "data": ["yes", false],
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "unevaluatedItems with nested items and additionalItems",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "allOf": [
-                {
-                    "items": [
-                        { "type": "string" }
-                    ],
-                    "additionalItems": true
-                }
-            ],
-            "unevaluatedItems": false
-        },
-        "tests": [
-            {
-                "description": "with no additional items",
-                "data": ["foo"],
-                "valid": true
-            },
-            {
-                "description": "with additional items",
-                "data": ["foo", 42, true],
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "unevaluatedItems with nested unevaluatedItems",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "allOf": [
-                {
-                    "items": [
-                        { "type": "string" }
-                    ]
-                },
-                { "unevaluatedItems": true }
-            ],
-            "unevaluatedItems": false
-        },
-        "tests": [
-            {
-                "description": "with no additional items",
-                "data": ["foo"],
-                "valid": true
-            },
-            {
-                "description": "with additional items",
-                "data": ["foo", 42, true],
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "unevaluatedItems with anyOf",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "items": [
-                { "const": "foo" }
-            ],
-            "anyOf": [
-                {
-                    "items": [
-                        true,
-                        { "const": "bar" }
-                    ]
-                },
-                {
-                    "items": [
-                        true,
-                        true,
-                        { "const": "baz" }
-                    ]
-                }
-            ],
-            "unevaluatedItems": false
-        },
-        "tests": [
-            {
-                "description": "when one schema matches and has no unevaluated items",
-                "data": ["foo", "bar"],
-                "valid": true
-            },
-            {
-                "description": "when one schema matches and has unevaluated items",
-                "data": ["foo", "bar", 42],
-                "valid": false
-            },
-            {
-                "description": "when two schemas match and has no unevaluated items",
-                "data": ["foo", "bar", "baz"],
-                "valid": true
-            },
-            {
-                "description": "when two schemas match and has unevaluated items",
-                "data": ["foo", "bar", "baz", 42],
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "unevaluatedItems with oneOf",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "items": [
-                { "const": "foo" }
-            ],
-            "oneOf": [
-                {
-                    "items": [
-                        true,
-                        { "const": "bar" }
-                    ]
-                },
-                {
-                    "items": [
-                        true,
-                        { "const": "baz" }
-                    ]
-                }
-            ],
-            "unevaluatedItems": false
-        },
-        "tests": [
-            {
-                "description": "with no unevaluated items",
-                "data": ["foo", "bar"],
-                "valid": true
-            },
-            {
-                "description": "with unevaluated items",
-                "data": ["foo", "bar", 42],
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "unevaluatedItems with not",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "items": [
-                { "const": "foo" }
-            ],
-            "not": {
-                "not": {
-                    "items": [
-                        true,
-                        { "const": "bar" }
-                    ]
-                }
-            },
-            "unevaluatedItems": false
-        },
-        "tests": [
-            {
-                "description": "with unevaluated items",
-                "data": ["foo", "bar"],
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "unevaluatedItems with if/then/else",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "items": [ { "const": "foo" } ],
-            "if": {
-                "items": [
-                    true,
-                    { "const": "bar" }
-                ]
-            },
-            "then": {
-                "items": [
-                    true,
-                    true,
-                    { "const": "then" }
-                ]
-            },
-            "else": {
-                "items": [
-                    true,
-                    true,
-                    true,
-                    { "const": "else" }
-                ]
-            },
-            "unevaluatedItems": false
-        },
-        "tests": [
-            {
-                "description": "when if matches and it has no unevaluated items",
-                "data": ["foo", "bar", "then"],
-                "valid": true
-            },
-            {
-                "description": "when if matches and it has unevaluated items",
-                "data": ["foo", "bar", "then", "else"],
-                "valid": false
-            },
-            {
-                "description": "when if doesn't match and it has no unevaluated items",
-                "data": ["foo", 42, 42, "else"],
-                "valid": true
-            },
-            {
-                "description": "when if doesn't match and it has unevaluated items",
-                "data": ["foo", 42, 42, "else", 42],
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "unevaluatedItems with boolean schemas",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "allOf": [true],
-            "unevaluatedItems": false
-        },
-        "tests": [
-            {
-                "description": "with no unevaluated items",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "with unevaluated items",
-                "data": ["foo"],
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "unevaluatedItems with $ref",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "$ref": "#/$defs/bar",
-            "items": [
-                { "type": "string" }
-            ],
-            "unevaluatedItems": false,
-            "$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 can't see inside cousins",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "allOf": [
-                {
-                    "items": [ true ]
-                },
-                { "unevaluatedItems": false }
-            ]
-        },
-        "tests": [
-            {
-                "description": "always fails",
-                "data": [ 1 ],
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "item is evaluated in an uncle schema to unevaluatedItems",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "properties": {
-                "foo": {
-                    "items": [
-                        { "type": "string" }
-                    ],
-                    "unevaluatedItems": false
-                  }
-            },
-            "anyOf": [
-                {
-                    "properties": {
-                        "foo": {
-                            "items": [
-                                true,
-                                { "type": "string" }
-                            ]
-                        }
-                    }
-                }
-            ]
-        },
-        "tests": [
-            {
-                "description": "no extra items",
-                "data": {
-                    "foo": [
-                        "test"
-                    ]
-                },
-                "valid": true
-            },
-            {
-                "description": "uncle keyword evaluation is not significant",
-                "data": {
-                    "foo": [
-                        "test",
-                        "test"
-                    ]
-                },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "non-array instances are valid",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "unevaluatedItems": false
-        },
-        "tests": [
-            {
-                "description": "ignores booleans",
-                "data": true,
-                "valid": true
-            },
-            {
-                "description": "ignores integers",
-                "data": 123,
-                "valid": true
-            },
-            {
-                "description": "ignores floats",
-                "data": 1.0,
-                "valid": true
-            },
-            {
-                "description": "ignores objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "ignores strings",
-                "data": "foo",
-                "valid": true
-            },
-            {
-                "description": "ignores null",
-                "data": null,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "unevaluatedItems with null instance elements",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "unevaluatedItems": {
-                "type": "null"
-            }
-        },
-        "tests": [
-            {
-                "description": "allows null elements",
-                "data": [ null ],
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft2019-09/unevaluatedProperties.json b/json/tests/draft2019-09/unevaluatedProperties.json
deleted file mode 100644
index 62960ea..0000000
--- a/json/tests/draft2019-09/unevaluatedProperties.json
+++ /dev/null
@@ -1,1423 +0,0 @@
-[
-    {
-        "description": "unevaluatedProperties true",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "type": "object",
-            "unevaluatedProperties": true
-        },
-        "tests": [
-            {
-                "description": "with no unevaluated properties",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "with unevaluated properties",
-                "data": {
-                    "foo": "foo"
-                },
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "unevaluatedProperties schema",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "type": "object",
-            "unevaluatedProperties": {
-                "type": "string",
-                "minLength": 3
-            }
-        },
-        "tests": [
-            {
-                "description": "with no unevaluated properties",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "with valid unevaluated properties",
-                "data": {
-                    "foo": "foo"
-                },
-                "valid": true
-            },
-            {
-                "description": "with invalid unevaluated properties",
-                "data": {
-                    "foo": "fo"
-                },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "unevaluatedProperties false",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "type": "object",
-            "unevaluatedProperties": false
-        },
-        "tests": [
-            {
-                "description": "with no unevaluated properties",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "with unevaluated properties",
-                "data": {
-                    "foo": "foo"
-                },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "unevaluatedProperties with adjacent properties",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "type": "object",
-            "properties": {
-                "foo": { "type": "string" }
-            },
-            "unevaluatedProperties": false
-        },
-        "tests": [
-            {
-                "description": "with no unevaluated properties",
-                "data": {
-                    "foo": "foo"
-                },
-                "valid": true
-            },
-            {
-                "description": "with unevaluated properties",
-                "data": {
-                    "foo": "foo",
-                    "bar": "bar"
-                },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "unevaluatedProperties with adjacent patternProperties",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "type": "object",
-            "patternProperties": {
-                "^foo": { "type": "string" }
-            },
-            "unevaluatedProperties": false
-        },
-        "tests": [
-            {
-                "description": "with no unevaluated properties",
-                "data": {
-                    "foo": "foo"
-                },
-                "valid": true
-            },
-            {
-                "description": "with unevaluated properties",
-                "data": {
-                    "foo": "foo",
-                    "bar": "bar"
-                },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "unevaluatedProperties with adjacent additionalProperties",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "type": "object",
-            "properties": {
-                "foo": { "type": "string" }
-            },
-            "additionalProperties": true,
-            "unevaluatedProperties": false
-        },
-        "tests": [
-            {
-                "description": "with no additional properties",
-                "data": {
-                    "foo": "foo"
-                },
-                "valid": true
-            },
-            {
-                "description": "with additional properties",
-                "data": {
-                    "foo": "foo",
-                    "bar": "bar"
-                },
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "unevaluatedProperties with nested properties",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "type": "object",
-            "properties": {
-                "foo": { "type": "string" }
-            },
-            "allOf": [
-                {
-                    "properties": {
-                        "bar": { "type": "string" }
-                    }
-                }
-            ],
-            "unevaluatedProperties": false
-        },
-        "tests": [
-            {
-                "description": "with no additional properties",
-                "data": {
-                    "foo": "foo",
-                    "bar": "bar"
-                },
-                "valid": true
-            },
-            {
-                "description": "with additional properties",
-                "data": {
-                    "foo": "foo",
-                    "bar": "bar",
-                    "baz": "baz"
-                },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "unevaluatedProperties with nested patternProperties",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "type": "object",
-            "properties": {
-                "foo": { "type": "string" }
-            },
-            "allOf": [
-              {
-                  "patternProperties": {
-                      "^bar": { "type": "string" }
-                  }
-              }
-            ],
-            "unevaluatedProperties": false
-        },
-        "tests": [
-            {
-                "description": "with no additional properties",
-                "data": {
-                    "foo": "foo",
-                    "bar": "bar"
-                },
-                "valid": true
-            },
-            {
-                "description": "with additional properties",
-                "data": {
-                    "foo": "foo",
-                    "bar": "bar",
-                    "baz": "baz"
-                },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "unevaluatedProperties with nested additionalProperties",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "type": "object",
-            "properties": {
-                "foo": { "type": "string" }
-            },
-            "allOf": [
-                {
-                    "additionalProperties": true
-                }
-            ],
-            "unevaluatedProperties": false
-        },
-        "tests": [
-            {
-                "description": "with no additional properties",
-                "data": {
-                    "foo": "foo"
-                },
-                "valid": true
-            },
-            {
-                "description": "with additional properties",
-                "data": {
-                    "foo": "foo",
-                    "bar": "bar"
-                },
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "unevaluatedProperties with nested unevaluatedProperties",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "type": "object",
-            "properties": {
-                "foo": { "type": "string" }
-            },
-            "allOf": [
-                {
-                    "unevaluatedProperties": true
-                }
-            ],
-            "unevaluatedProperties": {
-                "type": "string",
-                "maxLength": 2
-            }
-        },
-        "tests": [
-            {
-                "description": "with no nested unevaluated properties",
-                "data": {
-                    "foo": "foo"
-                },
-                "valid": true
-            },
-            {
-                "description": "with nested unevaluated properties",
-                "data": {
-                    "foo": "foo",
-                    "bar": "bar"
-                },
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "unevaluatedProperties with anyOf",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "type": "object",
-            "properties": {
-                "foo": { "type": "string" }
-            },
-            "anyOf": [
-                {
-                    "properties": {
-                        "bar": { "const": "bar" }
-                    },
-                    "required": ["bar"]
-                },
-                {
-                    "properties": {
-                        "baz": { "const": "baz" }
-                    },
-                    "required": ["baz"]
-                },
-                {
-                    "properties": {
-                        "quux": { "const": "quux" }
-                    },
-                    "required": ["quux"]
-                }
-            ],
-            "unevaluatedProperties": false
-        },
-        "tests": [
-            {
-                "description": "when one matches and has no unevaluated properties",
-                "data": {
-                    "foo": "foo",
-                    "bar": "bar"
-                },
-                "valid": true
-            },
-            {
-                "description": "when one matches and has unevaluated properties",
-                "data": {
-                    "foo": "foo",
-                    "bar": "bar",
-                    "baz": "not-baz"
-                },
-                "valid": false
-            },
-            {
-                "description": "when two match and has no unevaluated properties",
-                "data": {
-                    "foo": "foo",
-                    "bar": "bar",
-                    "baz": "baz"
-                },
-                "valid": true
-            },
-            {
-                "description": "when two match and has unevaluated properties",
-                "data": {
-                    "foo": "foo",
-                    "bar": "bar",
-                    "baz": "baz",
-                    "quux": "not-quux"
-                },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "unevaluatedProperties with oneOf",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "type": "object",
-            "properties": {
-                "foo": { "type": "string" }
-            },
-            "oneOf": [
-                {
-                    "properties": {
-                        "bar": { "const": "bar" }
-                    },
-                    "required": ["bar"]
-                },
-                {
-                    "properties": {
-                        "baz": { "const": "baz" }
-                    },
-                    "required": ["baz"]
-                }
-            ],
-            "unevaluatedProperties": false
-        },
-        "tests": [
-            {
-                "description": "with no unevaluated properties",
-                "data": {
-                    "foo": "foo",
-                    "bar": "bar"
-                },
-                "valid": true
-            },
-            {
-                "description": "with unevaluated properties",
-                "data": {
-                    "foo": "foo",
-                    "bar": "bar",
-                    "quux": "quux"
-                },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "unevaluatedProperties with not",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "type": "object",
-            "properties": {
-                "foo": { "type": "string" }
-            },
-            "not": {
-                "not": {
-                    "properties": {
-                        "bar": { "const": "bar" }
-                    },
-                    "required": ["bar"]
-                }
-            },
-            "unevaluatedProperties": false
-        },
-        "tests": [
-            {
-                "description": "with unevaluated properties",
-                "data": {
-                    "foo": "foo",
-                    "bar": "bar"
-                },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "unevaluatedProperties with if/then/else",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "type": "object",
-            "if": {
-                "properties": {
-                    "foo": { "const": "then" }
-                },
-                "required": ["foo"]
-            },
-            "then": {
-                "properties": {
-                    "bar": { "type": "string" }
-                },
-                "required": ["bar"]
-            },
-            "else": {
-                "properties": {
-                    "baz": { "type": "string" }
-                },
-                "required": ["baz"]
-            },
-            "unevaluatedProperties": false
-        },
-        "tests": [
-            {
-                "description": "when if is true and has no unevaluated properties",
-                "data": {
-                    "foo": "then",
-                    "bar": "bar"
-                },
-                "valid": true
-            },
-            {
-                "description": "when if is true and has unevaluated properties",
-                "data": {
-                    "foo": "then",
-                    "bar": "bar",
-                    "baz": "baz"
-                },
-                "valid": false
-            },
-            {
-                "description": "when if is false and has no unevaluated properties",
-                "data": {
-                    "baz": "baz"
-                },
-                "valid": true
-            },
-            {
-                "description": "when if is false and has unevaluated properties",
-                "data": {
-                    "foo": "else",
-                    "baz": "baz"
-                },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "unevaluatedProperties with if/then/else, then not defined",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "type": "object",
-            "if": {
-                "properties": {
-                    "foo": { "const": "then" }
-                },
-                "required": ["foo"]
-            },
-            "else": {
-                "properties": {
-                    "baz": { "type": "string" }
-                },
-                "required": ["baz"]
-            },
-            "unevaluatedProperties": false
-        },
-        "tests": [
-            {
-                "description": "when if is true and has no unevaluated properties",
-                "data": {
-                    "foo": "then",
-                    "bar": "bar"
-                },
-                "valid": false
-            },
-            {
-                "description": "when if is true and has unevaluated properties",
-                "data": {
-                    "foo": "then",
-                    "bar": "bar",
-                    "baz": "baz"
-                },
-                "valid": false
-            },
-            {
-                "description": "when if is false and has no unevaluated properties",
-                "data": {
-                    "baz": "baz"
-                },
-                "valid": true
-            },
-            {
-                "description": "when if is false and has unevaluated properties",
-                "data": {
-                    "foo": "else",
-                    "baz": "baz"
-                },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "unevaluatedProperties with if/then/else, else not defined",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "type": "object",
-            "if": {
-                "properties": {
-                    "foo": { "const": "then" }
-                },
-                "required": ["foo"]
-            },
-            "then": {
-                "properties": {
-                    "bar": { "type": "string" }
-                },
-                "required": ["bar"]
-            },
-            "unevaluatedProperties": false
-        },
-        "tests": [
-            {
-                "description": "when if is true and has no unevaluated properties",
-                "data": {
-                    "foo": "then",
-                    "bar": "bar"
-                },
-                "valid": true
-            },
-            {
-                "description": "when if is true and has unevaluated properties",
-                "data": {
-                    "foo": "then",
-                    "bar": "bar",
-                    "baz": "baz"
-                },
-                "valid": false
-            },
-            {
-                "description": "when if is false and has no unevaluated properties",
-                "data": {
-                    "baz": "baz"
-                },
-                "valid": false
-            },
-            {
-                "description": "when if is false and has unevaluated properties",
-                "data": {
-                    "foo": "else",
-                    "baz": "baz"
-                },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "unevaluatedProperties with dependentSchemas",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "type": "object",
-            "properties": {
-                "foo": { "type": "string" }
-            },
-            "dependentSchemas": {
-                "foo": {
-                    "properties": {
-                        "bar": { "const": "bar" }
-                    },
-                    "required": ["bar"]
-                }
-            },
-            "unevaluatedProperties": false
-        },
-        "tests": [
-            {
-                "description": "with no unevaluated properties",
-                "data": {
-                    "foo": "foo",
-                    "bar": "bar"
-                },
-                "valid": true
-            },
-            {
-                "description": "with unevaluated properties",
-                "data": {
-                    "bar": "bar"
-                },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "unevaluatedProperties with boolean schemas",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "type": "object",
-            "properties": {
-                "foo": { "type": "string" }
-            },
-            "allOf": [true],
-            "unevaluatedProperties": false
-        },
-        "tests": [
-            {
-                "description": "with no unevaluated properties",
-                "data": {
-                    "foo": "foo"
-                },
-                "valid": true
-            },
-            {
-                "description": "with unevaluated properties",
-                "data": {
-                    "bar": "bar"
-                },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "unevaluatedProperties with $ref",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "type": "object",
-            "$ref": "#/$defs/bar",
-            "properties": {
-                "foo": { "type": "string" }
-            },
-            "unevaluatedProperties": false,
-            "$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 can't see inside cousins",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "allOf": [
-                {
-                    "properties": {
-                        "foo": true
-                    }
-                },
-                {
-                    "unevaluatedProperties": false
-                }
-            ]
-        },
-        "tests": [
-            {
-                "description": "always fails",
-                "data": {
-                    "foo": 1
-                },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "unevaluatedProperties can't see inside cousins (reverse order)",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "allOf": [
-                {
-                    "unevaluatedProperties": false
-                },
-                {
-                    "properties": {
-                        "foo": true
-                    }
-                }
-            ]
-        },
-        "tests": [
-            {
-                "description": "always fails",
-                "data": {
-                    "foo": 1
-                },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "nested unevaluatedProperties, outer false, inner true, properties outside",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "type": "object",
-            "properties": {
-                "foo": { "type": "string" }
-            },
-            "allOf": [
-                {
-                    "unevaluatedProperties": true
-                }
-            ],
-            "unevaluatedProperties": false
-        },
-        "tests": [
-            {
-                "description": "with no nested unevaluated properties",
-                "data": {
-                    "foo": "foo"
-                },
-                "valid": true
-            },
-            {
-                "description": "with nested unevaluated properties",
-                "data": {
-                    "foo": "foo",
-                    "bar": "bar"
-                },
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "nested unevaluatedProperties, outer false, inner true, properties inside",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "type": "object",
-            "allOf": [
-                {
-                    "properties": {
-                        "foo": { "type": "string" }
-                    },
-                    "unevaluatedProperties": true
-                }
-            ],
-            "unevaluatedProperties": false
-        },
-        "tests": [
-            {
-                "description": "with no nested unevaluated properties",
-                "data": {
-                    "foo": "foo"
-                },
-                "valid": true
-            },
-            {
-                "description": "with nested unevaluated properties",
-                "data": {
-                    "foo": "foo",
-                    "bar": "bar"
-                },
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "nested unevaluatedProperties, outer true, inner false, properties outside",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "type": "object",
-            "properties": {
-                "foo": { "type": "string" }
-            },
-            "allOf": [
-                {
-                    "unevaluatedProperties": false
-                }
-            ],
-            "unevaluatedProperties": true
-        },
-        "tests": [
-            {
-                "description": "with no nested unevaluated properties",
-                "data": {
-                    "foo": "foo"
-                },
-                "valid": false
-            },
-            {
-                "description": "with nested unevaluated properties",
-                "data": {
-                    "foo": "foo",
-                    "bar": "bar"
-                },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "nested unevaluatedProperties, outer true, inner false, properties inside",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "type": "object",
-            "allOf": [
-                {
-                    "properties": {
-                        "foo": { "type": "string" }
-                    },
-                    "unevaluatedProperties": false
-                }
-            ],
-            "unevaluatedProperties": true
-        },
-        "tests": [
-            {
-                "description": "with no nested unevaluated properties",
-                "data": {
-                    "foo": "foo"
-                },
-                "valid": true
-            },
-            {
-                "description": "with nested unevaluated properties",
-                "data": {
-                    "foo": "foo",
-                    "bar": "bar"
-                },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "cousin unevaluatedProperties, true and false, true with properties",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "type": "object",
-            "allOf": [
-                {
-                    "properties": {
-                        "foo": { "type": "string" }
-                    },
-                    "unevaluatedProperties": true
-                },
-                {
-                    "unevaluatedProperties": false
-                }
-            ]
-        },
-        "tests": [
-            {
-                "description": "with no nested unevaluated properties",
-                "data": {
-                    "foo": "foo"
-                },
-                "valid": false
-            },
-            {
-                "description": "with nested unevaluated properties",
-                "data": {
-                    "foo": "foo",
-                    "bar": "bar"
-                },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "cousin unevaluatedProperties, true and false, false with properties",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "type": "object",
-            "allOf": [
-                {
-                    "unevaluatedProperties": true
-                },
-                {
-                    "properties": {
-                        "foo": { "type": "string" }
-                    },
-                    "unevaluatedProperties": false
-                }
-            ]
-        },
-        "tests": [
-            {
-                "description": "with no nested unevaluated properties",
-                "data": {
-                    "foo": "foo"
-                },
-                "valid": true
-            },
-            {
-                "description": "with nested unevaluated properties",
-                "data": {
-                    "foo": "foo",
-                    "bar": "bar"
-                },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "property is evaluated in an uncle schema to unevaluatedProperties",
-        "comment": "see https://stackoverflow.com/questions/66936884/deeply-nested-unevaluatedproperties-and-their-expectations",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "type": "object",
-            "properties": {
-                "foo": {
-                    "type": "object",
-                    "properties": {
-                        "bar": {
-                            "type": "string"
-                        }
-                    },
-                    "unevaluatedProperties": false
-                  }
-            },
-            "anyOf": [
-                {
-                    "properties": {
-                        "foo": {
-                            "properties": {
-                                "faz": {
-                                    "type": "string"
-                                }
-                            }
-                        }
-                    }
-                }
-            ]
-        },
-        "tests": [
-            {
-                "description": "no extra properties",
-                "data": {
-                    "foo": {
-                        "bar": "test"
-                    }
-                },
-                "valid": true
-            },
-            {
-                "description": "uncle keyword evaluation is not significant",
-                "data": {
-                    "foo": {
-                        "bar": "test",
-                        "faz": "test"
-                    }
-                },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "in-place applicator siblings, allOf has unevaluated",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "type": "object",
-            "allOf": [
-                {
-                    "properties": {
-                        "foo": true
-                    },
-                    "unevaluatedProperties": false
-                }
-            ],
-            "anyOf": [
-                {
-                    "properties": {
-                        "bar": true
-                    }
-                }
-            ]
-        },
-        "tests": [
-            {
-                "description": "base case: both properties present",
-                "data": {
-                    "foo": 1,
-                    "bar": 1
-                },
-                "valid": false
-            },
-            {
-                "description": "in place applicator siblings, bar is missing",
-                "data": {
-                    "foo": 1
-                },
-                "valid": true
-            },
-            {
-                "description": "in place applicator siblings, foo is missing",
-                "data": {
-                    "bar": 1
-                },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "in-place applicator siblings, anyOf has unevaluated",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "type": "object",
-            "allOf": [
-                {
-                    "properties": {
-                        "foo": true
-                    }
-                }
-            ],
-            "anyOf": [
-                {
-                    "properties": {
-                        "bar": true
-                    },
-                    "unevaluatedProperties": false
-                }
-            ]
-        },
-        "tests": [
-            {
-                "description": "base case: both properties present",
-                "data": {
-                    "foo": 1,
-                    "bar": 1
-                },
-                "valid": false
-            },
-            {
-                "description": "in place applicator siblings, bar is missing",
-                "data": {
-                    "foo": 1
-                },
-                "valid": false
-            },
-            {
-                "description": "in place applicator siblings, foo is missing",
-                "data": {
-                    "bar": 1
-                },
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "unevaluatedProperties + single cyclic ref",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "type": "object",
-            "properties": {
-                "x": { "$ref": "#" }
-            },
-            "unevaluatedProperties": false
-        },
-        "tests": [
-            {
-                "description": "Empty is valid",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "Single is valid",
-                "data": { "x": {} },
-                "valid": true
-            },
-            {
-                "description": "Unevaluated on 1st level is invalid",
-                "data": { "x": {}, "y": {} },
-                "valid": false
-            },
-            {
-                "description": "Nested is valid",
-                "data": { "x": { "x": {} } },
-                "valid": true
-            },
-            {
-                "description": "Unevaluated on 2nd level is invalid",
-                "data": { "x": { "x": {}, "y": {} } },
-                "valid": false
-            },
-            {
-                "description": "Deep nested is valid",
-                "data": { "x": { "x": { "x": {} } } },
-                "valid": true
-            },
-            {
-                "description": "Unevaluated on 3rd level is invalid",
-                "data": { "x": { "x": { "x": {}, "y": {} } } },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "unevaluatedProperties + ref inside allOf / oneOf",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "$defs": {
-                "one": {
-                    "properties": { "a": true }
-                },
-                "two": {
-                    "required": ["x"],
-                    "properties": { "x": true }
-                }
-            },
-            "allOf": [
-                { "$ref": "#/$defs/one" },
-                { "properties": { "b": true } },
-                {
-                    "oneOf": [
-                        { "$ref": "#/$defs/two" },
-                        {
-                            "required": ["y"],
-                            "properties": { "y": true }
-                        }
-                    ]
-                }
-            ],
-            "unevaluatedProperties": false
-        },
-        "tests": [
-            {
-                "description": "Empty is invalid (no x or y)",
-                "data": {},
-                "valid": false
-            },
-            {
-                "description": "a and b are invalid (no x or y)",
-                "data": { "a": 1, "b": 1 },
-                "valid": false
-            },
-            {
-                "description": "x and y are invalid",
-                "data": { "x": 1, "y": 1 },
-                "valid": false
-            },
-            {
-                "description": "a and x are valid",
-                "data": { "a": 1, "x": 1 },
-                "valid": true
-            },
-            {
-                "description": "a and y are valid",
-                "data": { "a": 1, "y": 1 },
-                "valid": true
-            },
-            {
-                "description": "a and b and x are valid",
-                "data": { "a": 1, "b": 1, "x": 1 },
-                "valid": true
-            },
-            {
-                "description": "a and b and y are valid",
-                "data": { "a": 1, "b": 1, "y": 1 },
-                "valid": true
-            },
-            {
-                "description": "a and b and x and y are invalid",
-                "data": { "a": 1, "b": 1, "x": 1, "y": 1 },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "dynamic evalation inside nested refs",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "$defs": {
-                "one": {
-                    "oneOf": [
-                        { "$ref": "#/$defs/two" },
-                        { "required": ["b"], "properties": { "b": true } },
-                        { "required": ["xx"], "patternProperties": { "x": true } },
-                        { "required": ["all"], "unevaluatedProperties": true }
-                    ]
-                },
-                "two": {
-                    "oneOf": [
-                        { "required": ["c"], "properties": { "c": true } },
-                        { "required": ["d"], "properties": { "d": true } }
-                    ]
-                }
-            },
-            "oneOf": [
-                { "$ref": "#/$defs/one" },
-                { "required": ["a"], "properties": { "a": true } }
-            ],
-            "unevaluatedProperties": false
-        },
-        "tests": [
-            {
-                "description": "Empty is invalid",
-                "data": {},
-                "valid": false
-            },
-            {
-                "description": "a is valid",
-                "data": { "a": 1 },
-                "valid": true
-            },
-            {
-                "description": "b is valid",
-                "data": { "b": 1 },
-                "valid": true
-            },
-            {
-                "description": "c is valid",
-                "data": { "c": 1 },
-                "valid": true
-            },
-            {
-                "description": "d is valid",
-                "data": { "d": 1 },
-                "valid": true
-            },
-            {
-                "description": "a + b is invalid",
-                "data": { "a": 1, "b": 1 },
-                "valid": false
-            },
-            {
-                "description": "a + c is invalid",
-                "data": { "a": 1, "c": 1 },
-                "valid": false
-            },
-            {
-                "description": "a + d is invalid",
-                "data": { "a": 1, "d": 1 },
-                "valid": false
-            },
-            {
-                "description": "b + c is invalid",
-                "data": { "b": 1, "c": 1 },
-                "valid": false
-            },
-            {
-                "description": "b + d is invalid",
-                "data": { "b": 1, "d": 1 },
-                "valid": false
-            },
-            {
-                "description": "c + d is invalid",
-                "data": { "c": 1, "d": 1 },
-                "valid": false
-            },
-            {
-                "description": "xx is valid",
-                "data": { "xx": 1 },
-                "valid": true
-            },
-            {
-                "description": "xx + foox is valid",
-                "data": { "xx": 1, "foox": 1 },
-                "valid": true
-            },
-            {
-                "description": "xx + foo is invalid",
-                "data": { "xx": 1, "foo": 1 },
-                "valid": false
-            },
-            {
-                "description": "xx + a is invalid",
-                "data": { "xx": 1, "a": 1 },
-                "valid": false
-            },
-            {
-                "description": "xx + b is invalid",
-                "data": { "xx": 1, "b": 1 },
-                "valid": false
-            },
-            {
-                "description": "xx + c is invalid",
-                "data": { "xx": 1, "c": 1 },
-                "valid": false
-            },
-            {
-                "description": "xx + d is invalid",
-                "data": { "xx": 1, "d": 1 },
-                "valid": false
-            },
-            {
-                "description": "all is valid",
-                "data": { "all": 1 },
-                "valid": true
-            },
-            {
-                "description": "all + foo is valid",
-                "data": { "all": 1, "foo": 1 },
-                "valid": true
-            },
-            {
-                "description": "all + a is invalid",
-                "data": { "all": 1, "a": 1 },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "non-object instances are valid",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "unevaluatedProperties": false
-        },
-        "tests": [
-            {
-                "description": "ignores booleans",
-                "data": true,
-                "valid": true
-            },
-            {
-                "description": "ignores integers",
-                "data": 123,
-                "valid": true
-            },
-            {
-                "description": "ignores floats",
-                "data": 1.0,
-                "valid": true
-            },
-            {
-                "description": "ignores arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "ignores strings",
-                "data": "foo",
-                "valid": true
-            },
-            {
-                "description": "ignores null",
-                "data": null,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "unevaluatedProperties with null valued instance properties",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "unevaluatedProperties": {
-                "type": "null"
-            }
-        },
-        "tests": [
-            {
-                "description": "allows null valued properties",
-                "data": {"foo": null},
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft2019-09/uniqueItems.json b/json/tests/draft2019-09/uniqueItems.json
deleted file mode 100644
index 6da878b..0000000
--- a/json/tests/draft2019-09/uniqueItems.json
+++ /dev/null
@@ -1,414 +0,0 @@
-[
-    {
-        "description": "uniqueItems validation",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "uniqueItems": true
-        },
-        "tests": [
-            {
-                "description": "unique array of integers is valid",
-                "data": [1, 2],
-                "valid": true
-            },
-            {
-                "description": "non-unique array of integers is invalid",
-                "data": [1, 1],
-                "valid": false
-            },
-            {
-                "description": "non-unique array of more than two integers is invalid",
-                "data": [1, 2, 1],
-                "valid": false
-            },
-            {
-                "description": "numbers are unique if mathematically unequal",
-                "data": [1.0, 1.00, 1],
-                "valid": false
-            },
-            {
-                "description": "false is not equal to zero",
-                "data": [0, false],
-                "valid": true
-            },
-            {
-                "description": "true is not equal to one",
-                "data": [1, true],
-                "valid": true
-            },
-            {
-                "description": "unique array of strings is valid",
-                "data": ["foo", "bar", "baz"],
-                "valid": true
-            },
-            {
-                "description": "non-unique array of strings is invalid",
-                "data": ["foo", "bar", "foo"],
-                "valid": false
-            },
-            {
-                "description": "unique array of objects is valid",
-                "data": [{"foo": "bar"}, {"foo": "baz"}],
-                "valid": true
-            },
-            {
-                "description": "non-unique array of objects is invalid",
-                "data": [{"foo": "bar"}, {"foo": "bar"}],
-                "valid": false
-            },
-            {
-                "description": "unique array of nested objects is valid",
-                "data": [
-                    {"foo": {"bar" : {"baz" : true}}},
-                    {"foo": {"bar" : {"baz" : false}}}
-                ],
-                "valid": true
-            },
-            {
-                "description": "non-unique array of nested objects is invalid",
-                "data": [
-                    {"foo": {"bar" : {"baz" : true}}},
-                    {"foo": {"bar" : {"baz" : true}}}
-                ],
-                "valid": false
-            },
-            {
-                "description": "unique array of arrays is valid",
-                "data": [["foo"], ["bar"]],
-                "valid": true
-            },
-            {
-                "description": "non-unique array of arrays is invalid",
-                "data": [["foo"], ["foo"]],
-                "valid": false
-            },
-            {
-                "description": "non-unique array of more than two arrays is invalid",
-                "data": [["foo"], ["bar"], ["foo"]],
-                "valid": false
-            },
-            {
-                "description": "1 and true are unique",
-                "data": [1, true],
-                "valid": true
-            },
-            {
-                "description": "0 and false are unique",
-                "data": [0, false],
-                "valid": true
-            },
-            {
-                "description": "[1] and [true] are unique",
-                "data": [[1], [true]],
-                "valid": true
-            },
-            {
-                "description": "[0] and [false] are unique",
-                "data": [[0], [false]],
-                "valid": true
-            },
-            {
-                "description": "nested [1] and [true] are unique",
-                "data": [[[1], "foo"], [[true], "foo"]],
-                "valid": true
-            },
-            {
-                "description": "nested [0] and [false] are unique",
-                "data": [[[0], "foo"], [[false], "foo"]],
-                "valid": true
-            },
-            {
-                "description": "unique heterogeneous types are valid",
-                "data": [{}, [1], true, null, 1, "{}"],
-                "valid": true
-            },
-            {
-                "description": "non-unique heterogeneous types are invalid",
-                "data": [{}, [1], true, null, {}, 1],
-                "valid": false
-            },
-            {
-                "description": "different objects are unique",
-                "data": [{"a": 1, "b": 2}, {"a": 2, "b": 1}],
-                "valid": true
-            },
-            {
-                "description": "objects are non-unique despite key order",
-                "data": [{"a": 1, "b": 2}, {"b": 2, "a": 1}],
-                "valid": false
-            },
-            {
-                "description": "{\"a\": false} and {\"a\": 0} are unique",
-                "data": [{"a": false}, {"a": 0}],
-                "valid": true
-            },
-            {
-                "description": "{\"a\": true} and {\"a\": 1} are unique",
-                "data": [{"a": true}, {"a": 1}],
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "uniqueItems with an array of items",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "items": [{"type": "boolean"}, {"type": "boolean"}],
-            "uniqueItems": true
-        },
-        "tests": [
-            {
-                "description": "[false, true] from items array is valid",
-                "data": [false, true],
-                "valid": true
-            },
-            {
-                "description": "[true, false] from items array is valid",
-                "data": [true, false],
-                "valid": true
-            },
-            {
-                "description": "[false, false] from items array is not valid",
-                "data": [false, false],
-                "valid": false
-            },
-            {
-                "description": "[true, true] from items array is not valid",
-                "data": [true, true],
-                "valid": false
-            },
-            {
-                "description": "unique array extended from [false, true] is valid",
-                "data": [false, true, "foo", "bar"],
-                "valid": true
-            },
-            {
-                "description": "unique array extended from [true, false] is valid",
-                "data": [true, false, "foo", "bar"],
-                "valid": true
-            },
-            {
-                "description": "non-unique array extended from [false, true] is not valid",
-                "data": [false, true, "foo", "foo"],
-                "valid": false
-            },
-            {
-                "description": "non-unique array extended from [true, false] is not valid",
-                "data": [true, false, "foo", "foo"],
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "uniqueItems with an array of items and additionalItems=false",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "items": [{"type": "boolean"}, {"type": "boolean"}],
-            "uniqueItems": true,
-            "additionalItems": false
-        },
-        "tests": [
-            {
-                "description": "[false, true] from items array is valid",
-                "data": [false, true],
-                "valid": true
-            },
-            {
-                "description": "[true, false] from items array is valid",
-                "data": [true, false],
-                "valid": true
-            },
-            {
-                "description": "[false, false] from items array is not valid",
-                "data": [false, false],
-                "valid": false
-            },
-            {
-                "description": "[true, true] from items array is not valid",
-                "data": [true, true],
-                "valid": false
-            },
-            {
-                "description": "extra items are invalid even if unique",
-                "data": [false, true, null],
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "uniqueItems=false validation",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "uniqueItems": false
-        },
-        "tests": [
-            {
-                "description": "unique array of integers is valid",
-                "data": [1, 2],
-                "valid": true
-            },
-            {
-                "description": "non-unique array of integers is valid",
-                "data": [1, 1],
-                "valid": true
-            },
-            {
-                "description": "numbers are unique if mathematically unequal",
-                "data": [1.0, 1.00, 1],
-                "valid": true
-            },
-            {
-                "description": "false is not equal to zero",
-                "data": [0, false],
-                "valid": true
-            },
-            {
-                "description": "true is not equal to one",
-                "data": [1, true],
-                "valid": true
-            },
-            {
-                "description": "unique array of objects is valid",
-                "data": [{"foo": "bar"}, {"foo": "baz"}],
-                "valid": true
-            },
-            {
-                "description": "non-unique array of objects is valid",
-                "data": [{"foo": "bar"}, {"foo": "bar"}],
-                "valid": true
-            },
-            {
-                "description": "unique array of nested objects is valid",
-                "data": [
-                    {"foo": {"bar" : {"baz" : true}}},
-                    {"foo": {"bar" : {"baz" : false}}}
-                ],
-                "valid": true
-            },
-            {
-                "description": "non-unique array of nested objects is valid",
-                "data": [
-                    {"foo": {"bar" : {"baz" : true}}},
-                    {"foo": {"bar" : {"baz" : true}}}
-                ],
-                "valid": true
-            },
-            {
-                "description": "unique array of arrays is valid",
-                "data": [["foo"], ["bar"]],
-                "valid": true
-            },
-            {
-                "description": "non-unique array of arrays is valid",
-                "data": [["foo"], ["foo"]],
-                "valid": true
-            },
-            {
-                "description": "1 and true are unique",
-                "data": [1, true],
-                "valid": true
-            },
-            {
-                "description": "0 and false are unique",
-                "data": [0, false],
-                "valid": true
-            },
-            {
-                "description": "unique heterogeneous types are valid",
-                "data": [{}, [1], true, null, 1],
-                "valid": true
-            },
-            {
-                "description": "non-unique heterogeneous types are valid",
-                "data": [{}, [1], true, null, {}, 1],
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "uniqueItems=false with an array of items",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "items": [{"type": "boolean"}, {"type": "boolean"}],
-            "uniqueItems": false
-        },
-        "tests": [
-            {
-                "description": "[false, true] from items array is valid",
-                "data": [false, true],
-                "valid": true
-            },
-            {
-                "description": "[true, false] from items array is valid",
-                "data": [true, false],
-                "valid": true
-            },
-            {
-                "description": "[false, false] from items array is valid",
-                "data": [false, false],
-                "valid": true
-            },
-            {
-                "description": "[true, true] from items array is valid",
-                "data": [true, true],
-                "valid": true
-            },
-            {
-                "description": "unique array extended from [false, true] is valid",
-                "data": [false, true, "foo", "bar"],
-                "valid": true
-            },
-            {
-                "description": "unique array extended from [true, false] is valid",
-                "data": [true, false, "foo", "bar"],
-                "valid": true
-            },
-            {
-                "description": "non-unique array extended from [false, true] is valid",
-                "data": [false, true, "foo", "foo"],
-                "valid": true
-            },
-            {
-                "description": "non-unique array extended from [true, false] is valid",
-                "data": [true, false, "foo", "foo"],
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "uniqueItems=false with an array of items and additionalItems=false",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "items": [{"type": "boolean"}, {"type": "boolean"}],
-            "uniqueItems": false,
-            "additionalItems": false
-        },
-        "tests": [
-            {
-                "description": "[false, true] from items array is valid",
-                "data": [false, true],
-                "valid": true
-            },
-            {
-                "description": "[true, false] from items array is valid",
-                "data": [true, false],
-                "valid": true
-            },
-            {
-                "description": "[false, false] from items array is valid",
-                "data": [false, false],
-                "valid": true
-            },
-            {
-                "description": "[true, true] from items array is valid",
-                "data": [true, true],
-                "valid": true
-            },
-            {
-                "description": "extra items are invalid even if unique",
-                "data": [false, true, null],
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft2019-09/unknownKeyword.json b/json/tests/draft2019-09/unknownKeyword.json
deleted file mode 100644
index f98e87c..0000000
--- a/json/tests/draft2019-09/unknownKeyword.json
+++ /dev/null
@@ -1,57 +0,0 @@
-[
-    {
-        "description": "$id inside an unknown keyword is not a real identifier",
-        "comment": "the implementation must not be confused by an $id in locations we do not know how to parse",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "$defs": {
-                "id_in_unknown0": {
-                    "not": {
-                        "array_of_schemas": [
-                            {
-                              "$id": "https://localhost:1234/draft2019-09/unknownKeyword/my_identifier.json",
-                              "type": "null"
-                            }
-                        ]
-                    }
-                },
-                "real_id_in_schema": {
-                    "$id": "https://localhost:1234/draft2019-09/unknownKeyword/my_identifier.json",
-                    "type": "string"
-                },
-                "id_in_unknown1": {
-                    "not": {
-                        "object_of_schemas": {
-                            "foo": {
-                              "$id": "https://localhost:1234/draft2019-09/unknownKeyword/my_identifier.json",
-                              "type": "integer"
-                            }
-                        }
-                    }
-                }
-            },
-            "anyOf": [
-                { "$ref": "#/$defs/id_in_unknown0" },
-                { "$ref": "#/$defs/id_in_unknown1" },
-                { "$ref": "https://localhost:1234/draft2019-09/unknownKeyword/my_identifier.json" }
-            ]
-        },
-        "tests": [
-            {
-                "description": "type matches second anyOf, which has a real schema in it",
-                "data": "a string",
-                "valid": true
-            },
-            {
-                "description": "type matches non-schema in first anyOf",
-                "data": null,
-                "valid": false
-            },
-            {
-                "description": "type matches non-schema in third anyOf",
-                "data": 1,
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft2019-09/vocabulary.json b/json/tests/draft2019-09/vocabulary.json
deleted file mode 100644
index 982e673..0000000
--- a/json/tests/draft2019-09/vocabulary.json
+++ /dev/null
@@ -1,38 +0,0 @@
-[
-    {
-        "description": "schema that uses custom metaschema with with no validation vocabulary",
-        "schema": {
-            "$id": "https://schema/using/no/validation",
-            "$schema": "http://localhost:1234/draft2019-09/metaschema-no-validation.json",
-            "properties": {
-                "badProperty": false,
-                "numberProperty": {
-                    "minimum": 10
-                }
-            }
-        },
-        "tests": [
-            {
-                "description": "applicator vocabulary still works",
-                "data": {
-                    "badProperty": "this property should not exist"
-                },
-                "valid": false
-            },
-            {
-                "description": "no validation: valid number",
-                "data": {
-                    "numberProperty": 20
-                },
-                "valid": true
-            },
-            {
-                "description": "no validation: invalid number, but it still validates",
-                "data": {
-                    "numberProperty": 1
-                },
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft2020-12/additionalProperties.json b/json/tests/draft2020-12/additionalProperties.json
deleted file mode 100644
index 29e69c1..0000000
--- a/json/tests/draft2020-12/additionalProperties.json
+++ /dev/null
@@ -1,156 +0,0 @@
-[
-    {
-        "description":
-            "additionalProperties being false does not allow other properties",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "properties": {"foo": {}, "bar": {}},
-            "patternProperties": { "^v": {} },
-            "additionalProperties": false
-        },
-        "tests": [
-            {
-                "description": "no additional properties is valid",
-                "data": {"foo": 1},
-                "valid": true
-            },
-            {
-                "description": "an additional property is invalid",
-                "data": {"foo" : 1, "bar" : 2, "quux" : "boom"},
-                "valid": false
-            },
-            {
-                "description": "ignores arrays",
-                "data": [1, 2, 3],
-                "valid": true
-            },
-            {
-                "description": "ignores strings",
-                "data": "foobarbaz",
-                "valid": true
-            },
-            {
-                "description": "ignores other non-objects",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "patternProperties are not additional properties",
-                "data": {"foo":1, "vroom": 2},
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "non-ASCII pattern with additionalProperties",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "patternProperties": {"^á": {}},
-            "additionalProperties": false
-        },
-        "tests": [
-            {
-                "description": "matching the pattern is valid",
-                "data": {"ármányos": 2},
-                "valid": true
-            },
-            {
-                "description": "not matching the pattern is invalid",
-                "data": {"élmény": 2},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "additionalProperties with schema",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "properties": {"foo": {}, "bar": {}},
-            "additionalProperties": {"type": "boolean"}
-        },
-        "tests": [
-            {
-                "description": "no additional properties is valid",
-                "data": {"foo": 1},
-                "valid": true
-            },
-            {
-                "description": "an additional valid property is valid",
-                "data": {"foo" : 1, "bar" : 2, "quux" : true},
-                "valid": true
-            },
-            {
-                "description": "an additional invalid property is invalid",
-                "data": {"foo" : 1, "bar" : 2, "quux" : 12},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description":
-            "additionalProperties can exist by itself",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "additionalProperties": {"type": "boolean"}
-        },
-        "tests": [
-            {
-                "description": "an additional valid property is valid",
-                "data": {"foo" : true},
-                "valid": true
-            },
-            {
-                "description": "an additional invalid property is invalid",
-                "data": {"foo" : 1},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "additionalProperties are allowed by default",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "properties": {"foo": {}, "bar": {}}
-        },
-        "tests": [
-            {
-                "description": "additional properties are allowed",
-                "data": {"foo": 1, "bar": 2, "quux": true},
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "additionalProperties does not look in applicators",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "allOf": [
-                {"properties": {"foo": {}}}
-            ],
-            "additionalProperties": {"type": "boolean"}
-        },
-        "tests": [
-            {
-                "description": "properties defined in allOf are not examined",
-                "data": {"foo": 1, "bar": true},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "additionalProperties with null valued instance properties",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "additionalProperties": {
-                "type": "null"
-            }
-        },
-        "tests": [
-            {
-                "description": "allows null values",
-                "data": {"foo": null},
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft2020-12/allOf.json b/json/tests/draft2020-12/allOf.json
deleted file mode 100644
index 9e87903..0000000
--- a/json/tests/draft2020-12/allOf.json
+++ /dev/null
@@ -1,312 +0,0 @@
-[
-    {
-        "description": "allOf",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "allOf": [
-                {
-                    "properties": {
-                        "bar": {"type": "integer"}
-                    },
-                    "required": ["bar"]
-                },
-                {
-                    "properties": {
-                        "foo": {"type": "string"}
-                    },
-                    "required": ["foo"]
-                }
-            ]
-        },
-        "tests": [
-            {
-                "description": "allOf",
-                "data": {"foo": "baz", "bar": 2},
-                "valid": true
-            },
-            {
-                "description": "mismatch second",
-                "data": {"foo": "baz"},
-                "valid": false
-            },
-            {
-                "description": "mismatch first",
-                "data": {"bar": 2},
-                "valid": false
-            },
-            {
-                "description": "wrong type",
-                "data": {"foo": "baz", "bar": "quux"},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "allOf with base schema",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "properties": {"bar": {"type": "integer"}},
-            "required": ["bar"],
-            "allOf" : [
-                {
-                    "properties": {
-                        "foo": {"type": "string"}
-                    },
-                    "required": ["foo"]
-                },
-                {
-                    "properties": {
-                        "baz": {"type": "null"}
-                    },
-                    "required": ["baz"]
-                }
-            ]
-        },
-        "tests": [
-            {
-                "description": "valid",
-                "data": {"foo": "quux", "bar": 2, "baz": null},
-                "valid": true
-            },
-            {
-                "description": "mismatch base schema",
-                "data": {"foo": "quux", "baz": null},
-                "valid": false
-            },
-            {
-                "description": "mismatch first allOf",
-                "data": {"bar": 2, "baz": null},
-                "valid": false
-            },
-            {
-                "description": "mismatch second allOf",
-                "data": {"foo": "quux", "bar": 2},
-                "valid": false
-            },
-            {
-                "description": "mismatch both",
-                "data": {"bar": 2},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "allOf simple types",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "allOf": [
-                {"maximum": 30},
-                {"minimum": 20}
-            ]
-        },
-        "tests": [
-            {
-                "description": "valid",
-                "data": 25,
-                "valid": true
-            },
-            {
-                "description": "mismatch one",
-                "data": 35,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "allOf with boolean schemas, all true",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "allOf": [true, true]
-        },
-        "tests": [
-            {
-                "description": "any value is valid",
-                "data": "foo",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "allOf with boolean schemas, some false",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "allOf": [true, false]
-        },
-        "tests": [
-            {
-                "description": "any value is invalid",
-                "data": "foo",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "allOf with boolean schemas, all false",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "allOf": [false, false]
-        },
-        "tests": [
-            {
-                "description": "any value is invalid",
-                "data": "foo",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "allOf with one empty schema",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "allOf": [
-                {}
-            ]
-        },
-        "tests": [
-            {
-                "description": "any data is valid",
-                "data": 1,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "allOf with two empty schemas",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "allOf": [
-                {},
-                {}
-            ]
-        },
-        "tests": [
-            {
-                "description": "any data is valid",
-                "data": 1,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "allOf with the first empty schema",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "allOf": [
-                {},
-                { "type": "number" }
-            ]
-        },
-        "tests": [
-            {
-                "description": "number is valid",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "string is invalid",
-                "data": "foo",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "allOf with the last empty schema",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "allOf": [
-                { "type": "number" },
-                {}
-            ]
-        },
-        "tests": [
-            {
-                "description": "number is valid",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "string is invalid",
-                "data": "foo",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "nested allOf, to check validation semantics",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "allOf": [
-                {
-                    "allOf": [
-                        {
-                            "type": "null"
-                        }
-                    ]
-                }
-            ]
-        },
-        "tests": [
-            {
-                "description": "null is valid",
-                "data": null,
-                "valid": true
-            },
-            {
-                "description": "anything non-null is invalid",
-                "data": 123,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "allOf combined with anyOf, oneOf",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "allOf": [ { "multipleOf": 2 } ],
-            "anyOf": [ { "multipleOf": 3 } ],
-            "oneOf": [ { "multipleOf": 5 } ]
-        },
-        "tests": [
-            {
-                "description": "allOf: false, anyOf: false, oneOf: false",
-                "data": 1,
-                "valid": false
-            },
-            {
-                "description": "allOf: false, anyOf: false, oneOf: true",
-                "data": 5,
-                "valid": false
-            },
-            {
-                "description": "allOf: false, anyOf: true, oneOf: false",
-                "data": 3,
-                "valid": false
-            },
-            {
-                "description": "allOf: false, anyOf: true, oneOf: true",
-                "data": 15,
-                "valid": false
-            },
-            {
-                "description": "allOf: true, anyOf: false, oneOf: false",
-                "data": 2,
-                "valid": false
-            },
-            {
-                "description": "allOf: true, anyOf: false, oneOf: true",
-                "data": 10,
-                "valid": false
-            },
-            {
-                "description": "allOf: true, anyOf: true, oneOf: false",
-                "data": 6,
-                "valid": false
-            },
-            {
-                "description": "allOf: true, anyOf: true, oneOf: true",
-                "data": 30,
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft2020-12/anchor.json b/json/tests/draft2020-12/anchor.json
deleted file mode 100644
index 423835d..0000000
--- a/json/tests/draft2020-12/anchor.json
+++ /dev/null
@@ -1,235 +0,0 @@
-[
-    {
-        "description": "Location-independent identifier",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "$ref": "#foo",
-            "$defs": {
-                "A": {
-                    "$anchor": "foo",
-                    "type": "integer"
-                }
-            }
-        },
-        "tests": [
-            {
-                "data": 1,
-                "description": "match",
-                "valid": true
-            },
-            {
-                "data": "a",
-                "description": "mismatch",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "Location-independent identifier with absolute URI",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "$ref": "http://localhost:1234/draft2020-12/bar#foo",
-            "$defs": {
-                "A": {
-                    "$id": "http://localhost:1234/draft2020-12/bar",
-                    "$anchor": "foo",
-                    "type": "integer"
-                }
-            }
-        },
-        "tests": [
-            {
-                "data": 1,
-                "description": "match",
-                "valid": true
-            },
-            {
-                "data": "a",
-                "description": "mismatch",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "Location-independent identifier with base URI change in subschema",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "$id": "http://localhost:1234/draft2020-12/root",
-            "$ref": "http://localhost:1234/draft2020-12/nested.json#foo",
-            "$defs": {
-                "A": {
-                    "$id": "nested.json",
-                    "$defs": {
-                        "B": {
-                            "$anchor": "foo",
-                            "type": "integer"
-                        }
-                    }
-                }
-            }
-        },
-        "tests": [
-            {
-                "data": 1,
-                "description": "match",
-                "valid": true
-            },
-            {
-                "data": "a",
-                "description": "mismatch",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "$anchor inside an enum is not a real identifier",
-        "comment": "the implementation must not be confused by an $anchor buried in the enum",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "$defs": {
-                "anchor_in_enum": {
-                    "enum": [
-                        {
-                            "$anchor": "my_anchor",
-                            "type": "null"
-                        }
-                    ]
-                },
-                "real_identifier_in_schema": {
-                    "$anchor": "my_anchor",
-                    "type": "string"
-                },
-                "zzz_anchor_in_const": {
-                    "const": {
-                        "$anchor": "my_anchor",
-                        "type": "null"
-                    }
-                }
-            },
-            "anyOf": [
-                { "$ref": "#/$defs/anchor_in_enum" },
-                { "$ref": "#my_anchor" }
-            ]
-        },
-        "tests": [
-            {
-                "description": "exact match to enum, and type matches",
-                "data": {
-                    "$anchor": "my_anchor",
-                    "type": "null"
-                },
-                "valid": true
-            },
-            {
-                "description": "in implementations that strip $anchor, this may match either $def",
-                "data": {
-                    "type": "null"
-                },
-                "valid": false
-            },
-            {
-                "description": "match $ref to $anchor",
-                "data": "a string to match #/$defs/anchor_in_enum",
-                "valid": true
-            },
-            {
-                "description": "no match on enum or $ref to $anchor",
-                "data": 1,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "same $anchor with different base uri",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "$id": "http://localhost:1234/draft2020-12/foobar",
-            "$defs": {
-                "A": {
-                    "$id": "child1",
-                    "allOf": [
-                        {
-                            "$id": "child2",
-                            "$anchor": "my_anchor",
-                            "type": "number"
-                        },
-                        {
-                            "$anchor": "my_anchor",
-                            "type": "string"
-                        }
-                    ]
-                }
-            },
-            "$ref": "child1#my_anchor"
-        },
-        "tests": [
-            {
-                "description": "$ref resolves to /$defs/A/allOf/1",
-                "data": "a",
-                "valid": true
-            },
-            {
-                "description": "$ref does not resolve to /$defs/A/allOf/0",
-                "data": 1,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "non-schema object containing an $anchor property",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "$defs": {
-                "const_not_anchor": {
-                    "const": {
-                        "$anchor": "not_a_real_anchor"
-                    }
-                }
-            },
-            "if": {
-                "const": "skip not_a_real_anchor"
-            },
-            "then": true,
-            "else" : {
-                "$ref": "#/$defs/const_not_anchor"
-            }
-        },
-        "tests": [
-            {
-                "description": "skip traversing definition for a valid result",
-                "data": "skip not_a_real_anchor",
-                "valid": true
-            },
-            {
-                "description": "const at const_not_anchor does not match",
-                "data": 1,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "invalid anchors",
-        "comment": "Section 8.2.2",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "$ref": "https://json-schema.org/draft/2020-12/schema"
-        },
-        "tests": [
-            {
-                "description": "MUST start with a letter (and not #)",
-                "data": { "$anchor" : "#foo" },
-                "valid": false
-            },
-            {
-                "description": "JSON pointers are not valid",
-                "data": { "$anchor" : "/a/b" },
-                "valid": false
-            },
-            {
-                "description": "invalid with valid beginning",
-                "data": { "$anchor" : "foo#something" },
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft2020-12/anyOf.json b/json/tests/draft2020-12/anyOf.json
deleted file mode 100644
index 89b192d..0000000
--- a/json/tests/draft2020-12/anyOf.json
+++ /dev/null
@@ -1,203 +0,0 @@
-[
-    {
-        "description": "anyOf",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "anyOf": [
-                {
-                    "type": "integer"
-                },
-                {
-                    "minimum": 2
-                }
-            ]
-        },
-        "tests": [
-            {
-                "description": "first anyOf valid",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "second anyOf valid",
-                "data": 2.5,
-                "valid": true
-            },
-            {
-                "description": "both anyOf valid",
-                "data": 3,
-                "valid": true
-            },
-            {
-                "description": "neither anyOf valid",
-                "data": 1.5,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "anyOf with base schema",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "type": "string",
-            "anyOf" : [
-                {
-                    "maxLength": 2
-                },
-                {
-                    "minLength": 4
-                }
-            ]
-        },
-        "tests": [
-            {
-                "description": "mismatch base schema",
-                "data": 3,
-                "valid": false
-            },
-            {
-                "description": "one anyOf valid",
-                "data": "foobar",
-                "valid": true
-            },
-            {
-                "description": "both anyOf invalid",
-                "data": "foo",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "anyOf with boolean schemas, all true",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "anyOf": [true, true]
-        },
-        "tests": [
-            {
-                "description": "any value is valid",
-                "data": "foo",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "anyOf with boolean schemas, some true",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "anyOf": [true, false]
-        },
-        "tests": [
-            {
-                "description": "any value is valid",
-                "data": "foo",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "anyOf with boolean schemas, all false",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "anyOf": [false, false]
-        },
-        "tests": [
-            {
-                "description": "any value is invalid",
-                "data": "foo",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "anyOf complex types",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "anyOf": [
-                {
-                    "properties": {
-                        "bar": {"type": "integer"}
-                    },
-                    "required": ["bar"]
-                },
-                {
-                    "properties": {
-                        "foo": {"type": "string"}
-                    },
-                    "required": ["foo"]
-                }
-            ]
-        },
-        "tests": [
-            {
-                "description": "first anyOf valid (complex)",
-                "data": {"bar": 2},
-                "valid": true
-            },
-            {
-                "description": "second anyOf valid (complex)",
-                "data": {"foo": "baz"},
-                "valid": true
-            },
-            {
-                "description": "both anyOf valid (complex)",
-                "data": {"foo": "baz", "bar": 2},
-                "valid": true
-            },
-            {
-                "description": "neither anyOf valid (complex)",
-                "data": {"foo": 2, "bar": "quux"},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "anyOf with one empty schema",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "anyOf": [
-                { "type": "number" },
-                {}
-            ]
-        },
-        "tests": [
-            {
-                "description": "string is valid",
-                "data": "foo",
-                "valid": true
-            },
-            {
-                "description": "number is valid",
-                "data": 123,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "nested anyOf, to check validation semantics",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "anyOf": [
-                {
-                    "anyOf": [
-                        {
-                            "type": "null"
-                        }
-                    ]
-                }
-            ]
-        },
-        "tests": [
-            {
-                "description": "null is valid",
-                "data": null,
-                "valid": true
-            },
-            {
-                "description": "anything non-null is invalid",
-                "data": 123,
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft2020-12/boolean_schema.json b/json/tests/draft2020-12/boolean_schema.json
deleted file mode 100644
index 6d40f23..0000000
--- a/json/tests/draft2020-12/boolean_schema.json
+++ /dev/null
@@ -1,104 +0,0 @@
-[
-    {
-        "description": "boolean schema 'true'",
-        "schema": true,
-        "tests": [
-            {
-                "description": "number is valid",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "string is valid",
-                "data": "foo",
-                "valid": true
-            },
-            {
-                "description": "boolean true is valid",
-                "data": true,
-                "valid": true
-            },
-            {
-                "description": "boolean false is valid",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "null is valid",
-                "data": null,
-                "valid": true
-            },
-            {
-                "description": "object is valid",
-                "data": {"foo": "bar"},
-                "valid": true
-            },
-            {
-                "description": "empty object is valid",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "array is valid",
-                "data": ["foo"],
-                "valid": true
-            },
-            {
-                "description": "empty array is valid",
-                "data": [],
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "boolean schema 'false'",
-        "schema": false,
-        "tests": [
-            {
-                "description": "number is invalid",
-                "data": 1,
-                "valid": false
-            },
-            {
-                "description": "string is invalid",
-                "data": "foo",
-                "valid": false
-            },
-            {
-                "description": "boolean true is invalid",
-                "data": true,
-                "valid": false
-            },
-            {
-                "description": "boolean false is invalid",
-                "data": false,
-                "valid": false
-            },
-            {
-                "description": "null is invalid",
-                "data": null,
-                "valid": false
-            },
-            {
-                "description": "object is invalid",
-                "data": {"foo": "bar"},
-                "valid": false
-            },
-            {
-                "description": "empty object is invalid",
-                "data": {},
-                "valid": false
-            },
-            {
-                "description": "array is invalid",
-                "data": ["foo"],
-                "valid": false
-            },
-            {
-                "description": "empty array is invalid",
-                "data": [],
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft2020-12/const.json b/json/tests/draft2020-12/const.json
deleted file mode 100644
index 50be86a..0000000
--- a/json/tests/draft2020-12/const.json
+++ /dev/null
@@ -1,387 +0,0 @@
-[
-    {
-        "description": "const validation",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "const": 2
-        },
-        "tests": [
-            {
-                "description": "same value is valid",
-                "data": 2,
-                "valid": true
-            },
-            {
-                "description": "another value is invalid",
-                "data": 5,
-                "valid": false
-            },
-            {
-                "description": "another type is invalid",
-                "data": "a",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "const with object",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "const": {"foo": "bar", "baz": "bax"}
-        },
-        "tests": [
-            {
-                "description": "same object is valid",
-                "data": {"foo": "bar", "baz": "bax"},
-                "valid": true
-            },
-            {
-                "description": "same object with different property order is valid",
-                "data": {"baz": "bax", "foo": "bar"},
-                "valid": true
-            },
-            {
-                "description": "another object is invalid",
-                "data": {"foo": "bar"},
-                "valid": false
-            },
-            {
-                "description": "another type is invalid",
-                "data": [1, 2],
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "const with array",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "const": [{ "foo": "bar" }]
-        },
-        "tests": [
-            {
-                "description": "same array is valid",
-                "data": [{"foo": "bar"}],
-                "valid": true
-            },
-            {
-                "description": "another array item is invalid",
-                "data": [2],
-                "valid": false
-            },
-            {
-                "description": "array with additional items is invalid",
-                "data": [1, 2, 3],
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "const with null",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "const": null
-        },
-        "tests": [
-            {
-                "description": "null is valid",
-                "data": null,
-                "valid": true
-            },
-            {
-                "description": "not null is invalid",
-                "data": 0,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "const with false does not match 0",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "const": false
-        },
-        "tests": [
-            {
-                "description": "false is valid",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "integer zero is invalid",
-                "data": 0,
-                "valid": false
-            },
-            {
-                "description": "float zero is invalid",
-                "data": 0.0,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "const with true does not match 1",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "const": true
-        },
-        "tests": [
-            {
-                "description": "true is valid",
-                "data": true,
-                "valid": true
-            },
-            {
-                "description": "integer one is invalid",
-                "data": 1,
-                "valid": false
-            },
-            {
-                "description": "float one is invalid",
-                "data": 1.0,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "const with [false] does not match [0]",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "const": [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": "const with [true] does not match [1]",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "const": [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": "const with {\"a\": false} does not match {\"a\": 0}",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "const": {"a": false}
-        },
-        "tests": [
-            {
-                "description": "{\"a\": false} is valid",
-                "data": {"a": false},
-                "valid": true
-            },
-            {
-                "description": "{\"a\": 0} is invalid",
-                "data": {"a": 0},
-                "valid": false
-            },
-            {
-                "description": "{\"a\": 0.0} is invalid",
-                "data": {"a": 0.0},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "const with {\"a\": true} does not match {\"a\": 1}",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "const": {"a": true}
-        },
-        "tests": [
-            {
-                "description": "{\"a\": true} is valid",
-                "data": {"a": true},
-                "valid": true
-            },
-            {
-                "description": "{\"a\": 1} is invalid",
-                "data": {"a": 1},
-                "valid": false
-            },
-            {
-                "description": "{\"a\": 1.0} is invalid",
-                "data": {"a": 1.0},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "const with 0 does not match other zero-like types",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "const": 0
-        },
-        "tests": [
-            {
-                "description": "false is invalid",
-                "data": false,
-                "valid": false
-            },
-            {
-                "description": "integer zero is valid",
-                "data": 0,
-                "valid": true
-            },
-            {
-                "description": "float zero is valid",
-                "data": 0.0,
-                "valid": true
-            },
-            {
-                "description": "empty object is invalid",
-                "data": {},
-                "valid": false
-            },
-            {
-                "description": "empty array is invalid",
-                "data": [],
-                "valid": false
-            },
-            {
-                "description": "empty string is invalid",
-                "data": "",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "const with 1 does not match true",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "const": 1
-        },
-        "tests": [
-            {
-                "description": "true is invalid",
-                "data": true,
-                "valid": false
-            },
-            {
-                "description": "integer one is valid",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "float one is valid",
-                "data": 1.0,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "const with -2.0 matches integer and float types",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "const": -2.0
-        },
-        "tests": [
-            {
-                "description": "integer -2 is valid",
-                "data": -2,
-                "valid": true
-            },
-            {
-                "description": "integer 2 is invalid",
-                "data": 2,
-                "valid": false
-            },
-            {
-                "description": "float -2.0 is valid",
-                "data": -2.0,
-                "valid": true
-            },
-            {
-                "description": "float 2.0 is invalid",
-                "data": 2.0,
-                "valid": false
-            },
-            {
-                "description": "float -2.00001 is invalid",
-                "data": -2.00001,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "float and integers are equal up to 64-bit representation limits",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "const": 9007199254740992
-        },
-        "tests": [
-            {
-                "description": "integer is valid",
-                "data": 9007199254740992,
-                "valid": true
-            },
-            {
-                "description": "integer minus one is invalid",
-                "data": 9007199254740991,
-                "valid": false
-            },
-            {
-                "description": "float is valid",
-                "data": 9007199254740992.0,
-                "valid": true
-            },
-            {
-                "description": "float minus one is invalid",
-                "data": 9007199254740991.0,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "nul characters in strings",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "const": "hello\u0000there"
-        },
-        "tests": [
-            {
-                "description": "match string with nul",
-                "data": "hello\u0000there",
-                "valid": true
-            },
-            {
-                "description": "do not match string lacking nul",
-                "data": "hellothere",
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft2020-12/contains.json b/json/tests/draft2020-12/contains.json
deleted file mode 100644
index 08a00a7..0000000
--- a/json/tests/draft2020-12/contains.json
+++ /dev/null
@@ -1,176 +0,0 @@
-[
-    {
-        "description": "contains keyword validation",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "contains": {"minimum": 5}
-        },
-        "tests": [
-            {
-                "description": "array with item matching schema (5) is valid",
-                "data": [3, 4, 5],
-                "valid": true
-            },
-            {
-                "description": "array with item matching schema (6) is valid",
-                "data": [3, 4, 6],
-                "valid": true
-            },
-            {
-                "description": "array with two items matching schema (5, 6) is valid",
-                "data": [3, 4, 5, 6],
-                "valid": true
-            },
-            {
-                "description": "array without items matching schema is invalid",
-                "data": [2, 3, 4],
-                "valid": false
-            },
-            {
-                "description": "empty array is invalid",
-                "data": [],
-                "valid": false
-            },
-            {
-                "description": "not array is valid",
-                "data": {},
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "contains keyword with const keyword",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "contains": { "const": 5 }
-        },
-        "tests": [
-            {
-                "description": "array with item 5 is valid",
-                "data": [3, 4, 5],
-                "valid": true
-            },
-            {
-                "description": "array with two items 5 is valid",
-                "data": [3, 4, 5, 5],
-                "valid": true
-            },
-            {
-                "description": "array without item 5 is invalid",
-                "data": [1, 2, 3, 4],
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "contains keyword with boolean schema true",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "contains": true
-        },
-        "tests": [
-            {
-                "description": "any non-empty array is valid",
-                "data": ["foo"],
-                "valid": true
-            },
-            {
-                "description": "empty array is invalid",
-                "data": [],
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "contains keyword with boolean schema false",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "contains": false
-        },
-        "tests": [
-            {
-                "description": "any non-empty array is invalid",
-                "data": ["foo"],
-                "valid": false
-            },
-            {
-                "description": "empty array is invalid",
-                "data": [],
-                "valid": false
-            },
-            {
-                "description": "non-arrays are valid",
-                "data": "contains does not apply to strings",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "items + contains",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "items": { "multipleOf": 2 },
-            "contains": { "multipleOf": 3 }
-        },
-        "tests": [
-            {
-                "description": "matches items, does not match contains",
-                "data": [ 2, 4, 8 ],
-                "valid": false
-            },
-            {
-                "description": "does not match items, matches contains",
-                "data": [ 3, 6, 9 ],
-                "valid": false
-            },
-            {
-                "description": "matches both items and contains",
-                "data": [ 6, 12 ],
-                "valid": true
-            },
-            {
-                "description": "matches neither items nor contains",
-                "data": [ 1, 5 ],
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "contains with false if subschema",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "contains": {
-                "if": false,
-                "else": true
-            }
-        },
-        "tests": [
-            {
-                "description": "any non-empty array is valid",
-                "data": ["foo"],
-                "valid": true
-            },
-            {
-                "description": "empty array is invalid",
-                "data": [],
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "contains with null instance elements",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "contains": {
-                "type": "null"
-            }
-        },
-        "tests": [
-            {
-                "description": "allows null items",
-                "data": [ null ],
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft2020-12/content.json b/json/tests/draft2020-12/content.json
deleted file mode 100644
index 698f780..0000000
--- a/json/tests/draft2020-12/content.json
+++ /dev/null
@@ -1,131 +0,0 @@
-[
-    {
-        "description": "validation of string-encoded content based on media type",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "contentMediaType": "application/json"
-        },
-        "tests": [
-            {
-                "description": "a valid JSON document",
-                "data": "{\"foo\": \"bar\"}",
-                "valid": true
-            },
-            {
-                "description": "an invalid JSON document; validates true",
-                "data": "{:}",
-                "valid": true
-            },
-            {
-                "description": "ignores non-strings",
-                "data": 100,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "validation of binary string-encoding",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "contentEncoding": "base64"
-        },
-        "tests": [
-            {
-                "description": "a valid base64 string",
-                "data": "eyJmb28iOiAiYmFyIn0K",
-                "valid": true
-            },
-            {
-                "description": "an invalid base64 string (% is not a valid character); validates true",
-                "data": "eyJmb28iOi%iYmFyIn0K",
-                "valid": true
-            },
-            {
-                "description": "ignores non-strings",
-                "data": 100,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "validation of binary-encoded media type documents",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "contentMediaType": "application/json",
-            "contentEncoding": "base64"
-        },
-        "tests": [
-            {
-                "description": "a valid base64-encoded JSON document",
-                "data": "eyJmb28iOiAiYmFyIn0K",
-                "valid": true
-            },
-            {
-                "description": "a validly-encoded invalid JSON document; validates true",
-                "data": "ezp9Cg==",
-                "valid": true
-            },
-            {
-                "description": "an invalid base64 string that is valid JSON; validates true",
-                "data": "{}",
-                "valid": true
-            },
-            {
-                "description": "ignores non-strings",
-                "data": 100,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "validation of binary-encoded media type documents with schema",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "contentMediaType": "application/json",
-            "contentEncoding": "base64",
-            "contentSchema": { "type": "object", "required": ["foo"], "properties": { "foo": { "type": "string" } } }
-        },
-        "tests": [
-            {
-                "description": "a valid base64-encoded JSON document",
-                "data": "eyJmb28iOiAiYmFyIn0K",
-                "valid": true
-            },
-            {
-                "description": "another valid base64-encoded JSON document",
-                "data": "eyJib28iOiAyMCwgImZvbyI6ICJiYXoifQ==",
-                "valid": true
-            },
-            {
-                "description": "an invalid base64-encoded JSON document; validates true",
-                "data": "eyJib28iOiAyMH0=",
-                "valid": true
-            },
-            {
-                "description": "an empty object as a base64-encoded JSON document; validates true",
-                "data": "e30=",
-                "valid": true
-            },
-            {
-                "description": "an empty array as a base64-encoded JSON document",
-                "data": "W10=",
-                "valid": true
-            },
-            {
-                "description": "a validly-encoded invalid JSON document; validates true",
-                "data": "ezp9Cg==",
-                "valid": true
-            },
-            {
-                "description": "an invalid base64 string that is valid JSON; validates true",
-                "data": "{}",
-                "valid": true
-            },
-            {
-                "description": "ignores non-strings",
-                "data": 100,
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft2020-12/default.json b/json/tests/draft2020-12/default.json
deleted file mode 100644
index ceb3ae2..0000000
--- a/json/tests/draft2020-12/default.json
+++ /dev/null
@@ -1,82 +0,0 @@
-[
-    {
-        "description": "invalid type for default",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "properties": {
-                "foo": {
-                    "type": "integer",
-                    "default": []
-                }
-            }
-        },
-        "tests": [
-            {
-                "description": "valid when property is specified",
-                "data": {"foo": 13},
-                "valid": true
-            },
-            {
-                "description": "still valid when the invalid default is used",
-                "data": {},
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "invalid string value for default",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "properties": {
-                "bar": {
-                    "type": "string",
-                    "minLength": 4,
-                    "default": "bad"
-                }
-            }
-        },
-        "tests": [
-            {
-                "description": "valid when property is specified",
-                "data": {"bar": "good"},
-                "valid": true
-            },
-            {
-                "description": "still valid when the invalid default is used",
-                "data": {},
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "the default keyword does not do anything if the property is missing",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "type": "object",
-            "properties": {
-                "alpha": {
-                    "type": "number",
-                    "maximum": 3,
-                    "default": 5
-                }
-            }
-        },
-        "tests": [
-            {
-                "description": "an explicit property value is checked against maximum (passing)",
-                "data": { "alpha": 1 },
-                "valid": true
-            },
-            {
-                "description": "an explicit property value is checked against maximum (failing)",
-                "data": { "alpha": 5 },
-                "valid": false
-            },
-            {
-                "description": "missing properties are not filled in with the default",
-                "data": {},
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft2020-12/defs.json b/json/tests/draft2020-12/defs.json
deleted file mode 100644
index da2a503..0000000
--- a/json/tests/draft2020-12/defs.json
+++ /dev/null
@@ -1,21 +0,0 @@
-[
-    {
-        "description": "validate definition against metaschema",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "$ref": "https://json-schema.org/draft/2020-12/schema"
-        },
-        "tests": [
-            {
-                "description": "valid definition schema",
-                "data": {"$defs": {"foo": {"type": "integer"}}},
-                "valid": true
-            },
-            {
-                "description": "invalid definition schema",
-                "data": {"$defs": {"foo": {"type": 1}}},
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft2020-12/dependentRequired.json b/json/tests/draft2020-12/dependentRequired.json
deleted file mode 100644
index 2baa38e..0000000
--- a/json/tests/draft2020-12/dependentRequired.json
+++ /dev/null
@@ -1,152 +0,0 @@
-[
-    {
-        "description": "single dependency",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "dependentRequired": {"bar": ["foo"]}
-        },
-        "tests": [
-            {
-                "description": "neither",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "nondependant",
-                "data": {"foo": 1},
-                "valid": true
-            },
-            {
-                "description": "with dependency",
-                "data": {"foo": 1, "bar": 2},
-                "valid": true
-            },
-            {
-                "description": "missing dependency",
-                "data": {"bar": 2},
-                "valid": false
-            },
-            {
-                "description": "ignores arrays",
-                "data": ["bar"],
-                "valid": true
-            },
-            {
-                "description": "ignores strings",
-                "data": "foobar",
-                "valid": true
-            },
-            {
-                "description": "ignores other non-objects",
-                "data": 12,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "empty dependents",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "dependentRequired": {"bar": []}
-        },
-        "tests": [
-            {
-                "description": "empty object",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "object with one property",
-                "data": {"bar": 2},
-                "valid": true
-            },
-            {
-                "description": "non-object is valid",
-                "data": 1,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "multiple dependents required",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "dependentRequired": {"quux": ["foo", "bar"]}
-        },
-        "tests": [
-            {
-                "description": "neither",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "nondependants",
-                "data": {"foo": 1, "bar": 2},
-                "valid": true
-            },
-            {
-                "description": "with dependencies",
-                "data": {"foo": 1, "bar": 2, "quux": 3},
-                "valid": true
-            },
-            {
-                "description": "missing dependency",
-                "data": {"foo": 1, "quux": 2},
-                "valid": false
-            },
-            {
-                "description": "missing other dependency",
-                "data": {"bar": 1, "quux": 2},
-                "valid": false
-            },
-            {
-                "description": "missing both dependencies",
-                "data": {"quux": 1},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "dependencies with escaped characters",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "dependentRequired": {
-                "foo\nbar": ["foo\rbar"],
-                "foo\"bar": ["foo'bar"]
-            }
-        },
-        "tests": [
-            {
-                "description": "CRLF",
-                "data": {
-                    "foo\nbar": 1,
-                    "foo\rbar": 2
-                },
-                "valid": true
-            },
-            {
-                "description": "quoted quotes",
-                "data": {
-                    "foo'bar": 1,
-                    "foo\"bar": 2
-                },
-                "valid": true
-            },
-            {
-                "description": "CRLF missing dependent",
-                "data": {
-                    "foo\nbar": 1,
-                    "foo": 2
-                },
-                "valid": false
-            },
-            {
-                "description": "quoted quotes missing dependent",
-                "data": {
-                    "foo\"bar": 2
-                },
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft2020-12/dependentSchemas.json b/json/tests/draft2020-12/dependentSchemas.json
deleted file mode 100644
index bf7aa53..0000000
--- a/json/tests/draft2020-12/dependentSchemas.json
+++ /dev/null
@@ -1,132 +0,0 @@
-[
-    {
-        "description": "single dependency",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "dependentSchemas": {
-                "bar": {
-                    "properties": {
-                        "foo": {"type": "integer"},
-                        "bar": {"type": "integer"}
-                    }
-                }
-            }
-        },
-        "tests": [
-            {
-                "description": "valid",
-                "data": {"foo": 1, "bar": 2},
-                "valid": true
-            },
-            {
-                "description": "no dependency",
-                "data": {"foo": "quux"},
-                "valid": true
-            },
-            {
-                "description": "wrong type",
-                "data": {"foo": "quux", "bar": 2},
-                "valid": false
-            },
-            {
-                "description": "wrong type other",
-                "data": {"foo": 2, "bar": "quux"},
-                "valid": false
-            },
-            {
-                "description": "wrong type both",
-                "data": {"foo": "quux", "bar": "quux"},
-                "valid": false
-            },
-            {
-                "description": "ignores arrays",
-                "data": ["bar"],
-                "valid": true
-            },
-            {
-                "description": "ignores strings",
-                "data": "foobar",
-                "valid": true
-            },
-            {
-                "description": "ignores other non-objects",
-                "data": 12,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "boolean subschemas",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "dependentSchemas": {
-                "foo": true,
-                "bar": false
-            }
-        },
-        "tests": [
-            {
-                "description": "object with property having schema true is valid",
-                "data": {"foo": 1},
-                "valid": true
-            },
-            {
-                "description": "object with property having schema false is invalid",
-                "data": {"bar": 2},
-                "valid": false
-            },
-            {
-                "description": "object with both properties is invalid",
-                "data": {"foo": 1, "bar": 2},
-                "valid": false
-            },
-            {
-                "description": "empty object is valid",
-                "data": {},
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "dependencies with escaped characters",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "dependentSchemas": {
-                "foo\tbar": {"minProperties": 4},
-                "foo'bar": {"required": ["foo\"bar"]}
-            }
-        },
-        "tests": [
-            {
-                "description": "quoted tab",
-                "data": {
-                    "foo\tbar": 1,
-                    "a": 2,
-                    "b": 3,
-                    "c": 4
-                },
-                "valid": true
-            },
-            {
-                "description": "quoted quote",
-                "data": {
-                    "foo'bar": {"foo\"bar": 1}
-                },
-                "valid": false
-            },
-            {
-                "description": "quoted tab invalid under dependent schema",
-                "data": {
-                    "foo\tbar": 1,
-                    "a": 2
-                },
-                "valid": false
-            },
-            {
-                "description": "quoted quote invalid under dependent schema",
-                "data": {"foo'bar": 1},
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft2020-12/dynamicRef.json b/json/tests/draft2020-12/dynamicRef.json
deleted file mode 100644
index 90d863c..0000000
--- a/json/tests/draft2020-12/dynamicRef.json
+++ /dev/null
@@ -1,635 +0,0 @@
-[
-    {
-        "description": "A $dynamicRef to a $dynamicAnchor in the same schema resource behaves like a normal $ref to an $anchor",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "$id": "https://test.json-schema.org/dynamicRef-dynamicAnchor-same-schema/root",
-            "type": "array",
-            "items": { "$dynamicRef": "#items" },
-            "$defs": {
-                "foo": {
-                    "$dynamicAnchor": "items",
-                    "type": "string"
-                }
-            }
-        },
-        "tests": [
-            {
-                "description": "An array of strings is valid",
-                "data": ["foo", "bar"],
-                "valid": true
-            },
-            {
-                "description": "An array containing non-strings is invalid",
-                "data": ["foo", 42],
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "A $dynamicRef to an $anchor in the same schema resource behaves like a normal $ref to an $anchor",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "$id": "https://test.json-schema.org/dynamicRef-anchor-same-schema/root",
-            "type": "array",
-            "items": { "$dynamicRef": "#items" },
-            "$defs": {
-                "foo": {
-                    "$anchor": "items",
-                    "type": "string"
-                }
-            }
-        },
-        "tests": [
-            {
-                "description": "An array of strings is valid",
-                "data": ["foo", "bar"],
-                "valid": true
-            },
-            {
-                "description": "An array containing non-strings is invalid",
-                "data": ["foo", 42],
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "A $ref to a $dynamicAnchor in the same schema resource behaves like a normal $ref to an $anchor",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "$id": "https://test.json-schema.org/ref-dynamicAnchor-same-schema/root",
-            "type": "array",
-            "items": { "$ref": "#items" },
-            "$defs": {
-                "foo": {
-                    "$dynamicAnchor": "items",
-                    "type": "string"
-                }
-            }
-        },
-        "tests": [
-            {
-                "description": "An array of strings is valid",
-                "data": ["foo", "bar"],
-                "valid": true
-            },
-            {
-                "description": "An array containing non-strings is invalid",
-                "data": ["foo", 42],
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "A $dynamicRef resolves to the first $dynamicAnchor still in scope that is encountered when the schema is evaluated",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "$id": "https://test.json-schema.org/typical-dynamic-resolution/root",
-            "$ref": "list",
-            "$defs": {
-                "foo": {
-                    "$dynamicAnchor": "items",
-                    "type": "string"
-                },
-                "list": {
-                    "$id": "list",
-                    "type": "array",
-                    "items": { "$dynamicRef": "#items" },
-                    "$defs": {
-                      "items": {
-                          "$comment": "This is only needed to satisfy the bookending requirement",
-                          "$dynamicAnchor": "items"
-                      }
-                    }
-                }
-            }
-        },
-        "tests": [
-            {
-                "description": "An array of strings is valid",
-                "data": ["foo", "bar"],
-                "valid": true
-            },
-            {
-                "description": "An array containing non-strings is invalid",
-                "data": ["foo", 42],
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "A $dynamicRef with intermediate scopes that don't include a matching $dynamicAnchor does not affect dynamic scope resolution",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "$id": "https://test.json-schema.org/dynamic-resolution-with-intermediate-scopes/root",
-            "$ref": "intermediate-scope",
-            "$defs": {
-                "foo": {
-                    "$dynamicAnchor": "items",
-                    "type": "string"
-                },
-                "intermediate-scope": {
-                    "$id": "intermediate-scope",
-                    "$ref": "list"
-                },
-                "list": {
-                    "$id": "list",
-                    "type": "array",
-                    "items": { "$dynamicRef": "#items" },
-                    "$defs": {
-                      "items": {
-                          "$comment": "This is only needed to satisfy the bookending requirement",
-                          "$dynamicAnchor": "items"
-                      }
-                    }
-                }
-            }
-        },
-        "tests": [
-            {
-                "description": "An array of strings is valid",
-                "data": ["foo", "bar"],
-                "valid": true
-            },
-            {
-                "description": "An array containing non-strings is invalid",
-                "data": ["foo", 42],
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "An $anchor with the same name as a $dynamicAnchor is not used for dynamic scope resolution",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "$id": "https://test.json-schema.org/dynamic-resolution-ignores-anchors/root",
-            "$ref": "list",
-            "$defs": {
-                "foo": {
-                    "$anchor": "items",
-                    "type": "string"
-                },
-                "list": {
-                    "$id": "list",
-                    "type": "array",
-                    "items": { "$dynamicRef": "#items" },
-                    "$defs": {
-                      "items": {
-                          "$comment": "This is only needed to satisfy the bookending requirement",
-                          "$dynamicAnchor": "items"
-                      }
-                    }
-                }
-            }
-        },
-        "tests": [
-            {
-                "description": "Any array is valid",
-                "data": ["foo", 42],
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "A $dynamicRef without a matching $dynamicAnchor in the same schema resource behaves like a normal $ref to $anchor",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "$id": "https://test.json-schema.org/dynamic-resolution-without-bookend/root",
-            "$ref": "list",
-            "$defs": {
-                "foo": {
-                    "$dynamicAnchor": "items",
-                    "type": "string"
-                },
-                "list": {
-                    "$id": "list",
-                    "type": "array",
-                    "items": { "$dynamicRef": "#items" },
-                    "$defs": {
-                        "items": {
-                            "$comment": "This is only needed to give the reference somewhere to resolve to when it behaves like $ref",
-                            "$anchor": "items"
-                        }
-                    }
-                }
-            }
-        },
-        "tests": [
-            {
-                "description": "Any array is valid",
-                "data": ["foo", 42],
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "A $dynamicRef with a non-matching $dynamicAnchor in the same schema resource behaves like a normal $ref to $anchor",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "$id": "https://test.json-schema.org/unmatched-dynamic-anchor/root",
-            "$ref": "list",
-            "$defs": {
-                "foo": {
-                    "$dynamicAnchor": "items",
-                    "type": "string"
-                },
-                "list": {
-                    "$id": "list",
-                    "type": "array",
-                    "items": { "$dynamicRef": "#items" },
-                    "$defs": {
-                        "items": {
-                            "$comment": "This is only needed to give the reference somewhere to resolve to when it behaves like $ref",
-                            "$anchor": "items",
-                            "$dynamicAnchor": "foo"
-                        }
-                    }
-                }
-            }
-        },
-        "tests": [
-            {
-                "description": "Any array is valid",
-                "data": ["foo", 42],
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "A $dynamicRef that initially resolves to a schema with a matching $dynamicAnchor resolves to the first $dynamicAnchor in the dynamic scope",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "$id": "https://test.json-schema.org/relative-dynamic-reference/root",
-            "$dynamicAnchor": "meta",
-            "type": "object",
-            "properties": {
-                "foo": { "const": "pass" }
-            },
-            "$ref": "extended",
-            "$defs": {
-                "extended": {
-                    "$id": "extended",
-                    "$dynamicAnchor": "meta",
-                    "type": "object",
-                    "properties": {
-                        "bar": { "$ref": "bar" }
-                    }
-                },
-                "bar": {
-                    "$id": "bar",
-                    "type": "object",
-                    "properties": {
-                        "baz": { "$dynamicRef": "extended#meta" }
-                    }
-                }
-            }
-        },
-        "tests": [
-            {
-                "description": "The recursive part is valid against the root",
-                "data": {
-                    "foo": "pass",
-                    "bar": {
-                        "baz": { "foo": "pass" }
-                    }
-                },
-                "valid": true
-            },
-            {
-                "description": "The recursive part is not valid against the root",
-                "data": {
-                    "foo": "pass",
-                    "bar": {
-                        "baz": { "foo": "fail" }
-                    }
-                },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "A $dynamicRef that initially resolves to a schema without a matching $dynamicAnchor behaves like a normal $ref to $anchor",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "$id": "https://test.json-schema.org/relative-dynamic-reference-without-bookend/root",
-            "$dynamicAnchor": "meta",
-            "type": "object",
-            "properties": {
-                "foo": { "const": "pass" }
-            },
-            "$ref": "extended",
-            "$defs": {
-                "extended": {
-                    "$id": "extended",
-                    "$anchor": "meta",
-                    "type": "object",
-                    "properties": {
-                        "bar": { "$ref": "bar" }
-                    }
-                },
-                "bar": {
-                    "$id": "bar",
-                    "type": "object",
-                    "properties": {
-                        "baz": { "$dynamicRef": "extended#meta" }
-                    }
-                }
-            }
-        },
-        "tests": [
-            {
-                "description": "The recursive part doesn't need to validate against the root",
-                "data": {
-                    "foo": "pass",
-                    "bar": {
-                        "baz": { "foo": "fail" }
-                    }
-                },
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "multiple dynamic paths to the $dynamicRef keyword",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "$id": "https://test.json-schema.org/dynamic-ref-with-multiple-paths/main",
-            "$defs": {
-                "inner": {
-                    "$id": "inner",
-                    "$dynamicAnchor": "foo",
-                    "title": "inner",
-                    "additionalProperties": {
-                        "$dynamicRef": "#foo"
-                    }
-                }
-            },
-            "if": {
-                "propertyNames": {
-                    "pattern": "^[a-m]"
-                }
-            },
-            "then": {
-                "title": "any type of node",
-                "$id": "anyLeafNode",
-                "$dynamicAnchor": "foo",
-                "$ref": "inner"
-            },
-            "else": {
-                "title": "integer node",
-                "$id": "integerNode",
-                "$dynamicAnchor": "foo",
-                "type": [ "object", "integer" ],
-                "$ref": "inner"
-            }
-        },
-        "tests": [
-            {
-                "description": "recurse to anyLeafNode - floats are allowed",
-                "data": { "alpha": 1.1 },
-                "valid": true
-            },
-            {
-                "description": "recurse to integerNode - floats are not allowed",
-                "data": { "november": 1.1 },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "after leaving a dynamic scope, it is not used by a $dynamicRef",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "$id": "https://test.json-schema.org/dynamic-ref-leaving-dynamic-scope/main",
-            "if": {
-                "$id": "first_scope",
-                "$defs": {
-                    "thingy": {
-                        "$comment": "this is first_scope#thingy",
-                        "$dynamicAnchor": "thingy",
-                        "type": "number"
-                    }
-                }
-            },
-            "then": {
-                "$id": "second_scope",
-                "$ref": "start",
-                "$defs": {
-                    "thingy": {
-                        "$comment": "this is second_scope#thingy, the final destination of the $dynamicRef",
-                        "$dynamicAnchor": "thingy",
-                        "type": "null"
-                    }
-                }
-            },
-            "$defs": {
-                "start": {
-                    "$comment": "this is the landing spot from $ref",
-                    "$id": "start",
-                    "$dynamicRef": "inner_scope#thingy"
-                },
-                "thingy": {
-                    "$comment": "this is the first stop for the $dynamicRef",
-                    "$id": "inner_scope",
-                    "$dynamicAnchor": "thingy",
-                    "type": "string"
-                }
-            }
-        },
-        "tests": [
-            {
-                "description": "string matches /$defs/thingy, but the $dynamicRef does not stop here",
-                "data": "a string",
-                "valid": false
-            },
-            {
-                "description": "first_scope is not in dynamic scope for the $dynamicRef",
-                "data": 42,
-                "valid": false
-            },
-            {
-                "description": "/then/$defs/thingy is the final stop for the $dynamicRef",
-                "data": null,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "strict-tree schema, guards against misspelled properties",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "$id": "http://localhost:1234/draft2020-12/strict-tree.json",
-            "$dynamicAnchor": "node",
-
-            "$ref": "tree.json",
-            "unevaluatedProperties": false
-        },
-        "tests": [
-            {
-                "description": "instance with misspelled field",
-                "data": {
-                    "children": [{
-                            "daat": 1
-                        }]
-                },
-                "valid": false
-            },
-            {
-                "description": "instance with correct field",
-                "data": {
-                    "children": [{
-                            "data": 1
-                        }]
-                },
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "tests for implementation dynamic anchor and reference link",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "$id": "http://localhost:1234/draft2020-12/strict-extendible.json",
-            "$ref": "extendible-dynamic-ref.json",
-            "$defs": {
-                "elements": {
-                    "$dynamicAnchor": "elements",
-                    "properties": {
-                        "a": true
-                    },
-                    "required": ["a"],
-                    "additionalProperties": false
-                }
-            }
-        },
-        "tests": [
-            {
-                "description": "incorrect parent schema",
-                "data": {
-                    "a": true
-                },
-                "valid": false
-            },
-            {
-                "description": "incorrect extended schema",
-                "data": {
-                    "elements": [
-                        { "b": 1 }
-                    ]
-                },
-                "valid": false
-            },
-            {
-                "description": "correct extended schema",
-                "data": {
-                    "elements": [
-                        { "a": 1 }
-                    ]
-                },
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "$ref and $dynamicAnchor are independent of order - $defs first",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "$id": "http://localhost:1234/draft2020-12/strict-extendible-allof-defs-first.json",
-            "allOf": [
-                {
-                    "$ref": "extendible-dynamic-ref.json"
-                },
-                {
-                    "$defs": {
-                        "elements": {
-                            "$dynamicAnchor": "elements",
-                            "properties": {
-                                "a": true
-                            },
-                            "required": ["a"],
-                            "additionalProperties": false
-                        }
-                    }
-                }
-            ]
-        },
-        "tests": [
-            {
-                "description": "incorrect parent schema",
-                "data": {
-                    "a": true
-                },
-                "valid": false
-            },
-            {
-                "description": "incorrect extended schema",
-                "data": {
-                    "elements": [
-                        { "b": 1 }
-                    ]
-                },
-                "valid": false
-            },
-            {
-                "description": "correct extended schema",
-                "data": {
-                    "elements": [
-                        { "a": 1 }
-                    ]
-                },
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "$ref and $dynamicAnchor are independent of order - $ref first",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "$id": "http://localhost:1234/draft2020-12/strict-extendible-allof-ref-first.json",
-            "allOf": [
-                {
-                    "$defs": {
-                        "elements": {
-                            "$dynamicAnchor": "elements",
-                            "properties": {
-                                "a": true
-                            },
-                            "required": ["a"],
-                            "additionalProperties": false
-                        }
-                    }
-                },
-                {
-                    "$ref": "extendible-dynamic-ref.json"
-                }
-            ]
-        },
-        "tests": [
-            {
-                "description": "incorrect parent schema",
-                "data": {
-                    "a": true
-                },
-                "valid": false
-            },
-            {
-                "description": "incorrect extended schema",
-                "data": {
-                    "elements": [
-                        { "b": 1 }
-                    ]
-                },
-                "valid": false
-            },
-            {
-                "description": "correct extended schema",
-                "data": {
-                    "elements": [
-                        { "a": 1 }
-                    ]
-                },
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft2020-12/enum.json b/json/tests/draft2020-12/enum.json
deleted file mode 100644
index 0d780b2..0000000
--- a/json/tests/draft2020-12/enum.json
+++ /dev/null
@@ -1,262 +0,0 @@
-[
-    {
-        "description": "simple enum validation",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "enum": [1, 2, 3]
-        },
-        "tests": [
-            {
-                "description": "one of the enum is valid",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "something else is invalid",
-                "data": 4,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "heterogeneous enum validation",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "enum": [6, "foo", [], true, {"foo": 12}]
-        },
-        "tests": [
-            {
-                "description": "one of the enum is valid",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "something else is invalid",
-                "data": null,
-                "valid": false
-            },
-            {
-                "description": "objects are deep compared",
-                "data": {"foo": false},
-                "valid": false
-            },
-            {
-                "description": "valid object matches",
-                "data": {"foo": 12},
-                "valid": true
-            },
-            {
-                "description": "extra properties in object is invalid",
-                "data": {"foo": 12, "boo": 42},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "heterogeneous enum-with-null validation",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "enum": [6, null]
-        },
-        "tests": [
-            {
-                "description": "null is valid",
-                "data": null,
-                "valid": true
-            },
-            {
-                "description": "number is valid",
-                "data": 6,
-                "valid": true
-            },
-            {
-                "description": "something else is invalid",
-                "data": "test",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "enums in properties",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "type":"object",
-            "properties": {
-                "foo": {"enum":["foo"]},
-                "bar": {"enum":["bar"]}
-            },
-            "required": ["bar"]
-        },
-        "tests": [
-            {
-                "description": "both properties are valid",
-                "data": {"foo":"foo", "bar":"bar"},
-                "valid": true
-            },
-            {
-                "description": "wrong foo value",
-                "data": {"foo":"foot", "bar":"bar"},
-                "valid": false
-            },
-            {
-                "description": "wrong bar value",
-                "data": {"foo":"foo", "bar":"bart"},
-                "valid": false
-            },
-            {
-                "description": "missing optional property is valid",
-                "data": {"bar":"bar"},
-                "valid": true
-            },
-            {
-                "description": "missing required property is invalid",
-                "data": {"foo":"foo"},
-                "valid": false
-            },
-            {
-                "description": "missing all properties is invalid",
-                "data": {},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "enum with escaped characters",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "enum": ["foo\nbar", "foo\rbar"]
-        },
-        "tests": [
-            {
-                "description": "member 1 is valid",
-                "data": "foo\nbar",
-                "valid": true
-            },
-            {
-                "description": "member 2 is valid",
-                "data": "foo\rbar",
-                "valid": true
-            },
-            {
-                "description": "another string is invalid",
-                "data": "abc",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "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": "integer zero is invalid",
-                "data": 0,
-                "valid": false
-            },
-            {
-                "description": "float zero is invalid",
-                "data": 0.0,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "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": "integer one is invalid",
-                "data": 1,
-                "valid": false
-            },
-            {
-                "description": "float one is invalid",
-                "data": 1.0,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "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": "integer zero is valid",
-                "data": 0,
-                "valid": true
-            },
-            {
-                "description": "float zero is valid",
-                "data": 0.0,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "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": "integer one is valid",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "float one is valid",
-                "data": 1.0,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "nul characters in strings",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "enum": [ "hello\u0000there" ]
-        },
-        "tests": [
-            {
-                "description": "match string with nul",
-                "data": "hello\u0000there",
-                "valid": true
-            },
-            {
-                "description": "do not match string lacking nul",
-                "data": "hellothere",
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft2020-12/exclusiveMaximum.json b/json/tests/draft2020-12/exclusiveMaximum.json
deleted file mode 100644
index 05db233..0000000
--- a/json/tests/draft2020-12/exclusiveMaximum.json
+++ /dev/null
@@ -1,31 +0,0 @@
-[
-    {
-        "description": "exclusiveMaximum validation",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "exclusiveMaximum": 3.0
-        },
-        "tests": [
-            {
-                "description": "below the exclusiveMaximum is valid",
-                "data": 2.2,
-                "valid": true
-            },
-            {
-                "description": "boundary point is invalid",
-                "data": 3.0,
-                "valid": false
-            },
-            {
-                "description": "above the exclusiveMaximum is invalid",
-                "data": 3.5,
-                "valid": false
-            },
-            {
-                "description": "ignores non-numbers",
-                "data": "x",
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft2020-12/exclusiveMinimum.json b/json/tests/draft2020-12/exclusiveMinimum.json
deleted file mode 100644
index 00af9d7..0000000
--- a/json/tests/draft2020-12/exclusiveMinimum.json
+++ /dev/null
@@ -1,31 +0,0 @@
-[
-    {
-        "description": "exclusiveMinimum validation",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "exclusiveMinimum": 1.1
-        },
-        "tests": [
-            {
-                "description": "above the exclusiveMinimum is valid",
-                "data": 1.2,
-                "valid": true
-            },
-            {
-                "description": "boundary point is invalid",
-                "data": 1.1,
-                "valid": false
-            },
-            {
-                "description": "below the exclusiveMinimum is invalid",
-                "data": 0.6,
-                "valid": false
-            },
-            {
-                "description": "ignores non-numbers",
-                "data": "x",
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft2020-12/format.json b/json/tests/draft2020-12/format.json
deleted file mode 100644
index 6b7904e..0000000
--- a/json/tests/draft2020-12/format.json
+++ /dev/null
@@ -1,743 +0,0 @@
-[
-    {
-        "description": "email format",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "format": "email"
-        },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "idn-email format",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "format": "idn-email"
-        },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "regex format",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "format": "regex"
-        },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "ipv4 format",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "format": "ipv4"
-        },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "ipv6 format",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "format": "ipv6"
-        },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "idn-hostname format",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "format": "idn-hostname"
-        },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "hostname format",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "format": "hostname"
-        },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "date format",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "format": "date"
-        },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "date-time format",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "format": "date-time"
-        },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "time format",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "format": "time"
-        },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "json-pointer format",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "format": "json-pointer"
-        },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "relative-json-pointer format",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "format": "relative-json-pointer"
-        },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "iri format",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "format": "iri"
-        },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "iri-reference format",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "format": "iri-reference"
-        },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "uri format",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "format": "uri"
-        },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "uri-reference format",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "format": "uri-reference"
-        },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "uri-template format",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "format": "uri-template"
-        },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "uuid format",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "format": "uuid"
-        },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "duration format",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "format": "duration"
-        },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft2020-12/id.json b/json/tests/draft2020-12/id.json
deleted file mode 100644
index 0ae5fe6..0000000
--- a/json/tests/draft2020-12/id.json
+++ /dev/null
@@ -1,294 +0,0 @@
-[
-    {
-        "description": "Invalid use of fragments in location-independent $id",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "$ref": "https://json-schema.org/draft/2020-12/schema"
-        },
-        "tests": [
-            {
-                "description": "Identifier name",
-                "data": {
-                    "$ref": "#foo",
-                    "$defs": {
-                        "A": {
-                            "$id": "#foo",
-                            "type": "integer"
-                        }
-                    }
-                },
-                "valid": false
-            },
-            {
-                "description": "Identifier name and no ref",
-                "data": {
-                    "$defs": {
-                        "A": { "$id": "#foo" }
-                    }
-                },
-                "valid": false
-            },
-            {
-                "description": "Identifier path",
-                "data": {
-                    "$ref": "#/a/b",
-                    "$defs": {
-                        "A": {
-                            "$id": "#/a/b",
-                            "type": "integer"
-                        }
-                    }
-                },
-                "valid": false
-            },
-            {
-                "description": "Identifier name with absolute URI",
-                "data": {
-                    "$ref": "http://localhost:1234/draft2020-12/bar#foo",
-                    "$defs": {
-                        "A": {
-                            "$id": "http://localhost:1234/draft2020-12/bar#foo",
-                            "type": "integer"
-                        }
-                    }
-                },
-                "valid": false
-            },
-            {
-                "description": "Identifier path with absolute URI",
-                "data": {
-                    "$ref": "http://localhost:1234/draft2020-12/bar#/a/b",
-                    "$defs": {
-                        "A": {
-                            "$id": "http://localhost:1234/draft2020-12/bar#/a/b",
-                            "type": "integer"
-                        }
-                    }
-                },
-                "valid": false
-            },
-            {
-                "description": "Identifier name with base URI change in subschema",
-                "data": {
-                    "$id": "http://localhost:1234/draft2020-12/root",
-                    "$ref": "http://localhost:1234/draft2020-12/nested.json#foo",
-                    "$defs": {
-                        "A": {
-                            "$id": "nested.json",
-                            "$defs": {
-                                "B": {
-                                    "$id": "#foo",
-                                    "type": "integer"
-                                }
-                            }
-                        }
-                    }
-                },
-                "valid": false
-            },
-            {
-                "description": "Identifier path with base URI change in subschema",
-                "data": {
-                    "$id": "http://localhost:1234/draft2020-12/root",
-                    "$ref": "http://localhost:1234/draft2020-12/nested.json#/a/b",
-                    "$defs": {
-                        "A": {
-                            "$id": "nested.json",
-                            "$defs": {
-                                "B": {
-                                    "$id": "#/a/b",
-                                    "type": "integer"
-                                }
-                            }
-                        }
-                    }
-                },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "Valid use of empty fragments in location-independent $id",
-        "comment": "These are allowed but discouraged",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "$ref": "https://json-schema.org/draft/2020-12/schema"
-        },
-        "tests": [
-            {
-                "description": "Identifier name with absolute URI",
-                "data": {
-                    "$ref": "http://localhost:1234/draft2020-12/bar",
-                    "$defs": {
-                        "A": {
-                            "$id": "http://localhost:1234/draft2020-12/bar#",
-                            "type": "integer"
-                        }
-                    }
-                },
-                "valid": true
-            },
-            {
-                "description": "Identifier name with base URI change in subschema",
-                "data": {
-                    "$id": "http://localhost:1234/draft2020-12/root",
-                    "$ref": "http://localhost:1234/draft2020-12/nested.json#/$defs/B",
-                    "$defs": {
-                        "A": {
-                            "$id": "nested.json",
-                            "$defs": {
-                                "B": {
-                                    "$id": "#",
-                                    "type": "integer"
-                                }
-                            }
-                        }
-                    }
-                },
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "Unnormalized $ids are allowed but discouraged",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "$ref": "https://json-schema.org/draft/2020-12/schema"
-        },
-        "tests": [
-            {
-                "description": "Unnormalized identifier",
-                "data": {
-                    "$ref": "http://localhost:1234/draft2020-12/foo/baz",
-                    "$defs": {
-                        "A": {
-                            "$id": "http://localhost:1234/draft2020-12/foo/bar/../baz",
-                            "type": "integer"
-                        }
-                    }
-                },
-                "valid": true
-            },
-            {
-                "description": "Unnormalized identifier and no ref",
-                "data": {
-                    "$defs": {
-                        "A": {
-                            "$id": "http://localhost:1234/draft2020-12/foo/bar/../baz",
-                            "type": "integer"
-                        }
-                    }
-                },
-                "valid": true
-            },
-            {
-                "description": "Unnormalized identifier with empty fragment",
-                "data": {
-                    "$ref": "http://localhost:1234/draft2020-12/foo/baz",
-                    "$defs": {
-                        "A": {
-                            "$id": "http://localhost:1234/draft2020-12/foo/bar/../baz#",
-                            "type": "integer"
-                        }
-                    }
-                },
-                "valid": true
-            },
-            {
-                "description": "Unnormalized identifier with empty fragment and no ref",
-                "data": {
-                    "$defs": {
-                        "A": {
-                            "$id": "http://localhost:1234/draft2020-12/foo/bar/../baz#",
-                            "type": "integer"
-                        }
-                    }
-                },
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "$id inside an enum is not a real identifier",
-        "comment": "the implementation must not be confused by an $id buried in the enum",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "$defs": {
-                "id_in_enum": {
-                    "enum": [
-                        {
-                          "$id": "https://localhost:1234/draft2020-12/id/my_identifier.json",
-                          "type": "null"
-                        }
-                    ]
-                },
-                "real_id_in_schema": {
-                    "$id": "https://localhost:1234/draft2020-12/id/my_identifier.json",
-                    "type": "string"
-                },
-                "zzz_id_in_const": {
-                    "const": {
-                        "$id": "https://localhost:1234/draft2020-12/id/my_identifier.json",
-                        "type": "null"
-                    }
-                }
-            },
-            "anyOf": [
-                { "$ref": "#/$defs/id_in_enum" },
-                { "$ref": "https://localhost:1234/draft2020-12/id/my_identifier.json" }
-            ]
-        },
-        "tests": [
-            {
-                "description": "exact match to enum, and type matches",
-                "data": {
-                    "$id": "https://localhost:1234/draft2020-12/id/my_identifier.json",
-                    "type": "null"
-                },
-                "valid": true
-            },
-            {
-                "description": "match $ref to $id",
-                "data": "a string to match #/$defs/id_in_enum",
-                "valid": true
-            },
-            {
-                "description": "no match on enum or $ref to $id",
-                "data": 1,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "non-schema object containing an $id property",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "$defs": {
-                "const_not_id": {
-                    "const": {
-                        "$id": "not_a_real_id"
-                    }
-                }
-            },
-            "if": {
-                "const": "skip not_a_real_id"
-            },
-            "then": true,
-            "else" : {
-                "$ref": "#/$defs/const_not_id"
-            }
-        },
-        "tests": [
-            {
-                "description": "skip traversing definition for a valid result",
-                "data": "skip not_a_real_id",
-                "valid": true
-            },
-            {
-                "description": "const at const_not_id does not match",
-                "data": 1,
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft2020-12/if-then-else.json b/json/tests/draft2020-12/if-then-else.json
deleted file mode 100644
index 1c35d7e..0000000
--- a/json/tests/draft2020-12/if-then-else.json
+++ /dev/null
@@ -1,268 +0,0 @@
-[
-    {
-        "description": "ignore if without then or else",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "if": {
-                "const": 0
-            }
-        },
-        "tests": [
-            {
-                "description": "valid when valid against lone if",
-                "data": 0,
-                "valid": true
-            },
-            {
-                "description": "valid when invalid against lone if",
-                "data": "hello",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "ignore then without if",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "then": {
-                "const": 0
-            }
-        },
-        "tests": [
-            {
-                "description": "valid when valid against lone then",
-                "data": 0,
-                "valid": true
-            },
-            {
-                "description": "valid when invalid against lone then",
-                "data": "hello",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "ignore else without if",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "else": {
-                "const": 0
-            }
-        },
-        "tests": [
-            {
-                "description": "valid when valid against lone else",
-                "data": 0,
-                "valid": true
-            },
-            {
-                "description": "valid when invalid against lone else",
-                "data": "hello",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "if and then without else",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "if": {
-                "exclusiveMaximum": 0
-            },
-            "then": {
-                "minimum": -10
-            }
-        },
-        "tests": [
-            {
-                "description": "valid through then",
-                "data": -1,
-                "valid": true
-            },
-            {
-                "description": "invalid through then",
-                "data": -100,
-                "valid": false
-            },
-            {
-                "description": "valid when if test fails",
-                "data": 3,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "if and else without then",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "if": {
-                "exclusiveMaximum": 0
-            },
-            "else": {
-                "multipleOf": 2
-            }
-        },
-        "tests": [
-            {
-                "description": "valid when if test passes",
-                "data": -1,
-                "valid": true
-            },
-            {
-                "description": "valid through else",
-                "data": 4,
-                "valid": true
-            },
-            {
-                "description": "invalid through else",
-                "data": 3,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "validate against correct branch, then vs else",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "if": {
-                "exclusiveMaximum": 0
-            },
-            "then": {
-                "minimum": -10
-            },
-            "else": {
-                "multipleOf": 2
-            }
-        },
-        "tests": [
-            {
-                "description": "valid through then",
-                "data": -1,
-                "valid": true
-            },
-            {
-                "description": "invalid through then",
-                "data": -100,
-                "valid": false
-            },
-            {
-                "description": "valid through else",
-                "data": 4,
-                "valid": true
-            },
-            {
-                "description": "invalid through else",
-                "data": 3,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "non-interference across combined schemas",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "allOf": [
-                {
-                    "if": {
-                        "exclusiveMaximum": 0
-                    }
-                },
-                {
-                    "then": {
-                        "minimum": -10
-                    }
-                },
-                {
-                    "else": {
-                        "multipleOf": 2
-                    }
-                }
-            ]
-        },
-        "tests": [
-            {
-                "description": "valid, but would have been invalid through then",
-                "data": -100,
-                "valid": true
-            },
-            {
-                "description": "valid, but would have been invalid through else",
-                "data": 3,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "if with boolean schema true",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "if": true,
-            "then": { "const": "then" },
-            "else": { "const": "else" }
-        },
-        "tests": [
-            {
-                "description": "boolean schema true in if always chooses the then path (valid)",
-                "data": "then",
-                "valid": true
-            },
-            {
-                "description": "boolean schema true in if always chooses the then path (invalid)",
-                "data": "else",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "if with boolean schema false",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "if": false,
-            "then": { "const": "then" },
-            "else": { "const": "else" }
-        },
-        "tests": [
-            {
-                "description": "boolean schema false in if always chooses the else path (invalid)",
-                "data": "then",
-                "valid": false
-            },
-            {
-                "description": "boolean schema false in if always chooses the else path (valid)",
-                "data": "else",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "if appears at the end when serialized (keyword processing sequence)",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "then": { "const": "yes" },
-            "else": { "const": "other" },
-            "if": { "maxLength": 4 }
-        },
-        "tests": [
-            {
-                "description": "yes redirects to then and passes",
-                "data": "yes",
-                "valid": true
-            },
-            {
-                "description": "other redirects to else and passes",
-                "data": "other",
-                "valid": true
-            },
-            {
-                "description": "no redirects to then and fails",
-                "data": "no",
-                "valid": false
-            },
-            {
-                "description": "invalid redirects to else and fails",
-                "data": "invalid",
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft2020-12/infinite-loop-detection.json b/json/tests/draft2020-12/infinite-loop-detection.json
deleted file mode 100644
index 46f157a..0000000
--- a/json/tests/draft2020-12/infinite-loop-detection.json
+++ /dev/null
@@ -1,37 +0,0 @@
-[
-    {
-        "description": "evaluating the same schema location against the same data location twice is not a sign of an infinite loop",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "$defs": {
-                "int": { "type": "integer" }
-            },
-            "allOf": [
-                {
-                    "properties": {
-                        "foo": {
-                            "$ref": "#/$defs/int"
-                        }
-                    }
-                },
-                {
-                    "additionalProperties": {
-                        "$ref": "#/$defs/int"
-                    }
-                }
-            ]
-        },
-        "tests": [
-            {
-                "description": "passing case",
-                "data": { "foo": 1 },
-                "valid": true
-            },
-            {
-                "description": "failing case",
-                "data": { "foo": "a string" },
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft2020-12/items.json b/json/tests/draft2020-12/items.json
deleted file mode 100644
index 1ef18bd..0000000
--- a/json/tests/draft2020-12/items.json
+++ /dev/null
@@ -1,284 +0,0 @@
-[
-    {
-        "description": "a schema given for items",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "items": {"type": "integer"}
-        },
-        "tests": [
-            {
-                "description": "valid items",
-                "data": [ 1, 2, 3 ],
-                "valid": true
-            },
-            {
-                "description": "wrong type of items",
-                "data": [1, "x"],
-                "valid": false
-            },
-            {
-                "description": "ignores non-arrays",
-                "data": {"foo" : "bar"},
-                "valid": true
-            },
-            {
-                "description": "JavaScript pseudo-array is valid",
-                "data": {
-                    "0": "invalid",
-                    "length": 1
-                },
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "items with boolean schema (true)",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "items": true
-        },
-        "tests": [
-            {
-                "description": "any array is valid",
-                "data": [ 1, "foo", true ],
-                "valid": true
-            },
-            {
-                "description": "empty array is valid",
-                "data": [],
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "items with boolean schema (false)",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "items": false
-        },
-        "tests": [
-            {
-                "description": "any non-empty array is invalid",
-                "data": [ 1, "foo", true ],
-                "valid": false
-            },
-            {
-                "description": "empty array is valid",
-                "data": [],
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "items and subitems",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "$defs": {
-                "item": {
-                    "type": "array",
-                    "items": false,
-                    "prefixItems": [
-                        { "$ref": "#/$defs/sub-item" },
-                        { "$ref": "#/$defs/sub-item" }
-                    ]
-                },
-                "sub-item": {
-                    "type": "object",
-                    "required": ["foo"]
-                }
-            },
-            "type": "array",
-            "items": false,
-            "prefixItems": [
-                { "$ref": "#/$defs/item" },
-                { "$ref": "#/$defs/item" },
-                { "$ref": "#/$defs/item" }
-            ]
-        },
-        "tests": [
-            {
-                "description": "valid items",
-                "data": [
-                    [ {"foo": null}, {"foo": null} ],
-                    [ {"foo": null}, {"foo": null} ],
-                    [ {"foo": null}, {"foo": null} ]
-                ],
-                "valid": true
-            },
-            {
-                "description": "too many items",
-                "data": [
-                    [ {"foo": null}, {"foo": null} ],
-                    [ {"foo": null}, {"foo": null} ],
-                    [ {"foo": null}, {"foo": null} ],
-                    [ {"foo": null}, {"foo": null} ]
-                ],
-                "valid": false
-            },
-            {
-                "description": "too many sub-items",
-                "data": [
-                    [ {"foo": null}, {"foo": null}, {"foo": null} ],
-                    [ {"foo": null}, {"foo": null} ],
-                    [ {"foo": null}, {"foo": null} ]
-                ],
-                "valid": false
-            },
-            {
-                "description": "wrong item",
-                "data": [
-                    {"foo": null},
-                    [ {"foo": null}, {"foo": null} ],
-                    [ {"foo": null}, {"foo": null} ]
-                ],
-                "valid": false
-            },
-            {
-                "description": "wrong sub-item",
-                "data": [
-                    [ {}, {"foo": null} ],
-                    [ {"foo": null}, {"foo": null} ],
-                    [ {"foo": null}, {"foo": null} ]
-                ],
-                "valid": false
-            },
-            {
-                "description": "fewer items is valid",
-                "data": [
-                    [ {"foo": null} ],
-                    [ {"foo": null} ]
-                ],
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "nested items",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "type": "array",
-            "items": {
-                "type": "array",
-                "items": {
-                    "type": "array",
-                    "items": {
-                        "type": "array",
-                        "items": {
-                            "type": "number"
-                        }
-                    }
-                }
-            }
-        },
-        "tests": [
-            {
-                "description": "valid nested array",
-                "data": [[[[1]], [[2],[3]]], [[[4], [5], [6]]]],
-                "valid": true
-            },
-            {
-                "description": "nested array with invalid type",
-                "data": [[[["1"]], [[2],[3]]], [[[4], [5], [6]]]],
-                "valid": false
-            },
-            {
-                "description": "not deep enough",
-                "data": [[[1], [2],[3]], [[4], [5], [6]]],
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "prefixItems with no additional items allowed",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "prefixItems": [{}, {}, {}],
-            "items": false
-        },
-        "tests": [
-            {
-                "description": "empty array",
-                "data": [ ],
-                "valid": true
-            },
-            {
-                "description": "fewer number of items present (1)",
-                "data": [ 1 ],
-                "valid": true
-            },
-            {
-                "description": "fewer number of items present (2)",
-                "data": [ 1, 2 ],
-                "valid": true
-            },
-            {
-                "description": "equal number of items present",
-                "data": [ 1, 2, 3 ],
-                "valid": true
-            },
-            {
-                "description": "additional items are not permitted",
-                "data": [ 1, 2, 3, 4 ],
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "items does not look in applicators, valid case",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "allOf": [
-                { "prefixItems": [ { "minimum": 3 } ] }
-            ],
-            "items": { "minimum": 5 }
-        },
-        "tests": [
-            {
-                "description": "prefixItems in allOf does not constrain items, invalid case",
-                "data": [ 3, 5 ],
-                "valid": false
-            },
-            {
-                "description": "prefixItems in allOf does not constrain items, valid case",
-                "data": [ 5, 5 ],
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "prefixItems validation adjusts the starting index for items",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "prefixItems": [ { "type": "string" } ],
-            "items": { "type": "integer" }
-        },
-        "tests": [
-            {
-                "description": "valid items",
-                "data": [ "x", 2, 3 ],
-                "valid": true
-            },
-            {
-                "description": "wrong type of second item",
-                "data": [ "x", "y" ],
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "items with null instance elements",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "items": {
-                "type": "null"
-            }
-        },
-        "tests": [
-            {
-                "description": "allows null elements",
-                "data": [ null ],
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft2020-12/maxContains.json b/json/tests/draft2020-12/maxContains.json
deleted file mode 100644
index 8cd3ca7..0000000
--- a/json/tests/draft2020-12/maxContains.json
+++ /dev/null
@@ -1,102 +0,0 @@
-[
-    {
-        "description": "maxContains without contains is ignored",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "maxContains": 1
-        },
-        "tests": [
-            {
-                "description": "one item valid against lone maxContains",
-                "data": [ 1 ],
-                "valid": true
-            },
-            {
-                "description": "two items still valid against lone maxContains",
-                "data": [ 1, 2 ],
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "maxContains with contains",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "contains": {"const": 1},
-            "maxContains": 1
-        },
-        "tests": [
-            {
-                "description": "empty data",
-                "data": [ ],
-                "valid": false
-            },
-            {
-                "description": "all elements match, valid maxContains",
-                "data": [ 1 ],
-                "valid": true
-            },
-            {
-                "description": "all elements match, invalid maxContains",
-                "data": [ 1, 1 ],
-                "valid": false
-            },
-            {
-                "description": "some elements match, valid maxContains",
-                "data": [ 1, 2 ],
-                "valid": true
-            },
-            {
-                "description": "some elements match, invalid maxContains",
-                "data": [ 1, 2, 1 ],
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "maxContains with contains, value with a decimal",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "contains": {"const": 1},
-            "maxContains": 1.0
-        },
-        "tests": [
-            {
-                "description": "one element matches, valid maxContains",
-                "data": [ 1 ],
-                "valid": true
-            },
-            {
-                "description": "too many elements match, invalid maxContains",
-                "data": [ 1, 1 ],
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "minContains < maxContains",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "contains": {"const": 1},
-            "minContains": 1,
-            "maxContains": 3
-        },
-        "tests": [
-            {
-                "description": "actual < minContains < maxContains",
-                "data": [ ],
-                "valid": false
-            },
-            {
-                "description": "minContains < actual < maxContains",
-                "data": [ 1, 1 ],
-                "valid": true
-            },
-            {
-                "description": "minContains < maxContains < actual",
-                "data": [ 1, 1, 1, 1 ],
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft2020-12/maxItems.json b/json/tests/draft2020-12/maxItems.json
deleted file mode 100644
index f6a6b7c..0000000
--- a/json/tests/draft2020-12/maxItems.json
+++ /dev/null
@@ -1,50 +0,0 @@
-[
-    {
-        "description": "maxItems validation",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "maxItems": 2
-        },
-        "tests": [
-            {
-                "description": "shorter is valid",
-                "data": [1],
-                "valid": true
-            },
-            {
-                "description": "exact length is valid",
-                "data": [1, 2],
-                "valid": true
-            },
-            {
-                "description": "too long is invalid",
-                "data": [1, 2, 3],
-                "valid": false
-            },
-            {
-                "description": "ignores non-arrays",
-                "data": "foobar",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "maxItems validation with a decimal",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "maxItems": 2.0
-        },
-        "tests": [
-            {
-                "description": "shorter is valid",
-                "data": [1],
-                "valid": true
-            },
-            {
-                "description": "too long is invalid",
-                "data": [1, 2, 3],
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft2020-12/maxLength.json b/json/tests/draft2020-12/maxLength.json
deleted file mode 100644
index b6eb034..0000000
--- a/json/tests/draft2020-12/maxLength.json
+++ /dev/null
@@ -1,55 +0,0 @@
-[
-    {
-        "description": "maxLength validation",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "maxLength": 2
-        },
-        "tests": [
-            {
-                "description": "shorter is valid",
-                "data": "f",
-                "valid": true
-            },
-            {
-                "description": "exact length is valid",
-                "data": "fo",
-                "valid": true
-            },
-            {
-                "description": "too long is invalid",
-                "data": "foo",
-                "valid": false
-            },
-            {
-                "description": "ignores non-strings",
-                "data": 100,
-                "valid": true
-            },
-            {
-                "description": "two supplementary Unicode code points is long enough",
-                "data": "\uD83D\uDCA9\uD83D\uDCA9",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "maxLength validation with a decimal",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "maxLength": 2.0
-        },
-        "tests": [
-            {
-                "description": "shorter is valid",
-                "data": "f",
-                "valid": true
-            },
-            {
-                "description": "too long is invalid",
-                "data": "foo",
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft2020-12/maxProperties.json b/json/tests/draft2020-12/maxProperties.json
deleted file mode 100644
index 73ae731..0000000
--- a/json/tests/draft2020-12/maxProperties.json
+++ /dev/null
@@ -1,79 +0,0 @@
-[
-    {
-        "description": "maxProperties validation",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "maxProperties": 2
-        },
-        "tests": [
-            {
-                "description": "shorter is valid",
-                "data": {"foo": 1},
-                "valid": true
-            },
-            {
-                "description": "exact length is valid",
-                "data": {"foo": 1, "bar": 2},
-                "valid": true
-            },
-            {
-                "description": "too long is invalid",
-                "data": {"foo": 1, "bar": 2, "baz": 3},
-                "valid": false
-            },
-            {
-                "description": "ignores arrays",
-                "data": [1, 2, 3],
-                "valid": true
-            },
-            {
-                "description": "ignores strings",
-                "data": "foobar",
-                "valid": true
-            },
-            {
-                "description": "ignores other non-objects",
-                "data": 12,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "maxProperties validation with a decimal",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "maxProperties": 2.0
-        },
-        "tests": [
-            {
-                "description": "shorter is valid",
-                "data": {"foo": 1},
-                "valid": true
-            },
-            {
-                "description": "too long is invalid",
-                "data": {"foo": 1, "bar": 2, "baz": 3},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "maxProperties = 0 means the object is empty",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "maxProperties": 0
-        },
-        "tests": [
-            {
-                "description": "no properties is valid",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "one property is invalid",
-                "data": { "foo": 1 },
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft2020-12/maximum.json b/json/tests/draft2020-12/maximum.json
deleted file mode 100644
index b99a541..0000000
--- a/json/tests/draft2020-12/maximum.json
+++ /dev/null
@@ -1,60 +0,0 @@
-[
-    {
-        "description": "maximum validation",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "maximum": 3.0
-        },
-        "tests": [
-            {
-                "description": "below the maximum is valid",
-                "data": 2.6,
-                "valid": true
-            },
-            {
-                "description": "boundary point is valid",
-                "data": 3.0,
-                "valid": true
-            },
-            {
-                "description": "above the maximum is invalid",
-                "data": 3.5,
-                "valid": false
-            },
-            {
-                "description": "ignores non-numbers",
-                "data": "x",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "maximum validation with unsigned integer",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "maximum": 300
-        },
-        "tests":  [
-            {
-                "description": "below the maximum is invalid",
-                "data": 299.97,
-                "valid": true
-            },
-            {
-                "description": "boundary point integer is valid",
-                "data": 300,
-                "valid": true
-            },
-            {
-                "description": "boundary point float is valid",
-                "data": 300.00,
-                "valid": true
-            },
-            {
-                "description": "above the maximum is invalid",
-                "data": 300.5,
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft2020-12/minContains.json b/json/tests/draft2020-12/minContains.json
deleted file mode 100644
index ee72d7d..0000000
--- a/json/tests/draft2020-12/minContains.json
+++ /dev/null
@@ -1,224 +0,0 @@
-[
-    {
-        "description": "minContains without contains is ignored",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "minContains": 1
-        },
-        "tests": [
-            {
-                "description": "one item valid against lone minContains",
-                "data": [ 1 ],
-                "valid": true
-            },
-            {
-                "description": "zero items still valid against lone minContains",
-                "data": [],
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "minContains=1 with contains",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "contains": {"const": 1},
-            "minContains": 1
-        },
-        "tests": [
-            {
-                "description": "empty data",
-                "data": [ ],
-                "valid": false
-            },
-            {
-                "description": "no elements match",
-                "data": [ 2 ],
-                "valid": false
-            },
-            {
-                "description": "single element matches, valid minContains",
-                "data": [ 1 ],
-                "valid": true
-            },
-            {
-                "description": "some elements match, valid minContains",
-                "data": [ 1, 2 ],
-                "valid": true
-            },
-            {
-                "description": "all elements match, valid minContains",
-                "data": [ 1, 1 ],
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "minContains=2 with contains",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "contains": {"const": 1},
-            "minContains": 2
-        },
-        "tests": [
-            {
-                "description": "empty data",
-                "data": [ ],
-                "valid": false
-            },
-            {
-                "description": "all elements match, invalid minContains",
-                "data": [ 1 ],
-                "valid": false
-            },
-            {
-                "description": "some elements match, invalid minContains",
-                "data": [ 1, 2 ],
-                "valid": false
-            },
-            {
-                "description": "all elements match, valid minContains (exactly as needed)",
-                "data": [ 1, 1 ],
-                "valid": true
-            },
-            {
-                "description": "all elements match, valid minContains (more than needed)",
-                "data": [ 1, 1, 1 ],
-                "valid": true
-            },
-            {
-                "description": "some elements match, valid minContains",
-                "data": [ 1, 2, 1 ],
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "minContains=2 with contains with a decimal value",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "contains": {"const": 1},
-            "minContains": 2.0
-        },
-        "tests": [
-            {
-                "description": "one element matches, invalid minContains",
-                "data": [ 1 ],
-                "valid": false
-            },
-            {
-                "description": "both elements match, valid minContains",
-                "data": [ 1, 1 ],
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "maxContains = minContains",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "contains": {"const": 1},
-            "maxContains": 2,
-            "minContains": 2
-        },
-        "tests": [
-            {
-                "description": "empty data",
-                "data": [ ],
-                "valid": false
-            },
-            {
-                "description": "all elements match, invalid minContains",
-                "data": [ 1 ],
-                "valid": false
-            },
-            {
-                "description": "all elements match, invalid maxContains",
-                "data": [ 1, 1, 1 ],
-                "valid": false
-            },
-            {
-                "description": "all elements match, valid maxContains and minContains",
-                "data": [ 1, 1 ],
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "maxContains < minContains",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "contains": {"const": 1},
-            "maxContains": 1,
-            "minContains": 3
-        },
-        "tests": [
-            {
-                "description": "empty data",
-                "data": [ ],
-                "valid": false
-            },
-            {
-                "description": "invalid minContains",
-                "data": [ 1 ],
-                "valid": false
-            },
-            {
-                "description": "invalid maxContains",
-                "data": [ 1, 1, 1 ],
-                "valid": false
-            },
-            {
-                "description": "invalid maxContains and minContains",
-                "data": [ 1, 1 ],
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "minContains = 0",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "contains": {"const": 1},
-            "minContains": 0
-        },
-        "tests": [
-            {
-                "description": "empty data",
-                "data": [ ],
-                "valid": true
-            },
-            {
-                "description": "minContains = 0 makes contains always pass",
-                "data": [ 2 ],
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "minContains = 0 with maxContains",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "contains": {"const": 1},
-            "minContains": 0,
-            "maxContains": 1
-        },
-        "tests": [
-            {
-                "description": "empty data",
-                "data": [ ],
-                "valid": true
-            },
-            {
-                "description": "not more than maxContains",
-                "data": [ 1 ],
-                "valid": true
-            },
-            {
-                "description": "too many",
-                "data": [ 1, 1 ],
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft2020-12/minItems.json b/json/tests/draft2020-12/minItems.json
deleted file mode 100644
index 9d6a8b6..0000000
--- a/json/tests/draft2020-12/minItems.json
+++ /dev/null
@@ -1,50 +0,0 @@
-[
-    {
-        "description": "minItems validation",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "minItems": 1
-        },
-        "tests": [
-            {
-                "description": "longer is valid",
-                "data": [1, 2],
-                "valid": true
-            },
-            {
-                "description": "exact length is valid",
-                "data": [1],
-                "valid": true
-            },
-            {
-                "description": "too short is invalid",
-                "data": [],
-                "valid": false
-            },
-            {
-                "description": "ignores non-arrays",
-                "data": "",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "minItems validation with a decimal",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "minItems": 1.0
-        },
-        "tests": [
-            {
-                "description": "longer is valid",
-                "data": [1, 2],
-                "valid": true
-            },
-            {
-                "description": "too short is invalid",
-                "data": [],
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft2020-12/minLength.json b/json/tests/draft2020-12/minLength.json
deleted file mode 100644
index e0930b6..0000000
--- a/json/tests/draft2020-12/minLength.json
+++ /dev/null
@@ -1,55 +0,0 @@
-[
-    {
-        "description": "minLength validation",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "minLength": 2
-        },
-        "tests": [
-            {
-                "description": "longer is valid",
-                "data": "foo",
-                "valid": true
-            },
-            {
-                "description": "exact length is valid",
-                "data": "fo",
-                "valid": true
-            },
-            {
-                "description": "too short is invalid",
-                "data": "f",
-                "valid": false
-            },
-            {
-                "description": "ignores non-strings",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "one supplementary Unicode code point is not long enough",
-                "data": "\uD83D\uDCA9",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "minLength validation with a decimal",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "minLength": 2.0
-        },
-        "tests": [
-            {
-                "description": "longer is valid",
-                "data": "foo",
-                "valid": true
-            },
-            {
-                "description": "too short is invalid",
-                "data": "f",
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft2020-12/minProperties.json b/json/tests/draft2020-12/minProperties.json
deleted file mode 100644
index a753ad3..0000000
--- a/json/tests/draft2020-12/minProperties.json
+++ /dev/null
@@ -1,60 +0,0 @@
-[
-    {
-        "description": "minProperties validation",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "minProperties": 1
-        },
-        "tests": [
-            {
-                "description": "longer is valid",
-                "data": {"foo": 1, "bar": 2},
-                "valid": true
-            },
-            {
-                "description": "exact length is valid",
-                "data": {"foo": 1},
-                "valid": true
-            },
-            {
-                "description": "too short is invalid",
-                "data": {},
-                "valid": false
-            },
-            {
-                "description": "ignores arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "ignores strings",
-                "data": "",
-                "valid": true
-            },
-            {
-                "description": "ignores other non-objects",
-                "data": 12,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "minProperties validation with a decimal",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "minProperties": 1.0
-        },
-        "tests": [
-            {
-                "description": "longer is valid",
-                "data": {"foo": 1, "bar": 2},
-                "valid": true
-            },
-            {
-                "description": "too short is invalid",
-                "data": {},
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft2020-12/minimum.json b/json/tests/draft2020-12/minimum.json
deleted file mode 100644
index dc44052..0000000
--- a/json/tests/draft2020-12/minimum.json
+++ /dev/null
@@ -1,75 +0,0 @@
-[
-    {
-        "description": "minimum validation",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "minimum": 1.1
-        },
-        "tests": [
-            {
-                "description": "above the minimum is valid",
-                "data": 2.6,
-                "valid": true
-            },
-            {
-                "description": "boundary point is valid",
-                "data": 1.1,
-                "valid": true
-            },
-            {
-                "description": "below the minimum is invalid",
-                "data": 0.6,
-                "valid": false
-            },
-            {
-                "description": "ignores non-numbers",
-                "data": "x",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "minimum validation with signed integer",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "minimum": -2
-        },
-        "tests": [
-            {
-                "description": "negative above the minimum is valid",
-                "data": -1,
-                "valid": true
-            },
-            {
-                "description": "positive above the minimum is valid",
-                "data": 0,
-                "valid": true
-            },
-            {
-                "description": "boundary point is valid",
-                "data": -2,
-                "valid": true
-            },
-            {
-                "description": "boundary point with float is valid",
-                "data": -2.0,
-                "valid": true
-            },
-            {
-                "description": "float below the minimum is invalid",
-                "data": -2.0001,
-                "valid": false
-            },
-            {
-                "description": "int below the minimum is invalid",
-                "data": -3,
-                "valid": false
-            },
-            {
-                "description": "ignores non-numbers",
-                "data": "x",
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft2020-12/multipleOf.json b/json/tests/draft2020-12/multipleOf.json
deleted file mode 100644
index e075558..0000000
--- a/json/tests/draft2020-12/multipleOf.json
+++ /dev/null
@@ -1,83 +0,0 @@
-[
-    {
-        "description": "by int",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "multipleOf": 2
-        },
-        "tests": [
-            {
-                "description": "int by int",
-                "data": 10,
-                "valid": true
-            },
-            {
-                "description": "int by int fail",
-                "data": 7,
-                "valid": false
-            },
-            {
-                "description": "ignores non-numbers",
-                "data": "foo",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "by number",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "multipleOf": 1.5
-        },
-        "tests": [
-            {
-                "description": "zero is multiple of anything",
-                "data": 0,
-                "valid": true
-            },
-            {
-                "description": "4.5 is multiple of 1.5",
-                "data": 4.5,
-                "valid": true
-            },
-            {
-                "description": "35 is not multiple of 1.5",
-                "data": 35,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "by small number",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "multipleOf": 0.0001
-        },
-        "tests": [
-            {
-                "description": "0.0075 is multiple of 0.0001",
-                "data": 0.0075,
-                "valid": true
-            },
-            {
-                "description": "0.00751 is not multiple of 0.0001",
-                "data": 0.00751,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "float division = inf",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "type": "integer", "multipleOf": 0.123456789
-        },
-        "tests": [
-            {
-                "description": "always invalid, but naive implementations may raise an overflow error",
-                "data": 1e308,
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft2020-12/not.json b/json/tests/draft2020-12/not.json
deleted file mode 100644
index 42a8218..0000000
--- a/json/tests/draft2020-12/not.json
+++ /dev/null
@@ -1,127 +0,0 @@
-[
-    {
-        "description": "not",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "not": {"type": "integer"}
-        },
-        "tests": [
-            {
-                "description": "allowed",
-                "data": "foo",
-                "valid": true
-            },
-            {
-                "description": "disallowed",
-                "data": 1,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "not multiple types",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "not": {"type": ["integer", "boolean"]}
-        },
-        "tests": [
-            {
-                "description": "valid",
-                "data": "foo",
-                "valid": true
-            },
-            {
-                "description": "mismatch",
-                "data": 1,
-                "valid": false
-            },
-            {
-                "description": "other mismatch",
-                "data": true,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "not more complex schema",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "not": {
-                "type": "object",
-                "properties": {
-                    "foo": {
-                        "type": "string"
-                    }
-                }
-             }
-        },
-        "tests": [
-            {
-                "description": "match",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "other match",
-                "data": {"foo": 1},
-                "valid": true
-            },
-            {
-                "description": "mismatch",
-                "data": {"foo": "bar"},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "forbidden property",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "properties": {
-                "foo": { 
-                    "not": {}
-                }
-            }
-        },
-        "tests": [
-            {
-                "description": "property present",
-                "data": {"foo": 1, "bar": 2},
-                "valid": false
-            },
-            {
-                "description": "property absent",
-                "data": {"bar": 1, "baz": 2},
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "not with boolean schema true",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "not": true
-        },
-        "tests": [
-            {
-                "description": "any value is invalid",
-                "data": "foo",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "not with boolean schema false",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "not": false
-        },
-        "tests": [
-            {
-                "description": "any value is valid",
-                "data": "foo",
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft2020-12/oneOf.json b/json/tests/draft2020-12/oneOf.json
deleted file mode 100644
index 416c8e5..0000000
--- a/json/tests/draft2020-12/oneOf.json
+++ /dev/null
@@ -1,293 +0,0 @@
-[
-    {
-        "description": "oneOf",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "oneOf": [
-                {
-                    "type": "integer"
-                },
-                {
-                    "minimum": 2
-                }
-            ]
-        },
-        "tests": [
-            {
-                "description": "first oneOf valid",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "second oneOf valid",
-                "data": 2.5,
-                "valid": true
-            },
-            {
-                "description": "both oneOf valid",
-                "data": 3,
-                "valid": false
-            },
-            {
-                "description": "neither oneOf valid",
-                "data": 1.5,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "oneOf with base schema",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "type": "string",
-            "oneOf" : [
-                {
-                    "minLength": 2
-                },
-                {
-                    "maxLength": 4
-                }
-            ]
-        },
-        "tests": [
-            {
-                "description": "mismatch base schema",
-                "data": 3,
-                "valid": false
-            },
-            {
-                "description": "one oneOf valid",
-                "data": "foobar",
-                "valid": true
-            },
-            {
-                "description": "both oneOf valid",
-                "data": "foo",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "oneOf with boolean schemas, all true",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "oneOf": [true, true, true]
-        },
-        "tests": [
-            {
-                "description": "any value is invalid",
-                "data": "foo",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "oneOf with boolean schemas, one true",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "oneOf": [true, false, false]
-        },
-        "tests": [
-            {
-                "description": "any value is valid",
-                "data": "foo",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "oneOf with boolean schemas, more than one true",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "oneOf": [true, true, false]
-        },
-        "tests": [
-            {
-                "description": "any value is invalid",
-                "data": "foo",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "oneOf with boolean schemas, all false",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "oneOf": [false, false, false]
-        },
-        "tests": [
-            {
-                "description": "any value is invalid",
-                "data": "foo",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "oneOf complex types",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "oneOf": [
-                {
-                    "properties": {
-                        "bar": {"type": "integer"}
-                    },
-                    "required": ["bar"]
-                },
-                {
-                    "properties": {
-                        "foo": {"type": "string"}
-                    },
-                    "required": ["foo"]
-                }
-            ]
-        },
-        "tests": [
-            {
-                "description": "first oneOf valid (complex)",
-                "data": {"bar": 2},
-                "valid": true
-            },
-            {
-                "description": "second oneOf valid (complex)",
-                "data": {"foo": "baz"},
-                "valid": true
-            },
-            {
-                "description": "both oneOf valid (complex)",
-                "data": {"foo": "baz", "bar": 2},
-                "valid": false
-            },
-            {
-                "description": "neither oneOf valid (complex)",
-                "data": {"foo": 2, "bar": "quux"},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "oneOf with empty schema",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "oneOf": [
-                { "type": "number" },
-                {}
-            ]
-        },
-        "tests": [
-            {
-                "description": "one valid - valid",
-                "data": "foo",
-                "valid": true
-            },
-            {
-                "description": "both valid - invalid",
-                "data": 123,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "oneOf with required",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "type": "object",
-            "oneOf": [
-                { "required": ["foo", "bar"] },
-                { "required": ["foo", "baz"] }
-            ]
-        },
-        "tests": [
-            {
-                "description": "both invalid - invalid",
-                "data": {"bar": 2},
-                "valid": false
-            },
-            {
-                "description": "first valid - valid",
-                "data": {"foo": 1, "bar": 2},
-                "valid": true
-            },
-            {
-                "description": "second valid - valid",
-                "data": {"foo": 1, "baz": 3},
-                "valid": true
-            },
-            {
-                "description": "both valid - invalid",
-                "data": {"foo": 1, "bar": 2, "baz" : 3},
-                "valid": false
-            }
-        ]
-    },
-	{
-        "description": "oneOf with missing optional property",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "oneOf": [
-                {
-                    "properties": {
-                        "bar": true,
-                        "baz": true
-                    },
-                    "required": ["bar"]
-                },
-                {
-                    "properties": {
-                        "foo": true
-                    },
-                    "required": ["foo"]
-                }
-            ]
-        },
-        "tests": [
-            {
-                "description": "first oneOf valid",
-                "data": {"bar": 8},
-                "valid": true
-            },
-            {
-                "description": "second oneOf valid",
-                "data": {"foo": "foo"},
-                "valid": true
-            },
-            {
-                "description": "both oneOf valid",
-                "data": {"foo": "foo", "bar": 8},
-                "valid": false
-            },
-            {
-                "description": "neither oneOf valid",
-                "data": {"baz": "quux"},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "nested oneOf, to check validation semantics",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "oneOf": [
-                {
-                    "oneOf": [
-                        {
-                            "type": "null"
-                        }
-                    ]
-                }
-            ]
-        },
-        "tests": [
-            {
-                "description": "null is valid",
-                "data": null,
-                "valid": true
-            },
-            {
-                "description": "anything non-null is invalid",
-                "data": 123,
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft2020-12/optional/bignum.json b/json/tests/draft2020-12/optional/bignum.json
deleted file mode 100644
index d69b29e..0000000
--- a/json/tests/draft2020-12/optional/bignum.json
+++ /dev/null
@@ -1,110 +0,0 @@
-[
-    {
-        "description": "integer",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "type": "integer"
-        },
-        "tests": [
-            {
-                "description": "a bignum is an integer",
-                "data": 12345678910111213141516171819202122232425262728293031,
-                "valid": true
-            },
-            {
-                "description": "a negative bignum is an integer",
-                "data": -12345678910111213141516171819202122232425262728293031,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "number",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "type": "number"
-        },
-        "tests": [
-            {
-                "description": "a bignum is a number",
-                "data": 98249283749234923498293171823948729348710298301928331,
-                "valid": true
-            },
-            {
-                "description": "a negative bignum is a number",
-                "data": -98249283749234923498293171823948729348710298301928331,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "string",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "type": "string"
-        },
-        "tests": [
-            {
-                "description": "a bignum is not a string",
-                "data": 98249283749234923498293171823948729348710298301928331,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "maximum integer comparison",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "maximum": 18446744073709551615
-        },
-        "tests": [
-            {
-                "description": "comparison works for high numbers",
-                "data": 18446744073709551600,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "float comparison with high precision",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "exclusiveMaximum": 972783798187987123879878123.18878137
-        },
-        "tests": [
-            {
-                "description": "comparison works for high numbers",
-                "data": 972783798187987123879878123.188781371,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "minimum integer comparison",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "minimum": -18446744073709551615
-        },
-        "tests": [
-            {
-                "description": "comparison works for very negative numbers",
-                "data": -18446744073709551600,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "float comparison with high precision on negative numbers",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "exclusiveMinimum": -972783798187987123879878123.18878137
-        },
-        "tests": [
-            {
-                "description": "comparison works for very negative numbers",
-                "data": -972783798187987123879878123.188781371,
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft2020-12/optional/cross-draft.json b/json/tests/draft2020-12/optional/cross-draft.json
deleted file mode 100644
index 5113bd6..0000000
--- a/json/tests/draft2020-12/optional/cross-draft.json
+++ /dev/null
@@ -1,18 +0,0 @@
-[
-    {
-        "description": "refs to historic drafts are processed as historic drafts",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "type": "array",
-            "$ref": "http://localhost:1234/draft2019-09/ignore-prefixItems.json"
-        },
-        "tests": [
-            {
-                "description": "first item not a string is valid",
-                "comment": "if the implementation is not processing the $ref as a 2019-09 schema, this test will fail",
-                "data": [1, 2, 3],
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft2020-12/optional/dependencies-compatibility.json b/json/tests/draft2020-12/optional/dependencies-compatibility.json
deleted file mode 100644
index 47d5bd7..0000000
--- a/json/tests/draft2020-12/optional/dependencies-compatibility.json
+++ /dev/null
@@ -1,282 +0,0 @@
-[
-    {
-        "description": "single dependency",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "dependencies": {"bar": ["foo"]}
-        },
-        "tests": [
-            {
-                "description": "neither",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "nondependant",
-                "data": {"foo": 1},
-                "valid": true
-            },
-            {
-                "description": "with dependency",
-                "data": {"foo": 1, "bar": 2},
-                "valid": true
-            },
-            {
-                "description": "missing dependency",
-                "data": {"bar": 2},
-                "valid": false
-            },
-            {
-                "description": "ignores arrays",
-                "data": ["bar"],
-                "valid": true
-            },
-            {
-                "description": "ignores strings",
-                "data": "foobar",
-                "valid": true
-            },
-            {
-                "description": "ignores other non-objects",
-                "data": 12,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "empty dependents",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "dependencies": {"bar": []}
-        },
-        "tests": [
-            {
-                "description": "empty object",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "object with one property",
-                "data": {"bar": 2},
-                "valid": true
-            },
-            {
-                "description": "non-object is valid",
-                "data": 1,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "multiple dependents required",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "dependencies": {"quux": ["foo", "bar"]}
-        },
-        "tests": [
-            {
-                "description": "neither",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "nondependants",
-                "data": {"foo": 1, "bar": 2},
-                "valid": true
-            },
-            {
-                "description": "with dependencies",
-                "data": {"foo": 1, "bar": 2, "quux": 3},
-                "valid": true
-            },
-            {
-                "description": "missing dependency",
-                "data": {"foo": 1, "quux": 2},
-                "valid": false
-            },
-            {
-                "description": "missing other dependency",
-                "data": {"bar": 1, "quux": 2},
-                "valid": false
-            },
-            {
-                "description": "missing both dependencies",
-                "data": {"quux": 1},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "dependencies with escaped characters",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "dependencies": {
-                "foo\nbar": ["foo\rbar"],
-                "foo\"bar": ["foo'bar"]
-            }
-        },
-        "tests": [
-            {
-                "description": "CRLF",
-                "data": {
-                    "foo\nbar": 1,
-                    "foo\rbar": 2
-                },
-                "valid": true
-            },
-            {
-                "description": "quoted quotes",
-                "data": {
-                    "foo'bar": 1,
-                    "foo\"bar": 2
-                },
-                "valid": true
-            },
-            {
-                "description": "CRLF missing dependent",
-                "data": {
-                    "foo\nbar": 1,
-                    "foo": 2
-                },
-                "valid": false
-            },
-            {
-                "description": "quoted quotes missing dependent",
-                "data": {
-                    "foo\"bar": 2
-                },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "single schema dependency",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "dependencies": {
-                "bar": {
-                    "properties": {
-                        "foo": {"type": "integer"},
-                        "bar": {"type": "integer"}
-                    }
-                }
-            }
-        },
-        "tests": [
-            {
-                "description": "valid",
-                "data": {"foo": 1, "bar": 2},
-                "valid": true
-            },
-            {
-                "description": "no dependency",
-                "data": {"foo": "quux"},
-                "valid": true
-            },
-            {
-                "description": "wrong type",
-                "data": {"foo": "quux", "bar": 2},
-                "valid": false
-            },
-            {
-                "description": "wrong type other",
-                "data": {"foo": 2, "bar": "quux"},
-                "valid": false
-            },
-            {
-                "description": "wrong type both",
-                "data": {"foo": "quux", "bar": "quux"},
-                "valid": false
-            },
-            {
-                "description": "ignores arrays",
-                "data": ["bar"],
-                "valid": true
-            },
-            {
-                "description": "ignores strings",
-                "data": "foobar",
-                "valid": true
-            },
-            {
-                "description": "ignores other non-objects",
-                "data": 12,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "boolean subschemas",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "dependencies": {
-                "foo": true,
-                "bar": false
-            }
-        },
-        "tests": [
-            {
-                "description": "object with property having schema true is valid",
-                "data": {"foo": 1},
-                "valid": true
-            },
-            {
-                "description": "object with property having schema false is invalid",
-                "data": {"bar": 2},
-                "valid": false
-            },
-            {
-                "description": "object with both properties is invalid",
-                "data": {"foo": 1, "bar": 2},
-                "valid": false
-            },
-            {
-                "description": "empty object is valid",
-                "data": {},
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "schema dependencies with escaped characters",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "dependencies": {
-                "foo\tbar": {"minProperties": 4},
-                "foo'bar": {"required": ["foo\"bar"]}
-            }
-        },
-        "tests": [
-            {
-                "description": "quoted tab",
-                "data": {
-                    "foo\tbar": 1,
-                    "a": 2,
-                    "b": 3,
-                    "c": 4
-                },
-                "valid": true
-            },
-            {
-                "description": "quoted quote",
-                "data": {
-                    "foo'bar": {"foo\"bar": 1}
-                },
-                "valid": false
-            },
-            {
-                "description": "quoted tab invalid under dependent schema",
-                "data": {
-                    "foo\tbar": 1,
-                    "a": 2
-                },
-                "valid": false
-            },
-            {
-                "description": "quoted quote invalid under dependent schema",
-                "data": {"foo'bar": 1},
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft2020-12/optional/ecmascript-regex.json b/json/tests/draft2020-12/optional/ecmascript-regex.json
deleted file mode 100644
index 23b962e..0000000
--- a/json/tests/draft2020-12/optional/ecmascript-regex.json
+++ /dev/null
@@ -1,596 +0,0 @@
-[
-    {
-        "description": "ECMA 262 regex $ does not match trailing newline",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "type": "string",
-            "pattern": "^abc$"
-        },
-        "tests": [
-            {
-                "description": "matches in Python, but not in ECMA 262",
-                "data": "abc\\n",
-                "valid": false
-            },
-            {
-                "description": "matches",
-                "data": "abc",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "ECMA 262 regex converts \\t to horizontal tab",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "type": "string",
-            "pattern": "^\\t$"
-        },
-        "tests": [
-            {
-                "description": "does not match",
-                "data": "\\t",
-                "valid": false
-            },
-            {
-                "description": "matches",
-                "data": "\u0009",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "ECMA 262 regex escapes control codes with \\c and upper letter",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "type": "string",
-            "pattern": "^\\cC$"
-        },
-        "tests": [
-            {
-                "description": "does not match",
-                "data": "\\cC",
-                "valid": false
-            },
-            {
-                "description": "matches",
-                "data": "\u0003",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "ECMA 262 regex escapes control codes with \\c and lower letter",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "type": "string",
-            "pattern": "^\\cc$"
-        },
-        "tests": [
-            {
-                "description": "does not match",
-                "data": "\\cc",
-                "valid": false
-            },
-            {
-                "description": "matches",
-                "data": "\u0003",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "ECMA 262 \\d matches ascii digits only",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "type": "string",
-            "pattern": "^\\d$"
-        },
-        "tests": [
-            {
-                "description": "ASCII zero matches",
-                "data": "0",
-                "valid": true
-            },
-            {
-                "description": "NKO DIGIT ZERO does not match (unlike e.g. Python)",
-                "data": "߀",
-                "valid": false
-            },
-            {
-                "description": "NKO DIGIT ZERO (as \\u escape) does not match",
-                "data": "\u07c0",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "ECMA 262 \\D matches everything but ascii digits",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "type": "string",
-            "pattern": "^\\D$"
-        },
-        "tests": [
-            {
-                "description": "ASCII zero does not match",
-                "data": "0",
-                "valid": false
-            },
-            {
-                "description": "NKO DIGIT ZERO matches (unlike e.g. Python)",
-                "data": "߀",
-                "valid": true
-            },
-            {
-                "description": "NKO DIGIT ZERO (as \\u escape) matches",
-                "data": "\u07c0",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "ECMA 262 \\w matches ascii letters only",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "type": "string",
-            "pattern": "^\\w$"
-        },
-        "tests": [
-            {
-                "description": "ASCII 'a' matches",
-                "data": "a",
-                "valid": true
-            },
-            {
-                "description": "latin-1 e-acute does not match (unlike e.g. Python)",
-                "data": "é",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "ECMA 262 \\W matches everything but ascii letters",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "type": "string",
-            "pattern": "^\\W$"
-        },
-        "tests": [
-            {
-                "description": "ASCII 'a' does not match",
-                "data": "a",
-                "valid": false
-            },
-            {
-                "description": "latin-1 e-acute matches (unlike e.g. Python)",
-                "data": "é",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "ECMA 262 \\s matches whitespace",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "type": "string",
-            "pattern": "^\\s$"
-        },
-        "tests": [
-            {
-                "description": "ASCII space matches",
-                "data": " ",
-                "valid": true
-            },
-            {
-                "description": "Character tabulation matches",
-                "data": "\t",
-                "valid": true
-            },
-            {
-                "description": "Line tabulation matches",
-                "data": "\u000b",
-                "valid": true
-            },
-            {
-                "description": "Form feed matches",
-                "data": "\u000c",
-                "valid": true
-            },
-            {
-                "description": "latin-1 non-breaking-space matches",
-                "data": "\u00a0",
-                "valid": true
-            },
-            {
-                "description": "zero-width whitespace matches",
-                "data": "\ufeff",
-                "valid": true
-            },
-            {
-                "description": "line feed matches (line terminator)",
-                "data": "\u000a",
-                "valid": true
-            },
-            {
-                "description": "paragraph separator matches (line terminator)",
-                "data": "\u2029",
-                "valid": true
-            },
-            {
-                "description": "EM SPACE matches (Space_Separator)",
-                "data": "\u2003",
-                "valid": true
-            },
-            {
-                "description": "Non-whitespace control does not match",
-                "data": "\u0001",
-                "valid": false
-            },
-            {
-                "description": "Non-whitespace does not match",
-                "data": "\u2013",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "ECMA 262 \\S matches everything but whitespace",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "type": "string",
-            "pattern": "^\\S$"
-        },
-        "tests": [
-            {
-                "description": "ASCII space does not match",
-                "data": " ",
-                "valid": false
-            },
-            {
-                "description": "Character tabulation does not match",
-                "data": "\t",
-                "valid": false
-            },
-            {
-                "description": "Line tabulation does not match",
-                "data": "\u000b",
-                "valid": false
-            },
-            {
-                "description": "Form feed does not match",
-                "data": "\u000c",
-                "valid": false
-            },
-            {
-                "description": "latin-1 non-breaking-space does not match",
-                "data": "\u00a0",
-                "valid": false
-            },
-            {
-                "description": "zero-width whitespace does not match",
-                "data": "\ufeff",
-                "valid": false
-            },
-            {
-                "description": "line feed does not match (line terminator)",
-                "data": "\u000a",
-                "valid": false
-            },
-            {
-                "description": "paragraph separator does not match (line terminator)",
-                "data": "\u2029",
-                "valid": false
-            },
-            {
-                "description": "EM SPACE does not match (Space_Separator)",
-                "data": "\u2003",
-                "valid": false
-            },
-            {
-                "description": "Non-whitespace control matches",
-                "data": "\u0001",
-                "valid": true
-            },
-            {
-                "description": "Non-whitespace matches",
-                "data": "\u2013",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "patterns always use unicode semantics with pattern",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "pattern": "\\p{Letter}cole"
-        },
-        "tests": [
-            {
-                "description": "ascii character in json string",
-                "data": "Les hivers de mon enfance etaient des saisons longues, longues. Nous vivions en trois lieux: l'ecole, l'eglise et la patinoire; mais la vraie vie etait sur la patinoire.",
-                "valid": true
-            },
-            {
-                "description": "literal unicode character in json string",
-                "data": "Les hivers de mon enfance étaient des saisons longues, longues. Nous vivions en trois lieux: l'école, l'église et la patinoire; mais la vraie vie était sur la patinoire.",
-                "valid": true
-            },
-            {
-                "description": "unicode character in hex format in string",
-                "data": "Les hivers de mon enfance étaient des saisons longues, longues. Nous vivions en trois lieux: l'\u00e9cole, l'église et la patinoire; mais la vraie vie était sur la patinoire.",
-                "valid": true
-            },
-            {
-                "description": "unicode matching is case-sensitive",
-                "data": "LES HIVERS DE MON ENFANCE ÉTAIENT DES SAISONS LONGUES, LONGUES. NOUS VIVIONS EN TROIS LIEUX: L'ÉCOLE, L'ÉGLISE ET LA PATINOIRE; MAIS LA VRAIE VIE ÉTAIT SUR LA PATINOIRE.",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "\\w in patterns matches [A-Za-z0-9_], not unicode letters",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "pattern": "\\wcole"
-        },
-        "tests": [
-            {
-                "description": "ascii character in json string",
-                "data": "Les hivers de mon enfance etaient des saisons longues, longues. Nous vivions en trois lieux: l'ecole, l'eglise et la patinoire; mais la vraie vie etait sur la patinoire.",
-                "valid": true
-            },
-            {
-                "description": "literal unicode character in json string",
-                "data": "Les hivers de mon enfance étaient des saisons longues, longues. Nous vivions en trois lieux: l'école, l'église et la patinoire; mais la vraie vie était sur la patinoire.",
-                "valid": false
-            },
-            {
-                "description": "unicode character in hex format in string",
-                "data": "Les hivers de mon enfance étaient des saisons longues, longues. Nous vivions en trois lieux: l'\u00e9cole, l'église et la patinoire; mais la vraie vie était sur la patinoire.",
-                "valid": false
-            },
-            {
-                "description": "unicode matching is case-sensitive",
-                "data": "LES HIVERS DE MON ENFANCE ÉTAIENT DES SAISONS LONGUES, LONGUES. NOUS VIVIONS EN TROIS LIEUX: L'ÉCOLE, L'ÉGLISE ET LA PATINOIRE; MAIS LA VRAIE VIE ÉTAIT SUR LA PATINOIRE.",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "pattern with ASCII ranges",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "pattern": "[a-z]cole"
-        },
-        "tests": [
-            {
-                "description": "literal unicode character in json string",
-                "data": "Les hivers de mon enfance étaient des saisons longues, longues. Nous vivions en trois lieux: l'école, l'église et la patinoire; mais la vraie vie était sur la patinoire.",
-                "valid": false
-            },
-            {
-                "description": "unicode character in hex format in string",
-                "data": "Les hivers de mon enfance étaient des saisons longues, longues. Nous vivions en trois lieux: l'\u00e9cole, l'église et la patinoire; mais la vraie vie était sur la patinoire.",
-                "valid": false
-            },
-            {
-                "description": "ascii characters match",
-                "data": "Les hivers de mon enfance etaient des saisons longues, longues. Nous vivions en trois lieux: l'ecole, l'eglise et la patinoire; mais la vraie vie etait sur la patinoire.",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "\\d in pattern matches [0-9], not unicode digits",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "pattern": "^\\d+$"
-        },
-        "tests": [
-            {
-                "description": "ascii digits",
-                "data": "42",
-                "valid": true
-            },
-            {
-                "description": "ascii non-digits",
-                "data": "-%#",
-                "valid": false
-            },
-            {
-                "description": "non-ascii digits (BENGALI DIGIT FOUR, BENGALI DIGIT TWO)",
-                "data": "৪২",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "\\a is not an ECMA 262 control escape",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "$ref": "https://json-schema.org/draft/2020-12/schema"
-        },
-        "tests": [
-            {
-                "description": "when used as a pattern",
-                "data": { "pattern": "\\a" },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "pattern with non-ASCII digits",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "pattern": "^\\p{digit}+$"
-        },
-        "tests": [
-            {
-                "description": "ascii digits",
-                "data": "42",
-                "valid": true
-            },
-            {
-                "description": "ascii non-digits",
-                "data": "-%#",
-                "valid": false
-            },
-            {
-                "description": "non-ascii digits (BENGALI DIGIT FOUR, BENGALI DIGIT TWO)",
-                "data": "৪২",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "patterns always use unicode semantics with patternProperties",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "type": "object",
-            "patternProperties": {
-                "\\p{Letter}cole": true
-            },
-            "additionalProperties": false
-        },
-        "tests": [
-            {
-                "description": "ascii character in json string",
-                "data": { "l'ecole": "pas de vraie vie" },
-                "valid": true
-            },
-            {
-                "description": "literal unicode character in json string",
-                "data": { "l'école": "pas de vraie vie" },
-                "valid": true
-            },
-            {
-                "description": "unicode character in hex format in string",
-                "data": { "l'\u00e9cole": "pas de vraie vie" },
-                "valid": true
-            },
-            {
-                "description": "unicode matching is case-sensitive",
-                "data": { "L'ÉCOLE": "PAS DE VRAIE VIE" },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "\\w in patternProperties matches [A-Za-z0-9_], not unicode letters",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "type": "object",
-            "patternProperties": {
-                "\\wcole": true
-            },
-            "additionalProperties": false
-        },
-        "tests": [
-            {
-                "description": "ascii character in json string",
-                "data": { "l'ecole": "pas de vraie vie" },
-                "valid": true
-            },
-            {
-                "description": "literal unicode character in json string",
-                "data": { "l'école": "pas de vraie vie" },
-                "valid": false
-            },
-            {
-                "description": "unicode character in hex format in string",
-                "data": { "l'\u00e9cole": "pas de vraie vie" },
-                "valid": false
-            },
-            {
-                "description": "unicode matching is case-sensitive",
-                "data": { "L'ÉCOLE": "PAS DE VRAIE VIE" },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "patternProperties with ASCII ranges",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "type": "object",
-            "patternProperties": {
-                "[a-z]cole": true
-            },
-            "additionalProperties": false
-        },
-        "tests": [
-            {
-                "description": "literal unicode character in json string",
-                "data": { "l'école": "pas de vraie vie" },
-                "valid": false
-            },
-            {
-                "description": "unicode character in hex format in string",
-                "data": { "l'\u00e9cole": "pas de vraie vie" },
-                "valid": false
-            },
-            {
-                "description": "ascii characters match",
-                "data": { "l'ecole": "pas de vraie vie" },
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "\\d in patternProperties matches [0-9], not unicode digits",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "type": "object",
-            "patternProperties": {
-                "^\\d+$": true
-            },
-            "additionalProperties": false
-        },
-        "tests": [
-            {
-                "description": "ascii digits",
-                "data": { "42": "life, the universe, and everything" },
-                "valid": true
-            },
-            {
-                "description": "ascii non-digits",
-                "data": { "-%#": "spending the year dead for tax reasons" },
-                "valid": false
-            },
-            {
-                "description": "non-ascii digits (BENGALI DIGIT FOUR, BENGALI DIGIT TWO)",
-                "data": { "৪২": "khajit has wares if you have coin" },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "patternProperties with non-ASCII digits",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "type": "object",
-            "patternProperties": {
-                "^\\p{digit}+$": true
-            },
-            "additionalProperties": false
-        },
-        "tests": [
-            {
-                "description": "ascii digits",
-                "data": { "42": "life, the universe, and everything" },
-                "valid": true
-            },
-            {
-                "description": "ascii non-digits",
-                "data": { "-%#": "spending the year dead for tax reasons" },
-                "valid": false
-            },
-            {
-                "description": "non-ascii digits (BENGALI DIGIT FOUR, BENGALI DIGIT TWO)",
-                "data": { "৪২": "khajit has wares if you have coin" },
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft2020-12/optional/float-overflow.json b/json/tests/draft2020-12/optional/float-overflow.json
deleted file mode 100644
index f5ae8b1..0000000
--- a/json/tests/draft2020-12/optional/float-overflow.json
+++ /dev/null
@@ -1,17 +0,0 @@
-[
-    {
-        "description": "all integers are multiples of 0.5, if overflow is handled",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "type": "integer",
-            "multipleOf": 0.5
-        },
-        "tests": [
-            {
-                "description": "valid if optional overflow handling is implemented",
-                "data": 1e308,
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft2020-12/optional/format-assertion.json b/json/tests/draft2020-12/optional/format-assertion.json
deleted file mode 100644
index 0340037..0000000
--- a/json/tests/draft2020-12/optional/format-assertion.json
+++ /dev/null
@@ -1,42 +0,0 @@
-[
-    {
-        "description": "schema that uses custom metaschema with format-assertion: false",
-        "schema": {
-            "$id": "https://schema/using/format-assertion/false",
-            "$schema": "http://localhost:1234/draft2020-12/format-assertion-false.json",
-            "format": "ipv4"
-        },
-        "tests": [
-            {
-                "description": "format-assertion: false: valid string",
-                "data": "127.0.0.1",
-                "valid": true
-            },
-            {
-                "description": "format-assertion: false: invalid string",
-                "data": "not-an-ipv4",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "schema that uses custom metaschema with format-assertion: true",
-        "schema": {
-            "$id": "https://schema/using/format-assertion/true",
-            "$schema": "http://localhost:1234/draft2020-12/format-assertion-true.json",
-            "format": "ipv4"
-        },
-        "tests": [
-            {
-                "description": "format-assertion: true: valid string",
-                "data": "127.0.0.1",
-                "valid": true
-            },
-            {
-                "description": "format-assertion: true: invalid string",
-                "data": "not-an-ipv4",
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft2020-12/optional/format/date-time.json b/json/tests/draft2020-12/optional/format/date-time.json
deleted file mode 100644
index 8783d73..0000000
--- a/json/tests/draft2020-12/optional/format/date-time.json
+++ /dev/null
@@ -1,136 +0,0 @@
-[
-    {
-        "description": "validation of date-time strings",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "format": "date-time"
-        },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            },
-            {
-                "description": "a valid date-time string",
-                "data": "1963-06-19T08:30:06.283185Z",
-                "valid": true
-            },
-            {
-                "description": "a valid date-time string without second fraction",
-                "data": "1963-06-19T08:30:06Z",
-                "valid": true
-            },
-            {
-                "description": "a valid date-time string with plus offset",
-                "data": "1937-01-01T12:00:27.87+00:20",
-                "valid": true
-            },
-            {
-                "description": "a valid date-time string with minus offset",
-                "data": "1990-12-31T15:59:50.123-08:00",
-                "valid": true
-            },
-            {
-                "description": "a valid date-time with a leap second, UTC",
-                "data": "1998-12-31T23:59:60Z",
-                "valid": true
-            },
-            {
-                "description": "a valid date-time with a leap second, with minus offset",
-                "data": "1998-12-31T15:59:60.123-08:00",
-                "valid": true
-            },
-            {
-                "description": "an invalid date-time past leap second, UTC",
-                "data": "1998-12-31T23:59:61Z",
-                "valid": false
-            },
-            {
-                "description": "an invalid date-time with leap second on a wrong minute, UTC",
-                "data": "1998-12-31T23:58:60Z",
-                "valid": false
-            },
-            {
-                "description": "an invalid date-time with leap second on a wrong hour, UTC",
-                "data": "1998-12-31T22:59:60Z",
-                "valid": false
-            },
-            {
-                "description": "an invalid day in date-time string",
-                "data": "1990-02-31T15:59:59.123-08:00",
-                "valid": false
-            },
-            {
-                "description": "an invalid offset in date-time string",
-                "data": "1990-12-31T15:59:59-24:00",
-                "valid": false
-            },
-            {
-                "description": "an invalid closing Z after time-zone offset",
-                "data": "1963-06-19T08:30:06.28123+01:00Z",
-                "valid": false
-            },
-            {
-                "description": "an invalid date-time string",
-                "data": "06/19/1963 08:30:06 PST",
-                "valid": false
-            },
-            {
-                "description": "case-insensitive T and Z",
-                "data": "1963-06-19t08:30:06.283185z",
-                "valid": true
-            },
-            {
-                "description": "only RFC3339 not all of ISO 8601 are valid",
-                "data": "2013-350T01:01:01",
-                "valid": false
-            },
-            {
-                "description": "invalid non-padded month dates",
-                "data": "1963-6-19T08:30:06.283185Z",
-                "valid": false
-            },
-            {
-                "description": "invalid non-padded day dates",
-                "data": "1963-06-1T08:30:06.283185Z",
-                "valid": false
-            },
-            {
-                "description": "invalid non-ASCII '৪' (a Bengali 4) in date portion",
-                "data": "1963-06-1৪T00:00:00Z",
-                "valid": false
-            },
-            {
-                "description": "invalid non-ASCII '৪' (a Bengali 4) in time portion",
-                "data": "1963-06-11T0৪:00:00Z",
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft2020-12/optional/format/date.json b/json/tests/draft2020-12/optional/format/date.json
deleted file mode 100644
index 7b89329..0000000
--- a/json/tests/draft2020-12/optional/format/date.json
+++ /dev/null
@@ -1,226 +0,0 @@
-[
-    {
-        "description": "validation of date strings",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "format": "date"
-        },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            },
-            {
-                "description": "a valid date string",
-                "data": "1963-06-19",
-                "valid": true
-            },
-            {
-                "description": "a valid date string with 31 days in January",
-                "data": "2020-01-31",
-                "valid": true
-            },
-            {
-                "description": "a invalid date string with 32 days in January",
-                "data": "2020-01-32",
-                "valid": false
-            },
-            {
-                "description": "a valid date string with 28 days in February (normal)",
-                "data": "2021-02-28",
-                "valid": true
-            },
-            {
-                "description": "a invalid date string with 29 days in February (normal)",
-                "data": "2021-02-29",
-                "valid": false
-            },
-            {
-                "description": "a valid date string with 29 days in February (leap)",
-                "data": "2020-02-29",
-                "valid": true
-            },
-            {
-                "description": "a invalid date string with 30 days in February (leap)",
-                "data": "2020-02-30",
-                "valid": false
-            },
-            {
-                "description": "a valid date string with 31 days in March",
-                "data": "2020-03-31",
-                "valid": true
-            },
-            {
-                "description": "a invalid date string with 32 days in March",
-                "data": "2020-03-32",
-                "valid": false
-            },
-            {
-                "description": "a valid date string with 30 days in April",
-                "data": "2020-04-30",
-                "valid": true
-            },
-            {
-                "description": "a invalid date string with 31 days in April",
-                "data": "2020-04-31",
-                "valid": false
-            },
-            {
-                "description": "a valid date string with 31 days in May",
-                "data": "2020-05-31",
-                "valid": true
-            },
-            {
-                "description": "a invalid date string with 32 days in May",
-                "data": "2020-05-32",
-                "valid": false
-            },
-            {
-                "description": "a valid date string with 30 days in June",
-                "data": "2020-06-30",
-                "valid": true
-            },
-            {
-                "description": "a invalid date string with 31 days in June",
-                "data": "2020-06-31",
-                "valid": false
-            },
-            {
-                "description": "a valid date string with 31 days in July",
-                "data": "2020-07-31",
-                "valid": true
-            },
-            {
-                "description": "a invalid date string with 32 days in July",
-                "data": "2020-07-32",
-                "valid": false
-            },
-            {
-                "description": "a valid date string with 31 days in August",
-                "data": "2020-08-31",
-                "valid": true
-            },
-            {
-                "description": "a invalid date string with 32 days in August",
-                "data": "2020-08-32",
-                "valid": false
-            },
-            {
-                "description": "a valid date string with 30 days in September",
-                "data": "2020-09-30",
-                "valid": true
-            },
-            {
-                "description": "a invalid date string with 31 days in September",
-                "data": "2020-09-31",
-                "valid": false
-            },
-            {
-                "description": "a valid date string with 31 days in October",
-                "data": "2020-10-31",
-                "valid": true
-            },
-            {
-                "description": "a invalid date string with 32 days in October",
-                "data": "2020-10-32",
-                "valid": false
-            },
-            {
-                "description": "a valid date string with 30 days in November",
-                "data": "2020-11-30",
-                "valid": true
-            },
-            {
-                "description": "a invalid date string with 31 days in November",
-                "data": "2020-11-31",
-                "valid": false
-            },
-            {
-                "description": "a valid date string with 31 days in December",
-                "data": "2020-12-31",
-                "valid": true
-            },
-            {
-                "description": "a invalid date string with 32 days in December",
-                "data": "2020-12-32",
-                "valid": false
-            },
-            {
-                "description": "a invalid date string with invalid month",
-                "data": "2020-13-01",
-                "valid": false
-            },
-            {
-                "description": "an invalid date string",
-                "data": "06/19/1963",
-                "valid": false
-            },
-            {
-                "description": "only RFC3339 not all of ISO 8601 are valid",
-                "data": "2013-350",
-                "valid": false
-            },
-            {
-                "description": "non-padded month dates are not valid",
-                "data": "1998-1-20",
-                "valid": false
-            },
-            {
-                "description": "non-padded day dates are not valid",
-                "data": "1998-01-1",
-                "valid": false
-            },
-            {
-                "description": "invalid month",
-                "data": "1998-13-01",
-                "valid": false
-            },
-            {
-                "description": "invalid month-day combination",
-                "data": "1998-04-31",
-                "valid": false
-            },
-            {
-                "description": "2021 is not a leap year",
-                "data": "2021-02-29",
-                "valid": false
-            },
-            {
-                "description": "2020 is a leap year",
-                "data": "2020-02-29",
-                "valid": true
-            },
-            {
-                "description": "invalid non-ASCII '৪' (a Bengali 4)",
-                "data": "1963-06-1৪",
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft2020-12/optional/format/duration.json b/json/tests/draft2020-12/optional/format/duration.json
deleted file mode 100644
index a3af56e..0000000
--- a/json/tests/draft2020-12/optional/format/duration.json
+++ /dev/null
@@ -1,136 +0,0 @@
-[
-    {
-        "description": "validation of duration strings",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "format": "duration"
-        },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            },
-            {
-                "description": "a valid duration string",
-                "data": "P4DT12H30M5S",
-                "valid": true
-            },
-            {
-                "description": "an invalid duration string",
-                "data": "PT1D",
-                "valid": false
-            },
-            {
-                "description": "no elements present",
-                "data": "P",
-                "valid": false
-            },
-            {
-                "description": "no time elements present",
-                "data": "P1YT",
-                "valid": false
-            },
-            {
-                "description": "no date or time elements present",
-                "data": "PT",
-                "valid": false
-            },
-            {
-                "description": "elements out of order",
-                "data": "P2D1Y",
-                "valid": false
-            },
-            {
-                "description": "missing time separator",
-                "data": "P1D2H",
-                "valid": false
-            },
-            {
-                "description": "time element in the date position",
-                "data": "P2S",
-                "valid": false
-            },
-            {
-                "description": "four years duration",
-                "data": "P4Y",
-                "valid": true
-            },
-            {
-                "description": "zero time, in seconds",
-                "data": "PT0S",
-                "valid": true
-            },
-            {
-                "description": "zero time, in days",
-                "data": "P0D",
-                "valid": true
-            },
-            {
-                "description": "one month duration",
-                "data": "P1M",
-                "valid": true
-            },
-            {
-                "description": "one minute duration",
-                "data": "PT1M",
-                "valid": true
-            },
-            {
-                "description": "one and a half days, in hours",
-                "data": "PT36H",
-                "valid": true
-            },
-            {
-                "description": "one and a half days, in days and hours",
-                "data": "P1DT12H",
-                "valid": true
-            },
-            {
-                "description": "two weeks",
-                "data": "P2W",
-                "valid": true
-            },
-            {
-                "description": "weeks cannot be combined with other units",
-                "data": "P1Y2W",
-                "valid": false
-            },
-            {
-                "description": "invalid non-ASCII '২' (a Bengali 2)",
-                "data": "P২Y",
-                "valid": false
-            },
-            {
-                "description": "element without unit",
-                "data": "P1",
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft2020-12/optional/format/email.json b/json/tests/draft2020-12/optional/format/email.json
deleted file mode 100644
index ee07589..0000000
--- a/json/tests/draft2020-12/optional/format/email.json
+++ /dev/null
@@ -1,121 +0,0 @@
-[
-    {
-        "description": "validation of e-mail addresses",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "format": "email"
-        },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            },
-            {
-                "description": "a valid e-mail address",
-                "data": "joe.bloggs@example.com",
-                "valid": true
-            },
-            {
-                "description": "an invalid e-mail address",
-                "data": "2962",
-                "valid": false
-            },
-            {
-                "description": "tilde in local part is valid",
-                "data": "te~st@example.com",
-                "valid": true
-            },
-            {
-                "description": "tilde before local part is valid",
-                "data": "~test@example.com",
-                "valid": true
-            },
-            {
-                "description": "tilde after local part is valid",
-                "data": "test~@example.com",
-                "valid": true
-            },
-            {
-                "description": "a quoted string with a space in the local part is valid",
-                "data": "\"joe bloggs\"@example.com",
-                "valid": true
-            },
-            {
-                "description": "a quoted string with a double dot in the local part is valid",
-                "data": "\"joe..bloggs\"@example.com",
-                "valid": true
-            },
-            {
-                "description": "a quoted string with a @ in the local part is valid",
-                "data": "\"joe@bloggs\"@example.com",
-                "valid": true
-            },
-            {
-                "description": "an IPv4-address-literal after the @ is valid",
-                "data": "joe.bloggs@[127.0.0.1]",
-                "valid": true
-            },
-            {
-                "description": "an IPv6-address-literal after the @ is valid",
-                "data": "joe.bloggs@[IPv6:::1]",
-                "valid": true
-            },
-            {
-                "description": "dot before local part is not valid",
-                "data": ".test@example.com",
-                "valid": false
-            },
-            {
-                "description": "dot after local part is not valid",
-                "data": "test.@example.com",
-                "valid": false
-            },
-            {
-                "description": "two separated dots inside local part are valid",
-                "data": "te.s.t@example.com",
-                "valid": true
-            },
-            {
-                "description": "two subsequent dots inside local part are not valid",
-                "data": "te..st@example.com",
-                "valid": false
-            },
-            {
-                "description": "an invalid domain",
-                "data": "joe.bloggs@invalid=domain.com",
-                "valid": false
-            },
-            {
-                "description": "an invalid IPv4-address-literal",
-                "data": "joe.bloggs@[127.0.0.300]",
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft2020-12/optional/format/hostname.json b/json/tests/draft2020-12/optional/format/hostname.json
deleted file mode 100644
index c8db977..0000000
--- a/json/tests/draft2020-12/optional/format/hostname.json
+++ /dev/null
@@ -1,101 +0,0 @@
-[
-    {
-        "description": "validation of host names",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "format": "hostname"
-        },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            },
-            {
-                "description": "a valid host name",
-                "data": "www.example.com",
-                "valid": true
-            },
-            {
-                "description": "a valid punycoded IDN hostname",
-                "data": "xn--4gbwdl.xn--wgbh1c",
-                "valid": true
-            },
-            {
-                "description": "a host name starting with an illegal character",
-                "data": "-a-host-name-that-starts-with--",
-                "valid": false
-            },
-            {
-                "description": "a host name containing illegal characters",
-                "data": "not_a_valid_host_name",
-                "valid": false
-            },
-            {
-                "description": "a host name with a component too long",
-                "data": "a-vvvvvvvvvvvvvvvveeeeeeeeeeeeeeeerrrrrrrrrrrrrrrryyyyyyyyyyyyyyyy-long-host-name-component",
-                "valid": false
-            },
-            {
-                "description": "starts with hyphen",
-                "data": "-hostname",
-                "valid": false
-            },
-            {
-                "description": "ends with hyphen",
-                "data": "hostname-",
-                "valid": false
-            },
-            {
-                "description": "starts with underscore",
-                "data": "_hostname",
-                "valid": false
-            },
-            {
-                "description": "ends with underscore",
-                "data": "hostname_",
-                "valid": false
-            },
-            {
-                "description": "contains underscore",
-                "data": "host_name",
-                "valid": false
-            },
-            {
-                "description": "maximum label length",
-                "data": "abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijk.com",
-                "valid": true
-            },
-            {
-                "description": "exceeds maximum label length",
-                "data": "abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijkl.com",
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft2020-12/optional/format/idn-email.json b/json/tests/draft2020-12/optional/format/idn-email.json
deleted file mode 100644
index 50f3c23..0000000
--- a/json/tests/draft2020-12/optional/format/idn-email.json
+++ /dev/null
@@ -1,61 +0,0 @@
-[
-    {
-        "description": "validation of an internationalized e-mail addresses",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "format": "idn-email"
-        },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            },
-            {
-                "description": "a valid idn e-mail (example@example.test in Hangul)",
-                "data": "실례@실례.테스트",
-                "valid": true
-            },
-            {
-                "description": "an invalid idn e-mail address",
-                "data": "2962",
-                "valid": false
-            },
-            {
-                "description": "a valid e-mail address",
-                "data": "joe.bloggs@example.com",
-                "valid": true
-            },
-            {
-                "description": "an invalid e-mail address",
-                "data": "2962",
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft2020-12/optional/format/idn-hostname.json b/json/tests/draft2020-12/optional/format/idn-hostname.json
deleted file mode 100644
index 5549c05..0000000
--- a/json/tests/draft2020-12/optional/format/idn-hostname.json
+++ /dev/null
@@ -1,307 +0,0 @@
-[
-    {
-        "description": "validation of internationalized host names",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "format": "idn-hostname"
-        },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            },
-            {
-                "description": "a valid host name (example.test in Hangul)",
-                "data": "실례.테스트",
-                "valid": true
-            },
-            {
-                "description": "illegal first char U+302E Hangul single dot tone mark",
-                "data": "〮실례.테스트",
-                "valid": false
-            },
-            {
-                "description": "contains illegal char U+302E Hangul single dot tone mark",
-                "data": "실〮례.테스트",
-                "valid": false
-            },
-            {
-                "description": "a host name with a component too long",
-                "data": "실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실례례테스트례례례례례례례례례례례례례례례례례테스트례례례례례례례례례례례례례례례례례례례테스트례례례례례례례례례례례례테스트례례실례.테스트",
-                "valid": false
-            },
-            {
-                "description": "invalid label, correct Punycode",
-                "comment": "https://tools.ietf.org/html/rfc5890#section-2.3.2.1 https://tools.ietf.org/html/rfc5891#section-4.4 https://tools.ietf.org/html/rfc3492#section-7.1",
-                "data": "-> $1.00 <--",
-                "valid": false
-            },
-            {
-                "description": "valid Chinese Punycode",
-                "comment": "https://tools.ietf.org/html/rfc5890#section-2.3.2.1 https://tools.ietf.org/html/rfc5891#section-4.4",
-                "data": "xn--ihqwcrb4cv8a8dqg056pqjye",
-                "valid": true
-            },
-            {
-                "description": "invalid Punycode",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.4 https://tools.ietf.org/html/rfc5890#section-2.3.2.1",
-                "data": "xn--X",
-                "valid": false
-            },
-            {
-                "description": "U-label contains \"--\" in the 3rd and 4th position",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.2.3.1 https://tools.ietf.org/html/rfc5890#section-2.3.2.1",
-                "data": "XN--aa---o47jg78q",
-                "valid": false
-            },
-            {
-                "description": "U-label starts with a dash",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.2.3.1",
-                "data": "-hello",
-                "valid": false
-            },
-            {
-                "description": "U-label ends with a dash",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.2.3.1",
-                "data": "hello-",
-                "valid": false
-            },
-            {
-                "description": "U-label starts and ends with a dash",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.2.3.1",
-                "data": "-hello-",
-                "valid": false
-            },
-            {
-                "description": "Begins with a Spacing Combining Mark",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.2.3.2",
-                "data": "\u0903hello",
-                "valid": false
-            },
-            {
-                "description": "Begins with a Nonspacing Mark",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.2.3.2",
-                "data": "\u0300hello",
-                "valid": false
-            },
-            {
-                "description": "Begins with an Enclosing Mark",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.2.3.2",
-                "data": "\u0488hello",
-                "valid": false
-            },
-            {
-                "description": "Exceptions that are PVALID, left-to-right chars",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.2.2 https://tools.ietf.org/html/rfc5892#section-2.6",
-                "data": "\u00df\u03c2\u0f0b\u3007",
-                "valid": true
-            },
-            {
-                "description": "Exceptions that are PVALID, right-to-left chars",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.2.2 https://tools.ietf.org/html/rfc5892#section-2.6",
-                "data": "\u06fd\u06fe",
-                "valid": true
-            },
-            {
-                "description": "Exceptions that are DISALLOWED, right-to-left chars",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.2.2 https://tools.ietf.org/html/rfc5892#section-2.6",
-                "data": "\u0640\u07fa",
-                "valid": false
-            },
-            {
-                "description": "Exceptions that are DISALLOWED, left-to-right chars",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.2.2 https://tools.ietf.org/html/rfc5892#section-2.6 Note: The two combining marks (U+302E and U+302F) are in the middle and not at the start",
-                "data": "\u3031\u3032\u3033\u3034\u3035\u302e\u302f\u303b",
-                "valid": false
-            },
-            {
-                "description": "MIDDLE DOT with no preceding 'l'",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.2.3.3 https://tools.ietf.org/html/rfc5892#appendix-A.3",
-                "data": "a\u00b7l",
-                "valid": false
-            },
-            {
-                "description": "MIDDLE DOT with nothing preceding",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.2.3.3 https://tools.ietf.org/html/rfc5892#appendix-A.3",
-                "data": "\u00b7l",
-                "valid": false
-            },
-            {
-                "description": "MIDDLE DOT with no following 'l'",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.2.3.3 https://tools.ietf.org/html/rfc5892#appendix-A.3",
-                "data": "l\u00b7a",
-                "valid": false
-            },
-            {
-                "description": "MIDDLE DOT with nothing following",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.2.3.3 https://tools.ietf.org/html/rfc5892#appendix-A.3",
-                "data": "l\u00b7",
-                "valid": false
-            },
-            {
-                "description": "MIDDLE DOT with surrounding 'l's",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.2.3.3 https://tools.ietf.org/html/rfc5892#appendix-A.3",
-                "data": "l\u00b7l",
-                "valid": true
-            },
-            {
-                "description": "Greek KERAIA not followed by Greek",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.2.3.3 https://tools.ietf.org/html/rfc5892#appendix-A.4",
-                "data": "\u03b1\u0375S",
-                "valid": false
-            },
-            {
-                "description": "Greek KERAIA not followed by anything",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.2.3.3 https://tools.ietf.org/html/rfc5892#appendix-A.4",
-                "data": "\u03b1\u0375",
-                "valid": false
-            },
-            {
-                "description": "Greek KERAIA followed by Greek",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.2.3.3 https://tools.ietf.org/html/rfc5892#appendix-A.4",
-                "data": "\u03b1\u0375\u03b2",
-                "valid": true
-            },
-            {
-                "description": "Hebrew GERESH not preceded by Hebrew",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.2.3.3 https://tools.ietf.org/html/rfc5892#appendix-A.5",
-                "data": "A\u05f3\u05d1",
-                "valid": false
-            },
-            {
-                "description": "Hebrew GERESH not preceded by anything",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.2.3.3 https://tools.ietf.org/html/rfc5892#appendix-A.5",
-                "data": "\u05f3\u05d1",
-                "valid": false
-            },
-            {
-                "description": "Hebrew GERESH preceded by Hebrew",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.2.3.3 https://tools.ietf.org/html/rfc5892#appendix-A.5",
-                "data": "\u05d0\u05f3\u05d1",
-                "valid": true
-            },
-            {
-                "description": "Hebrew GERSHAYIM not preceded by Hebrew",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.2.3.3 https://tools.ietf.org/html/rfc5892#appendix-A.6",
-                "data": "A\u05f4\u05d1",
-                "valid": false
-            },
-            {
-                "description": "Hebrew GERSHAYIM not preceded by anything",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.2.3.3 https://tools.ietf.org/html/rfc5892#appendix-A.6",
-                "data": "\u05f4\u05d1",
-                "valid": false
-            },
-            {
-                "description": "Hebrew GERSHAYIM preceded by Hebrew",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.2.3.3 https://tools.ietf.org/html/rfc5892#appendix-A.6",
-                "data": "\u05d0\u05f4\u05d1",
-                "valid": true
-            },
-            {
-                "description": "KATAKANA MIDDLE DOT with no Hiragana, Katakana, or Han",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.2.3.3 https://tools.ietf.org/html/rfc5892#appendix-A.7",
-                "data": "def\u30fbabc",
-                "valid": false
-            },
-            {
-                "description": "KATAKANA MIDDLE DOT with no other characters",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.2.3.3 https://tools.ietf.org/html/rfc5892#appendix-A.7",
-                "data": "\u30fb",
-                "valid": false
-            },
-            {
-                "description": "KATAKANA MIDDLE DOT with Hiragana",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.2.3.3 https://tools.ietf.org/html/rfc5892#appendix-A.7",
-                "data": "\u30fb\u3041",
-                "valid": true
-            },
-            {
-                "description": "KATAKANA MIDDLE DOT with Katakana",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.2.3.3 https://tools.ietf.org/html/rfc5892#appendix-A.7",
-                "data": "\u30fb\u30a1",
-                "valid": true
-            },
-            {
-                "description": "KATAKANA MIDDLE DOT with Han",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.2.3.3 https://tools.ietf.org/html/rfc5892#appendix-A.7",
-                "data": "\u30fb\u4e08",
-                "valid": true
-            },
-            {
-                "description": "Arabic-Indic digits mixed with Extended Arabic-Indic digits",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.2.3.3 https://tools.ietf.org/html/rfc5892#appendix-A.8",
-                "data": "\u0660\u06f0",
-                "valid": false
-            },
-            {
-                "description": "Arabic-Indic digits not mixed with Extended Arabic-Indic digits",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.2.3.3 https://tools.ietf.org/html/rfc5892#appendix-A.8",
-                "data": "\u0628\u0660\u0628",
-                "valid": true
-            },
-            {
-                "description": "Extended Arabic-Indic digits not mixed with Arabic-Indic digits",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.2.3.3 https://tools.ietf.org/html/rfc5892#appendix-A.9",
-                "data": "\u06f00",
-                "valid": true
-            },
-            {
-                "description": "ZERO WIDTH JOINER not preceded by Virama",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.2.3.3 https://tools.ietf.org/html/rfc5892#appendix-A.2 https://www.unicode.org/review/pr-37.pdf",
-                "data": "\u0915\u200d\u0937",
-                "valid": false
-            },
-            {
-                "description": "ZERO WIDTH JOINER not preceded by anything",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.2.3.3 https://tools.ietf.org/html/rfc5892#appendix-A.2 https://www.unicode.org/review/pr-37.pdf",
-                "data": "\u200d\u0937",
-                "valid": false
-            },
-            {
-                "description": "ZERO WIDTH JOINER preceded by Virama",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.2.3.3 https://tools.ietf.org/html/rfc5892#appendix-A.2 https://www.unicode.org/review/pr-37.pdf",
-                "data": "\u0915\u094d\u200d\u0937",
-                "valid": true
-            },
-            {
-                "description": "ZERO WIDTH NON-JOINER preceded by Virama",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.2.3.3 https://tools.ietf.org/html/rfc5892#appendix-A.1",
-                "data": "\u0915\u094d\u200c\u0937",
-                "valid": true
-            },
-            {
-                "description": "ZERO WIDTH NON-JOINER not preceded by Virama but matches regexp",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.2.3.3 https://tools.ietf.org/html/rfc5892#appendix-A.1 https://www.w3.org/TR/alreq/#h_disjoining_enforcement",
-                "data": "\u0628\u064a\u200c\u0628\u064a",
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft2020-12/optional/format/ipv4.json b/json/tests/draft2020-12/optional/format/ipv4.json
deleted file mode 100644
index c72b6fc..0000000
--- a/json/tests/draft2020-12/optional/format/ipv4.json
+++ /dev/null
@@ -1,87 +0,0 @@
-[
-    {
-        "description": "validation of IP addresses",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "format": "ipv4"
-        },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            },
-            {
-                "description": "a valid IP address",
-                "data": "192.168.0.1",
-                "valid": true
-            },
-            {
-                "description": "an IP address with too many components",
-                "data": "127.0.0.0.1",
-                "valid": false
-            },
-            {
-                "description": "an IP address with out-of-range values",
-                "data": "256.256.256.256",
-                "valid": false
-            },
-            {
-                "description": "an IP address without 4 components",
-                "data": "127.0",
-                "valid": false
-            },
-            {
-                "description": "an IP address as an integer",
-                "data": "0x7f000001",
-                "valid": false
-            },
-            {
-                "description": "an IP address as an integer (decimal)",
-                "data": "2130706433",
-                "valid": false
-            },
-            {
-                "description": "invalid leading zeroes, as they are treated as octals",
-                "comment": "see https://sick.codes/universal-netmask-npm-package-used-by-270000-projects-vulnerable-to-octal-input-data-server-side-request-forgery-remote-file-inclusion-local-file-inclusion-and-more-cve-2021-28918/",
-                "data": "087.10.0.1",
-                "valid": false
-            },
-            {
-                "description": "value without leading zero is valid",
-                "data": "87.10.0.1",
-                "valid": true
-            },
-            {
-                "description": "invalid non-ASCII '২' (a Bengali 2)",
-                "data": "1২7.0.0.1",
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft2020-12/optional/format/ipv6.json b/json/tests/draft2020-12/optional/format/ipv6.json
deleted file mode 100644
index b9e570c..0000000
--- a/json/tests/draft2020-12/optional/format/ipv6.json
+++ /dev/null
@@ -1,211 +0,0 @@
-[
-    {
-        "description": "validation of IPv6 addresses",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "format": "ipv6"
-        },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            },
-            {
-                "description": "a valid IPv6 address",
-                "data": "::1",
-                "valid": true
-            },
-            {
-                "description": "an IPv6 address with out-of-range values",
-                "data": "12345::",
-                "valid": false
-            },
-            {
-                "description": "trailing 4 hex symbols is valid",
-                "data": "::abef",
-                "valid": true
-            },
-            {
-                "description": "trailing 5 hex symbols is invalid",
-                "data": "::abcef",
-                "valid": false
-            },
-            {
-                "description": "an IPv6 address with too many components",
-                "data": "1:1:1:1:1:1:1:1:1:1:1:1:1:1:1:1",
-                "valid": false
-            },
-            {
-                "description": "an IPv6 address containing illegal characters",
-                "data": "::laptop",
-                "valid": false
-            },
-            {
-                "description": "no digits is valid",
-                "data": "::",
-                "valid": true
-            },
-            {
-                "description": "leading colons is valid",
-                "data": "::42:ff:1",
-                "valid": true
-            },
-            {
-                "description": "trailing colons is valid",
-                "data": "d6::",
-                "valid": true
-            },
-            {
-                "description": "missing leading octet is invalid",
-                "data": ":2:3:4:5:6:7:8",
-                "valid": false
-            },
-            {
-                "description": "missing trailing octet is invalid",
-                "data": "1:2:3:4:5:6:7:",
-                "valid": false
-            },
-            {
-                "description": "missing leading octet with omitted octets later",
-                "data": ":2:3:4::8",
-                "valid": false
-            },
-            {
-                "description": "single set of double colons in the middle is valid",
-                "data": "1:d6::42",
-                "valid": true
-            },
-            {
-                "description": "two sets of double colons is invalid",
-                "data": "1::d6::42",
-                "valid": false
-            },
-            {
-                "description": "mixed format with the ipv4 section as decimal octets",
-                "data": "1::d6:192.168.0.1",
-                "valid": true
-            },
-            {
-                "description": "mixed format with double colons between the sections",
-                "data": "1:2::192.168.0.1",
-                "valid": true
-            },
-            {
-                "description": "mixed format with ipv4 section with octet out of range",
-                "data": "1::2:192.168.256.1",
-                "valid": false
-            },
-            {
-                "description": "mixed format with ipv4 section with a hex octet",
-                "data": "1::2:192.168.ff.1",
-                "valid": false
-            },
-            {
-                "description": "mixed format with leading double colons (ipv4-mapped ipv6 address)",
-                "data": "::ffff:192.168.0.1",
-                "valid": true
-            },
-            {
-                "description": "triple colons is invalid",
-                "data": "1:2:3:4:5:::8",
-                "valid": false
-            },
-            {
-                "description": "8 octets",
-                "data": "1:2:3:4:5:6:7:8",
-                "valid": true
-            },
-            {
-                "description": "insufficient octets without double colons",
-                "data": "1:2:3:4:5:6:7",
-                "valid": false
-            },
-            {
-                "description": "no colons is invalid",
-                "data": "1",
-                "valid": false
-            },
-            {
-                "description": "ipv4 is not ipv6",
-                "data": "127.0.0.1",
-                "valid": false
-            },
-            {
-                "description": "ipv4 segment must have 4 octets",
-                "data": "1:2:3:4:1.2.3",
-                "valid": false
-            },
-            {
-                "description": "leading whitespace is invalid",
-                "data": "  ::1",
-                "valid": false
-            },
-            {
-                "description": "trailing whitespace is invalid",
-                "data": "::1  ",
-                "valid": false
-            },
-            {
-                "description": "netmask is not a part of ipv6 address",
-                "data": "fe80::/64",
-                "valid": false
-            },
-            {
-                "description": "zone id is not a part of ipv6 address",
-                "data": "fe80::a%eth1",
-                "valid": false
-            },
-            {
-                "description": "a long valid ipv6",
-                "data": "1000:1000:1000:1000:1000:1000:255.255.255.255",
-                "valid": true
-            },
-            {
-                "description": "a long invalid ipv6, below length limit, first",
-                "data": "100:100:100:100:100:100:255.255.255.255.255",
-                "valid": false
-            },
-            {
-                "description": "a long invalid ipv6, below length limit, second",
-                "data": "100:100:100:100:100:100:100:255.255.255.255",
-                "valid": false
-            },
-            {
-                "description": "invalid non-ASCII '৪' (a Bengali 4)",
-                "data": "1:2:3:4:5:6:7:৪",
-                "valid": false
-            },
-            {
-                "description": "invalid non-ASCII '৪' (a Bengali 4) in the IPv4 portion",
-                "data": "1:2::192.16৪.0.1",
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft2020-12/optional/format/iri-reference.json b/json/tests/draft2020-12/optional/format/iri-reference.json
deleted file mode 100644
index 0c9483d..0000000
--- a/json/tests/draft2020-12/optional/format/iri-reference.json
+++ /dev/null
@@ -1,76 +0,0 @@
-[
-    {
-        "description": "validation of IRI References",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "format": "iri-reference"
-        },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            },
-            {
-                "description": "a valid IRI",
-                "data": "http://ƒøø.ßår/?∂éœ=πîx#πîüx",
-                "valid": true
-            },
-            {
-                "description": "a valid protocol-relative IRI Reference",
-                "data": "//ƒøø.ßår/?∂éœ=πîx#πîüx",
-                "valid": true
-            },
-            {
-                "description": "a valid relative IRI Reference",
-                "data": "/âππ",
-                "valid": true
-            },
-            {
-                "description": "an invalid IRI Reference",
-                "data": "\\\\WINDOWS\\filëßåré",
-                "valid": false
-            },
-            {
-                "description": "a valid IRI Reference",
-                "data": "âππ",
-                "valid": true
-            },
-            {
-                "description": "a valid IRI fragment",
-                "data": "#ƒrägmênt",
-                "valid": true
-            },
-            {
-                "description": "an invalid IRI fragment",
-                "data": "#ƒräg\\mênt",
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft2020-12/optional/format/iri.json b/json/tests/draft2020-12/optional/format/iri.json
deleted file mode 100644
index 311c9ef..0000000
--- a/json/tests/draft2020-12/optional/format/iri.json
+++ /dev/null
@@ -1,86 +0,0 @@
-[
-    {
-        "description": "validation of IRIs",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "format": "iri"
-        },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            },
-            {
-                "description": "a valid IRI with anchor tag",
-                "data": "http://ƒøø.ßår/?∂éœ=πîx#πîüx",
-                "valid": true
-            },
-            {
-                "description": "a valid IRI with anchor tag and parentheses",
-                "data": "http://ƒøø.com/blah_(wîkïpédiå)_blah#ßité-1",
-                "valid": true
-            },
-            {
-                "description": "a valid IRI with URL-encoded stuff",
-                "data": "http://ƒøø.ßår/?q=Test%20URL-encoded%20stuff",
-                "valid": true
-            },
-            {
-                "description": "a valid IRI with many special characters",
-                "data": "http://-.~_!$&'()*+,;=:%40:80%2f::::::@example.com",
-                "valid": true
-            },
-            {
-                "description": "a valid IRI based on IPv6",
-                "data": "http://[2001:0db8:85a3:0000:0000:8a2e:0370:7334]",
-                "valid": true
-            },
-            {
-                "description": "an invalid IRI based on IPv6",
-                "data": "http://2001:0db8:85a3:0000:0000:8a2e:0370:7334",
-                "valid": false
-            },
-            {
-                "description": "an invalid relative IRI Reference",
-                "data": "/abc",
-                "valid": false
-            },
-            {
-                "description": "an invalid IRI",
-                "data": "\\\\WINDOWS\\filëßåré",
-                "valid": false
-            },
-            {
-                "description": "an invalid IRI though valid IRI reference",
-                "data": "âππ",
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft2020-12/optional/format/json-pointer.json b/json/tests/draft2020-12/optional/format/json-pointer.json
deleted file mode 100644
index 71ba9b6..0000000
--- a/json/tests/draft2020-12/optional/format/json-pointer.json
+++ /dev/null
@@ -1,201 +0,0 @@
-[
-    {
-        "description": "validation of JSON-pointers (JSON String Representation)",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "format": "json-pointer"
-        },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            },
-            {
-                "description": "a valid JSON-pointer",
-                "data": "/foo/bar~0/baz~1/%a",
-                "valid": true
-            },
-            {
-                "description": "not a valid JSON-pointer (~ not escaped)",
-                "data": "/foo/bar~",
-                "valid": false
-            },
-            {
-                "description": "valid JSON-pointer with empty segment",
-                "data": "/foo//bar",
-                "valid": true
-            },
-            {
-                "description": "valid JSON-pointer with the last empty segment",
-                "data": "/foo/bar/",
-                "valid": true
-            },
-            {
-                "description": "valid JSON-pointer as stated in RFC 6901 #1",
-                "data": "",
-                "valid": true
-            },
-            {
-                "description": "valid JSON-pointer as stated in RFC 6901 #2",
-                "data": "/foo",
-                "valid": true
-            },
-            {
-                "description": "valid JSON-pointer as stated in RFC 6901 #3",
-                "data": "/foo/0",
-                "valid": true
-            },
-            {
-                "description": "valid JSON-pointer as stated in RFC 6901 #4",
-                "data": "/",
-                "valid": true
-            },
-            {
-                "description": "valid JSON-pointer as stated in RFC 6901 #5",
-                "data": "/a~1b",
-                "valid": true
-            },
-            {
-                "description": "valid JSON-pointer as stated in RFC 6901 #6",
-                "data": "/c%d",
-                "valid": true
-            },
-            {
-                "description": "valid JSON-pointer as stated in RFC 6901 #7",
-                "data": "/e^f",
-                "valid": true
-            },
-            {
-                "description": "valid JSON-pointer as stated in RFC 6901 #8",
-                "data": "/g|h",
-                "valid": true
-            },
-            {
-                "description": "valid JSON-pointer as stated in RFC 6901 #9",
-                "data": "/i\\j",
-                "valid": true
-            },
-            {
-                "description": "valid JSON-pointer as stated in RFC 6901 #10",
-                "data": "/k\"l",
-                "valid": true
-            },
-            {
-                "description": "valid JSON-pointer as stated in RFC 6901 #11",
-                "data": "/ ",
-                "valid": true
-            },
-            {
-                "description": "valid JSON-pointer as stated in RFC 6901 #12",
-                "data": "/m~0n",
-                "valid": true
-            },
-            {
-                "description": "valid JSON-pointer used adding to the last array position",
-                "data": "/foo/-",
-                "valid": true
-            },
-            {
-                "description": "valid JSON-pointer (- used as object member name)",
-                "data": "/foo/-/bar",
-                "valid": true
-            },
-            {
-                "description": "valid JSON-pointer (multiple escaped characters)",
-                "data": "/~1~0~0~1~1",
-                "valid": true
-            },
-            {
-                "description": "valid JSON-pointer (escaped with fraction part) #1",
-                "data": "/~1.1",
-                "valid": true
-            },
-            {
-                "description": "valid JSON-pointer (escaped with fraction part) #2",
-                "data": "/~0.1",
-                "valid": true
-            },
-            {
-                "description": "not a valid JSON-pointer (URI Fragment Identifier) #1",
-                "data": "#",
-                "valid": false
-            },
-            {
-                "description": "not a valid JSON-pointer (URI Fragment Identifier) #2",
-                "data": "#/",
-                "valid": false
-            },
-            {
-                "description": "not a valid JSON-pointer (URI Fragment Identifier) #3",
-                "data": "#a",
-                "valid": false
-            },
-            {
-                "description": "not a valid JSON-pointer (some escaped, but not all) #1",
-                "data": "/~0~",
-                "valid": false
-            },
-            {
-                "description": "not a valid JSON-pointer (some escaped, but not all) #2",
-                "data": "/~0/~",
-                "valid": false
-            },
-            {
-                "description": "not a valid JSON-pointer (wrong escape character) #1",
-                "data": "/~2",
-                "valid": false
-            },
-            {
-                "description": "not a valid JSON-pointer (wrong escape character) #2",
-                "data": "/~-1",
-                "valid": false
-            },
-            {
-                "description": "not a valid JSON-pointer (multiple characters not escaped)",
-                "data": "/~~",
-                "valid": false
-            },
-            {
-                "description": "not a valid JSON-pointer (isn't empty nor starts with /) #1",
-                "data": "a",
-                "valid": false
-            },
-            {
-                "description": "not a valid JSON-pointer (isn't empty nor starts with /) #2",
-                "data": "0",
-                "valid": false
-            },
-            {
-                "description": "not a valid JSON-pointer (isn't empty nor starts with /) #3",
-                "data": "a/a",
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft2020-12/optional/format/regex.json b/json/tests/draft2020-12/optional/format/regex.json
deleted file mode 100644
index a036c6d..0000000
--- a/json/tests/draft2020-12/optional/format/regex.json
+++ /dev/null
@@ -1,51 +0,0 @@
-[
-    {
-        "description": "validation of regular expressions",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "format": "regex"
-        },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            },
-            {
-                "description": "a valid regular expression",
-                "data": "([abc])+\\s+$",
-                "valid": true
-            },
-            {
-                "description": "a regular expression with unclosed parens is invalid",
-                "data": "^(abc]",
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft2020-12/optional/format/relative-json-pointer.json b/json/tests/draft2020-12/optional/format/relative-json-pointer.json
deleted file mode 100644
index 3eaf9ce..0000000
--- a/json/tests/draft2020-12/optional/format/relative-json-pointer.json
+++ /dev/null
@@ -1,101 +0,0 @@
-[
-    {
-        "description": "validation of Relative JSON Pointers (RJP)",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "format": "relative-json-pointer"
-        },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            },
-            {
-                "description": "a valid upwards RJP",
-                "data": "1",
-                "valid": true
-            },
-            {
-                "description": "a valid downwards RJP",
-                "data": "0/foo/bar",
-                "valid": true
-            },
-            {
-                "description": "a valid up and then down RJP, with array index",
-                "data": "2/0/baz/1/zip",
-                "valid": true
-            },
-            {
-                "description": "a valid RJP taking the member or index name",
-                "data": "0#",
-                "valid": true
-            },
-            {
-                "description": "an invalid RJP that is a valid JSON Pointer",
-                "data": "/foo/bar",
-                "valid": false
-            },
-            {
-                "description": "negative prefix",
-                "data": "-1/foo/bar",
-                "valid": false
-            },
-            {
-                "description": "explicit positive prefix",
-                "data": "+1/foo/bar",
-                "valid": false
-            },
-            {
-                "description": "## is not a valid json-pointer",
-                "data": "0##",
-                "valid": false
-            },
-            {
-                "description": "zero cannot be followed by other digits, plus json-pointer",
-                "data": "01/a",
-                "valid": false
-            },
-            {
-                "description": "zero cannot be followed by other digits, plus octothorpe",
-                "data": "01#",
-                "valid": false
-            },
-            {
-                "description": "empty string",
-                "data": "",
-                "valid": false
-            },
-            {
-                "description": "multi-digit integer prefix",
-                "data": "120/foo/bar",
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft2020-12/optional/format/time.json b/json/tests/draft2020-12/optional/format/time.json
deleted file mode 100644
index ae31d2c..0000000
--- a/json/tests/draft2020-12/optional/format/time.json
+++ /dev/null
@@ -1,216 +0,0 @@
-[
-    {
-        "description": "validation of time strings",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "format": "time"
-        },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            },
-            {
-                "description": "a valid time string",
-                "data": "08:30:06Z",
-                "valid": true
-            },
-            {
-                "description": "a valid time string with leap second, Zulu",
-                "data": "23:59:60Z",
-                "valid": true
-            },
-            {
-                "description": "invalid leap second, Zulu (wrong hour)",
-                "data": "22:59:60Z",
-                "valid": false
-            },
-            {
-                "description": "invalid leap second, Zulu (wrong minute)",
-                "data": "23:58:60Z",
-                "valid": false
-            },
-            {
-                "description": "valid leap second, zero time-offset",
-                "data": "23:59:60+00:00",
-                "valid": true
-            },
-            {
-                "description": "invalid leap second, zero time-offset (wrong hour)",
-                "data": "22:59:60+00:00",
-                "valid": false
-            },
-            {
-                "description": "invalid leap second, zero time-offset (wrong minute)",
-                "data": "23:58:60+00:00",
-                "valid": false
-            },
-            {
-                "description": "valid leap second, positive time-offset",
-                "data": "01:29:60+01:30",
-                "valid": true
-            },
-            {
-                "description": "valid leap second, large positive time-offset",
-                "data": "23:29:60+23:30",
-                "valid": true
-            },
-            {
-                "description": "invalid leap second, positive time-offset (wrong hour)",
-                "data": "23:59:60+01:00",
-                "valid": false
-            },
-            {
-                "description": "invalid leap second, positive time-offset (wrong minute)",
-                "data": "23:59:60+00:30",
-                "valid": false
-            },
-            {
-                "description": "valid leap second, negative time-offset",
-                "data": "15:59:60-08:00",
-                "valid": true
-            },
-            {
-                "description": "valid leap second, large negative time-offset",
-                "data": "00:29:60-23:30",
-                "valid": true
-            },
-            {
-                "description": "invalid leap second, negative time-offset (wrong hour)",
-                "data": "23:59:60-01:00",
-                "valid": false
-            },
-            {
-                "description": "invalid leap second, negative time-offset (wrong minute)",
-                "data": "23:59:60-00:30",
-                "valid": false
-            },
-            {
-                "description": "a valid time string with second fraction",
-                "data": "23:20:50.52Z",
-                "valid": true
-            },
-            {
-                "description": "a valid time string with precise second fraction",
-                "data": "08:30:06.283185Z",
-                "valid": true
-            },
-            {
-                "description": "a valid time string with plus offset",
-                "data": "08:30:06+00:20",
-                "valid": true
-            },
-            {
-                "description": "a valid time string with minus offset",
-                "data": "08:30:06-08:00",
-                "valid": true
-            },
-            {
-                "description": "a valid time string with case-insensitive Z",
-                "data": "08:30:06z",
-                "valid": true
-            },
-            {
-                "description": "an invalid time string with invalid hour",
-                "data": "24:00:00Z",
-                "valid": false
-            },
-            {
-                "description": "an invalid time string with invalid minute",
-                "data": "00:60:00Z",
-                "valid": false
-            },
-            {
-                "description": "an invalid time string with invalid second",
-                "data": "00:00:61Z",
-                "valid": false
-            },
-            {
-                "description": "an invalid time string with invalid leap second (wrong hour)",
-                "data": "22:59:60Z",
-                "valid": false
-            },
-            {
-                "description": "an invalid time string with invalid leap second (wrong minute)",
-                "data": "23:58:60Z",
-                "valid": false
-            },
-            {
-                "description": "an invalid time string with invalid time numoffset hour",
-                "data": "01:02:03+24:00",
-                "valid": false
-            },
-            {
-                "description": "an invalid time string with invalid time numoffset minute",
-                "data": "01:02:03+00:60",
-                "valid": false
-            },
-            {
-                "description": "an invalid time string with invalid time with both Z and numoffset",
-                "data": "01:02:03Z+00:30",
-                "valid": false
-            },
-            {
-                "description": "an invalid offset indicator",
-                "data": "08:30:06 PST",
-                "valid": false
-            },
-            {
-                "description": "only RFC3339 not all of ISO 8601 are valid",
-                "data": "01:01:01,1111",
-                "valid": false
-            },
-            {
-                "description": "no time offset",
-                "data": "12:00:00",
-                "valid": false
-            },
-            {
-                "description": "no time offset with second fraction",
-                "data": "12:00:00.52",
-                "valid": false
-            },
-            {
-                "description": "invalid non-ASCII '২' (a Bengali 2)",
-                "data": "1২:00:00Z",
-                "valid": false
-            },
-            {
-                "description": "offset not starting with plus or minus",
-                "data": "08:30:06#00:20",
-                "valid": false
-            },
-            {
-                "description": "contains letters",
-                "data": "ab:cd:ef",
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft2020-12/optional/format/unknown.json b/json/tests/draft2020-12/optional/format/unknown.json
deleted file mode 100644
index 7fc35f5..0000000
--- a/json/tests/draft2020-12/optional/format/unknown.json
+++ /dev/null
@@ -1,46 +0,0 @@
-[
-    {
-        "description": "unknown format",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "format": "unknown"
-        },
-        "tests": [
-            {
-                "description": "unknown formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "unknown formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "unknown formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "unknown formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "unknown formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "unknown formats ignore nulls",
-                "data": null,
-                "valid": true
-            },
-            {
-                "description": "unknown formats ignore strings",
-                "data": "string",
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft2020-12/optional/format/uri-reference.json b/json/tests/draft2020-12/optional/format/uri-reference.json
deleted file mode 100644
index 46f28e6..0000000
--- a/json/tests/draft2020-12/optional/format/uri-reference.json
+++ /dev/null
@@ -1,76 +0,0 @@
-[
-    {
-        "description": "validation of URI References",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "format": "uri-reference"
-        },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            },
-            {
-                "description": "a valid URI",
-                "data": "http://foo.bar/?baz=qux#quux",
-                "valid": true
-            },
-            {
-                "description": "a valid protocol-relative URI Reference",
-                "data": "//foo.bar/?baz=qux#quux",
-                "valid": true
-            },
-            {
-                "description": "a valid relative URI Reference",
-                "data": "/abc",
-                "valid": true
-            },
-            {
-                "description": "an invalid URI Reference",
-                "data": "\\\\WINDOWS\\fileshare",
-                "valid": false
-            },
-            {
-                "description": "a valid URI Reference",
-                "data": "abc",
-                "valid": true
-            },
-            {
-                "description": "a valid URI fragment",
-                "data": "#fragment",
-                "valid": true
-            },
-            {
-                "description": "an invalid URI fragment",
-                "data": "#frag\\ment",
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft2020-12/optional/format/uri-template.json b/json/tests/draft2020-12/optional/format/uri-template.json
deleted file mode 100644
index 08aab82..0000000
--- a/json/tests/draft2020-12/optional/format/uri-template.json
+++ /dev/null
@@ -1,61 +0,0 @@
-[
-    {
-        "description": "format: uri-template",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "format": "uri-template"
-        },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            },
-            {
-                "description": "a valid uri-template",
-                "data": "http://example.com/dictionary/{term:1}/{term}",
-                "valid": true
-            },
-            {
-                "description": "an invalid uri-template",
-                "data": "http://example.com/dictionary/{term:1}/{term",
-                "valid": false
-            },
-            {
-                "description": "a valid uri-template without variables",
-                "data": "http://example.com/dictionary",
-                "valid": true
-            },
-            {
-                "description": "a valid relative uri-template",
-                "data": "dictionary/{term:1}/{term}",
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft2020-12/optional/format/uri.json b/json/tests/draft2020-12/optional/format/uri.json
deleted file mode 100644
index 84b5f15..0000000
--- a/json/tests/draft2020-12/optional/format/uri.json
+++ /dev/null
@@ -1,141 +0,0 @@
-[
-    {
-        "description": "validation of URIs",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "format": "uri"
-        },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            },
-            {
-                "description": "a valid URL with anchor tag",
-                "data": "http://foo.bar/?baz=qux#quux",
-                "valid": true
-            },
-            {
-                "description": "a valid URL with anchor tag and parentheses",
-                "data": "http://foo.com/blah_(wikipedia)_blah#cite-1",
-                "valid": true
-            },
-            {
-                "description": "a valid URL with URL-encoded stuff",
-                "data": "http://foo.bar/?q=Test%20URL-encoded%20stuff",
-                "valid": true
-            },
-            {
-                "description": "a valid puny-coded URL ",
-                "data": "http://xn--nw2a.xn--j6w193g/",
-                "valid": true
-            },
-            {
-                "description": "a valid URL with many special characters",
-                "data": "http://-.~_!$&'()*+,;=:%40:80%2f::::::@example.com",
-                "valid": true
-            },
-            {
-                "description": "a valid URL based on IPv4",
-                "data": "http://223.255.255.254",
-                "valid": true
-            },
-            {
-                "description": "a valid URL with ftp scheme",
-                "data": "ftp://ftp.is.co.za/rfc/rfc1808.txt",
-                "valid": true
-            },
-            {
-                "description": "a valid URL for a simple text file",
-                "data": "http://www.ietf.org/rfc/rfc2396.txt",
-                "valid": true
-            },
-            {
-                "description": "a valid URL ",
-                "data": "ldap://[2001:db8::7]/c=GB?objectClass?one",
-                "valid": true
-            },
-            {
-                "description": "a valid mailto URI",
-                "data": "mailto:John.Doe@example.com",
-                "valid": true
-            },
-            {
-                "description": "a valid newsgroup URI",
-                "data": "news:comp.infosystems.www.servers.unix",
-                "valid": true
-            },
-            {
-                "description": "a valid tel URI",
-                "data": "tel:+1-816-555-1212",
-                "valid": true
-            },
-            {
-                "description": "a valid URN",
-                "data": "urn:oasis:names:specification:docbook:dtd:xml:4.1.2",
-                "valid": true
-            },
-            {
-                "description": "an invalid protocol-relative URI Reference",
-                "data": "//foo.bar/?baz=qux#quux",
-                "valid": false
-            },
-            {
-                "description": "an invalid relative URI Reference",
-                "data": "/abc",
-                "valid": false
-            },
-            {
-                "description": "an invalid URI",
-                "data": "\\\\WINDOWS\\fileshare",
-                "valid": false
-            },
-            {
-                "description": "an invalid URI though valid URI reference",
-                "data": "abc",
-                "valid": false
-            },
-            {
-                "description": "an invalid URI with spaces",
-                "data": "http:// shouldfail.com",
-                "valid": false
-            },
-            {
-                "description": "an invalid URI with spaces and missing scheme",
-                "data": ":// should fail",
-                "valid": false
-            },
-            {
-                "description": "an invalid URI with comma in scheme",
-                "data": "bar,baz:foo",
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft2020-12/optional/format/uuid.json b/json/tests/draft2020-12/optional/format/uuid.json
deleted file mode 100644
index d152643..0000000
--- a/json/tests/draft2020-12/optional/format/uuid.json
+++ /dev/null
@@ -1,116 +0,0 @@
-[
-    {
-        "description": "uuid format",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "format": "uuid"
-        },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            },
-            {
-                "description": "all upper-case",
-                "data": "2EB8AA08-AA98-11EA-B4AA-73B441D16380",
-                "valid": true
-            },
-            {
-                "description": "all lower-case",
-                "data": "2eb8aa08-aa98-11ea-b4aa-73b441d16380",
-                "valid": true
-            },
-            {
-                "description": "mixed case",
-                "data": "2eb8aa08-AA98-11ea-B4Aa-73B441D16380",
-                "valid": true
-            },
-            {
-                "description": "all zeroes is valid",
-                "data": "00000000-0000-0000-0000-000000000000",
-                "valid": true
-            },
-            {
-                "description": "wrong length",
-                "data": "2eb8aa08-aa98-11ea-b4aa-73b441d1638",
-                "valid": false
-            },
-            {
-                "description": "missing section",
-                "data": "2eb8aa08-aa98-11ea-73b441d16380",
-                "valid": false
-            },
-            {
-                "description": "bad characters (not hex)",
-                "data": "2eb8aa08-aa98-11ea-b4ga-73b441d16380",
-                "valid": false
-            },
-            {
-                "description": "no dashes",
-                "data": "2eb8aa08aa9811eab4aa73b441d16380",
-                "valid": false
-            },
-            {
-                "description": "too few dashes",
-                "data": "2eb8aa08aa98-11ea-b4aa73b441d16380",
-                "valid": false
-            },
-            {
-                "description": "too many dashes",
-                "data": "2eb8-aa08-aa98-11ea-b4aa73b44-1d16380",
-                "valid": false
-            },
-            {
-                "description": "dashes in the wrong spot",
-                "data": "2eb8aa08aa9811eab4aa73b441d16380----",
-                "valid": false
-            },
-            {
-                "description": "valid version 4",
-                "data": "98d80576-482e-427f-8434-7f86890ab222",
-                "valid": true
-            },
-            {
-                "description": "valid version 5",
-                "data": "99c17cbb-656f-564a-940f-1a4568f03487",
-                "valid": true
-            },
-            {
-                "description": "hypothetical version 6",
-                "data": "99c17cbb-656f-664a-940f-1a4568f03487",
-                "valid": true
-            },
-            {
-                "description": "hypothetical version 15",
-                "data": "99c17cbb-656f-f64a-940f-1a4568f03487",
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft2020-12/optional/no-schema.json b/json/tests/draft2020-12/optional/no-schema.json
deleted file mode 100644
index 676e6b5..0000000
--- a/json/tests/draft2020-12/optional/no-schema.json
+++ /dev/null
@@ -1,26 +0,0 @@
-[
-    {
-        "description": "validation without $schema",
-        "comment": "minLength is the same across all drafts",
-        "schema": {
-            "minLength": 2
-        },
-        "tests": [
-            {
-                "description": "a 3-character string is valid",
-                "data": "foo",
-                "valid": true
-            },
-            {
-                "description": "a 1-character string is not valid",
-                "data": "a",
-                "valid": false
-            },
-            {
-                "description": "a non-string is valid",
-                "data": 5,
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft2020-12/optional/non-bmp-regex.json b/json/tests/draft2020-12/optional/non-bmp-regex.json
deleted file mode 100644
index d2efb3e..0000000
--- a/json/tests/draft2020-12/optional/non-bmp-regex.json
+++ /dev/null
@@ -1,86 +0,0 @@
-[
-    {
-        "description": "Proper UTF-16 surrogate pair handling: pattern",
-        "comment": "Optional because .Net doesn't correctly handle 32-bit Unicode characters",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "pattern": "^🐲*$"
-        },
-        "tests": [
-            {
-                "description": "matches empty",
-                "data": "",
-                "valid": true
-            },
-            {
-                "description": "matches single",
-                "data": "🐲",
-                "valid": true
-            },
-            {
-                "description": "matches two",
-                "data": "🐲🐲",
-                "valid": true
-            },
-            {
-                "description": "doesn't match one",
-                "data": "🐉",
-                "valid": false
-            },
-            {
-                "description": "doesn't match two",
-                "data": "🐉🐉",
-                "valid": false
-            },
-            {
-                "description": "doesn't match one ASCII",
-                "data": "D",
-                "valid": false
-            },
-            {
-                "description": "doesn't match two ASCII",
-                "data": "DD",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "Proper UTF-16 surrogate pair handling: patternProperties",
-        "comment": "Optional because .Net doesn't correctly handle 32-bit Unicode characters",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "patternProperties": {
-                "^🐲*$": {
-                    "type": "integer"
-                }
-            }
-        },
-        "tests": [
-            {
-                "description": "matches empty",
-                "data": { "": 1 },
-                "valid": true
-            },
-            {
-                "description": "matches single",
-                "data": { "🐲": 1 },
-                "valid": true
-            },
-            {
-                "description": "matches two",
-                "data": { "🐲🐲": 1 },
-                "valid": true
-            },
-            {
-                "description": "doesn't match one",
-                "data": { "🐲": "hello" },
-                "valid": false
-            },
-            {
-                "description": "doesn't match two",
-                "data": { "🐲🐲": "hello" },
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft2020-12/optional/refOfUnknownKeyword.json b/json/tests/draft2020-12/optional/refOfUnknownKeyword.json
deleted file mode 100644
index f91c188..0000000
--- a/json/tests/draft2020-12/optional/refOfUnknownKeyword.json
+++ /dev/null
@@ -1,46 +0,0 @@
-[
-    {
-        "description": "reference of a root arbitrary keyword ",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "unknown-keyword": {"type": "integer"},
-            "properties": {
-                "bar": {"$ref": "#/unknown-keyword"}
-            }
-        },
-        "tests": [
-            {
-                "description": "match",
-                "data": {"bar": 3},
-                "valid": true
-            },
-            {
-                "description": "mismatch",
-                "data": {"bar": true},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "reference of an arbitrary keyword of a sub-schema",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "properties": {
-                "foo": {"unknown-keyword": {"type": "integer"}},
-                "bar": {"$ref": "#/properties/foo/unknown-keyword"}
-            }
-        },
-        "tests": [
-            {
-                "description": "match",
-                "data": {"bar": 3},
-                "valid": true
-            },
-            {
-                "description": "mismatch",
-                "data": {"bar": true},
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft2020-12/pattern.json b/json/tests/draft2020-12/pattern.json
deleted file mode 100644
index af0b8d8..0000000
--- a/json/tests/draft2020-12/pattern.json
+++ /dev/null
@@ -1,65 +0,0 @@
-[
-    {
-        "description": "pattern validation",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "pattern": "^a*$"
-        },
-        "tests": [
-            {
-                "description": "a matching pattern is valid",
-                "data": "aaa",
-                "valid": true
-            },
-            {
-                "description": "a non-matching pattern is invalid",
-                "data": "abc",
-                "valid": false
-            },
-            {
-                "description": "ignores booleans",
-                "data": true,
-                "valid": true
-            },
-            {
-                "description": "ignores integers",
-                "data": 123,
-                "valid": true
-            },
-            {
-                "description": "ignores floats",
-                "data": 1.0,
-                "valid": true
-            },
-            {
-                "description": "ignores objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "ignores arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "ignores null",
-                "data": null,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "pattern is not anchored",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "pattern": "a+"
-        },
-        "tests": [
-            {
-                "description": "matches a substring",
-                "data": "xxaayy",
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft2020-12/patternProperties.json b/json/tests/draft2020-12/patternProperties.json
deleted file mode 100644
index 81829c7..0000000
--- a/json/tests/draft2020-12/patternProperties.json
+++ /dev/null
@@ -1,176 +0,0 @@
-[
-    {
-        "description":
-            "patternProperties validates properties matching a regex",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "patternProperties": {
-                "f.*o": {"type": "integer"}
-            }
-        },
-        "tests": [
-            {
-                "description": "a single valid match is valid",
-                "data": {"foo": 1},
-                "valid": true
-            },
-            {
-                "description": "multiple valid matches is valid",
-                "data": {"foo": 1, "foooooo" : 2},
-                "valid": true
-            },
-            {
-                "description": "a single invalid match is invalid",
-                "data": {"foo": "bar", "fooooo": 2},
-                "valid": false
-            },
-            {
-                "description": "multiple invalid matches is invalid",
-                "data": {"foo": "bar", "foooooo" : "baz"},
-                "valid": false
-            },
-            {
-                "description": "ignores arrays",
-                "data": ["foo"],
-                "valid": true
-            },
-            {
-                "description": "ignores strings",
-                "data": "foo",
-                "valid": true
-            },
-            {
-                "description": "ignores other non-objects",
-                "data": 12,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "multiple simultaneous patternProperties are validated",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "patternProperties": {
-                "a*": {"type": "integer"},
-                "aaa*": {"maximum": 20}
-            }
-        },
-        "tests": [
-            {
-                "description": "a single valid match is valid",
-                "data": {"a": 21},
-                "valid": true
-            },
-            {
-                "description": "a simultaneous match is valid",
-                "data": {"aaaa": 18},
-                "valid": true
-            },
-            {
-                "description": "multiple matches is valid",
-                "data": {"a": 21, "aaaa": 18},
-                "valid": true
-            },
-            {
-                "description": "an invalid due to one is invalid",
-                "data": {"a": "bar"},
-                "valid": false
-            },
-            {
-                "description": "an invalid due to the other is invalid",
-                "data": {"aaaa": 31},
-                "valid": false
-            },
-            {
-                "description": "an invalid due to both is invalid",
-                "data": {"aaa": "foo", "aaaa": 31},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "regexes are not anchored by default and are case sensitive",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "patternProperties": {
-                "[0-9]{2,}": { "type": "boolean" },
-                "X_": { "type": "string" }
-            }
-        },
-        "tests": [
-            {
-                "description": "non recognized members are ignored",
-                "data": { "answer 1": "42" },
-                "valid": true
-            },
-            {
-                "description": "recognized members are accounted for",
-                "data": { "a31b": null },
-                "valid": false
-            },
-            {
-                "description": "regexes are case sensitive",
-                "data": { "a_x_3": 3 },
-                "valid": true
-            },
-            {
-                "description": "regexes are case sensitive, 2",
-                "data": { "a_X_3": 3 },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "patternProperties with boolean schemas",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "patternProperties": {
-                "f.*": true,
-                "b.*": false
-            }
-        },
-        "tests": [
-            {
-                "description": "object with property matching schema true is valid",
-                "data": {"foo": 1},
-                "valid": true
-            },
-            {
-                "description": "object with property matching schema false is invalid",
-                "data": {"bar": 2},
-                "valid": false
-            },
-            {
-                "description": "object with both properties is invalid",
-                "data": {"foo": 1, "bar": 2},
-                "valid": false
-            },
-            {
-                "description": "object with a property matching both true and false is invalid",
-                "data": {"foobar":1},
-                "valid": false
-            },
-            {
-                "description": "empty object is valid",
-                "data": {},
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "patternProperties with null valued instance properties",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "patternProperties": {
-                "^.*bar$": {"type": "null"}
-            }
-        },
-        "tests": [
-            {
-                "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
deleted file mode 100644
index 0adfc06..0000000
--- a/json/tests/draft2020-12/prefixItems.json
+++ /dev/null
@@ -1,104 +0,0 @@
-[
-    {
-        "description": "a schema given for prefixItems",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "prefixItems": [
-                {"type": "integer"},
-                {"type": "string"}
-            ]
-        },
-        "tests": [
-            {
-                "description": "correct types",
-                "data": [ 1, "foo" ],
-                "valid": true
-            },
-            {
-                "description": "wrong types",
-                "data": [ "foo", 1 ],
-                "valid": false
-            },
-            {
-                "description": "incomplete array of items",
-                "data": [ 1 ],
-                "valid": true
-            },
-            {
-                "description": "array with additional items",
-                "data": [ 1, "foo", true ],
-                "valid": true
-            },
-            {
-                "description": "empty array",
-                "data": [ ],
-                "valid": true
-            },
-            {
-                "description": "JavaScript pseudo-array is valid",
-                "data": {
-                    "0": "invalid",
-                    "1": "valid",
-                    "length": 2
-                },
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "prefixItems with boolean schemas",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "prefixItems": [true, false]
-        },
-        "tests": [
-            {
-                "description": "array with one item is valid",
-                "data": [ 1 ],
-                "valid": true
-            },
-            {
-                "description": "array with two items is invalid",
-                "data": [ 1, "foo" ],
-                "valid": false
-            },
-            {
-                "description": "empty array is valid",
-                "data": [],
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "additional items are allowed by default",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "prefixItems": [{"type": "integer"}]
-        },
-        "tests": [
-            {
-                "description": "only the first item is validated",
-                "data": [1, "foo", false],
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "prefixItems with null instance elements",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "prefixItems": [
-                {
-                    "type": "null"
-                }
-            ]
-        },
-        "tests": [
-            {
-                "description": "allows null elements",
-                "data": [ null ],
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft2020-12/properties.json b/json/tests/draft2020-12/properties.json
deleted file mode 100644
index eb66fa8..0000000
--- a/json/tests/draft2020-12/properties.json
+++ /dev/null
@@ -1,242 +0,0 @@
-[
-    {
-        "description": "object properties validation",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "properties": {
-                "foo": {"type": "integer"},
-                "bar": {"type": "string"}
-            }
-        },
-        "tests": [
-            {
-                "description": "both properties present and valid is valid",
-                "data": {"foo": 1, "bar": "baz"},
-                "valid": true
-            },
-            {
-                "description": "one property invalid is invalid",
-                "data": {"foo": 1, "bar": {}},
-                "valid": false
-            },
-            {
-                "description": "both properties invalid is invalid",
-                "data": {"foo": [], "bar": {}},
-                "valid": false
-            },
-            {
-                "description": "doesn't invalidate other properties",
-                "data": {"quux": []},
-                "valid": true
-            },
-            {
-                "description": "ignores arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "ignores other non-objects",
-                "data": 12,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description":
-            "properties, patternProperties, additionalProperties interaction",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "properties": {
-                "foo": {"type": "array", "maxItems": 3},
-                "bar": {"type": "array"}
-            },
-            "patternProperties": {"f.o": {"minItems": 2}},
-            "additionalProperties": {"type": "integer"}
-        },
-        "tests": [
-            {
-                "description": "property validates property",
-                "data": {"foo": [1, 2]},
-                "valid": true
-            },
-            {
-                "description": "property invalidates property",
-                "data": {"foo": [1, 2, 3, 4]},
-                "valid": false
-            },
-            {
-                "description": "patternProperty invalidates property",
-                "data": {"foo": []},
-                "valid": false
-            },
-            {
-                "description": "patternProperty validates nonproperty",
-                "data": {"fxo": [1, 2]},
-                "valid": true
-            },
-            {
-                "description": "patternProperty invalidates nonproperty",
-                "data": {"fxo": []},
-                "valid": false
-            },
-            {
-                "description": "additionalProperty ignores property",
-                "data": {"bar": []},
-                "valid": true
-            },
-            {
-                "description": "additionalProperty validates others",
-                "data": {"quux": 3},
-                "valid": true
-            },
-            {
-                "description": "additionalProperty invalidates others",
-                "data": {"quux": "foo"},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "properties with boolean schema",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "properties": {
-                "foo": true,
-                "bar": false
-            }
-        },
-        "tests": [
-            {
-                "description": "no property present is valid",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "only 'true' property present is valid",
-                "data": {"foo": 1},
-                "valid": true
-            },
-            {
-                "description": "only 'false' property present is invalid",
-                "data": {"bar": 2},
-                "valid": false
-            },
-            {
-                "description": "both properties present is invalid",
-                "data": {"foo": 1, "bar": 2},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "properties with escaped characters",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "properties": {
-                "foo\nbar": {"type": "number"},
-                "foo\"bar": {"type": "number"},
-                "foo\\bar": {"type": "number"},
-                "foo\rbar": {"type": "number"},
-                "foo\tbar": {"type": "number"},
-                "foo\fbar": {"type": "number"}
-            }
-        },
-        "tests": [
-            {
-                "description": "object with all numbers is valid",
-                "data": {
-                    "foo\nbar": 1,
-                    "foo\"bar": 1,
-                    "foo\\bar": 1,
-                    "foo\rbar": 1,
-                    "foo\tbar": 1,
-                    "foo\fbar": 1
-                },
-                "valid": true
-            },
-            {
-                "description": "object with strings is invalid",
-                "data": {
-                    "foo\nbar": "1",
-                    "foo\"bar": "1",
-                    "foo\\bar": "1",
-                    "foo\rbar": "1",
-                    "foo\tbar": "1",
-                    "foo\fbar": "1"
-                },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "properties with null valued instance properties",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "properties": {
-                "foo": {"type": "null"}
-            }
-        },
-        "tests": [
-            {
-                "description": "allows null values",
-                "data": {"foo": null},
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "properties whose names are Javascript object property names",
-        "comment": "Ensure JS implementations don't universally consider e.g. __proto__ to always be present in an object.",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "properties": {
-                "__proto__": {"type": "number"},
-                "toString": {
-                    "properties": { "length": { "type": "string" } }
-                },
-                "constructor": {"type": "number"}
-            }
-        },
-        "tests": [
-            {
-                "description": "ignores arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "ignores other non-objects",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "none of the properties mentioned",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "__proto__ not valid",
-                "data": { "__proto__": "foo" },
-                "valid": false
-            },
-            {
-                "description": "toString not valid",
-                "data": { "toString": { "length": 37 } },
-                "valid": false
-            },
-            {
-                "description": "constructor not valid",
-                "data": { "constructor": { "length": 37 } },
-                "valid": false
-            },
-            {
-                "description": "all present and valid",
-                "data": { 
-                    "__proto__": 12,
-                    "toString": { "length": "foo" },
-                    "constructor": 37
-                },
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft2020-12/propertyNames.json b/json/tests/draft2020-12/propertyNames.json
deleted file mode 100644
index 7ecfb7e..0000000
--- a/json/tests/draft2020-12/propertyNames.json
+++ /dev/null
@@ -1,85 +0,0 @@
-[
-    {
-        "description": "propertyNames validation",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "propertyNames": {"maxLength": 3}
-        },
-        "tests": [
-            {
-                "description": "all property names valid",
-                "data": {
-                    "f": {},
-                    "foo": {}
-                },
-                "valid": true
-            },
-            {
-                "description": "some property names invalid",
-                "data": {
-                    "foo": {},
-                    "foobar": {}
-                },
-                "valid": false
-            },
-            {
-                "description": "object without properties is valid",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "ignores arrays",
-                "data": [1, 2, 3, 4],
-                "valid": true
-            },
-            {
-                "description": "ignores strings",
-                "data": "foobar",
-                "valid": true
-            },
-            {
-                "description": "ignores other non-objects",
-                "data": 12,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "propertyNames with boolean schema true",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "propertyNames": true
-        },
-        "tests": [
-            {
-                "description": "object with any properties is valid",
-                "data": {"foo": 1},
-                "valid": true
-            },
-            {
-                "description": "empty object is valid",
-                "data": {},
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "propertyNames with boolean schema false",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "propertyNames": false
-        },
-        "tests": [
-            {
-                "description": "object with any properties is invalid",
-                "data": {"foo": 1},
-                "valid": false
-            },
-            {
-                "description": "empty object is valid",
-                "data": {},
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft2020-12/ref.json b/json/tests/draft2020-12/ref.json
deleted file mode 100644
index 45803df..0000000
--- a/json/tests/draft2020-12/ref.json
+++ /dev/null
@@ -1,887 +0,0 @@
-[
-    {
-        "description": "root pointer ref",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "properties": {
-                "foo": {"$ref": "#"}
-            },
-            "additionalProperties": false
-        },
-        "tests": [
-            {
-                "description": "match",
-                "data": {"foo": false},
-                "valid": true
-            },
-            {
-                "description": "recursive match",
-                "data": {"foo": {"foo": false}},
-                "valid": true
-            },
-            {
-                "description": "mismatch",
-                "data": {"bar": false},
-                "valid": false
-            },
-            {
-                "description": "recursive mismatch",
-                "data": {"foo": {"bar": false}},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "relative pointer ref to object",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "properties": {
-                "foo": {"type": "integer"},
-                "bar": {"$ref": "#/properties/foo"}
-            }
-        },
-        "tests": [
-            {
-                "description": "match",
-                "data": {"bar": 3},
-                "valid": true
-            },
-            {
-                "description": "mismatch",
-                "data": {"bar": true},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "relative pointer ref to array",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "prefixItems": [
-                {"type": "integer"},
-                {"$ref": "#/prefixItems/0"}
-            ]
-        },
-        "tests": [
-            {
-                "description": "match array",
-                "data": [1, 2],
-                "valid": true
-            },
-            {
-                "description": "mismatch array",
-                "data": [1, "foo"],
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "escaped pointer ref",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "$defs": {
-                "tilde~field": {"type": "integer"},
-                "slash/field": {"type": "integer"},
-                "percent%field": {"type": "integer"}
-            },
-            "properties": {
-                "tilde": {"$ref": "#/$defs/tilde~0field"},
-                "slash": {"$ref": "#/$defs/slash~1field"},
-                "percent": {"$ref": "#/$defs/percent%25field"}
-            }
-        },
-        "tests": [
-            {
-                "description": "slash invalid",
-                "data": {"slash": "aoeu"},
-                "valid": false
-            },
-            {
-                "description": "tilde invalid",
-                "data": {"tilde": "aoeu"},
-                "valid": false
-            },
-            {
-                "description": "percent invalid",
-                "data": {"percent": "aoeu"},
-                "valid": false
-            },
-            {
-                "description": "slash valid",
-                "data": {"slash": 123},
-                "valid": true
-            },
-            {
-                "description": "tilde valid",
-                "data": {"tilde": 123},
-                "valid": true
-            },
-            {
-                "description": "percent valid",
-                "data": {"percent": 123},
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "nested refs",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "$defs": {
-                "a": {"type": "integer"},
-                "b": {"$ref": "#/$defs/a"},
-                "c": {"$ref": "#/$defs/b"}
-            },
-            "$ref": "#/$defs/c"
-        },
-        "tests": [
-            {
-                "description": "nested ref valid",
-                "data": 5,
-                "valid": true
-            },
-            {
-                "description": "nested ref invalid",
-                "data": "a",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "ref applies alongside sibling keywords",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "$defs": {
-                "reffed": {
-                    "type": "array"
-                }
-            },
-            "properties": {
-                "foo": {
-                    "$ref": "#/$defs/reffed",
-                    "maxItems": 2
-                }
-            }
-        },
-        "tests": [
-            {
-                "description": "ref valid, maxItems valid",
-                "data": { "foo": [] },
-                "valid": true
-            },
-            {
-                "description": "ref valid, maxItems invalid",
-                "data": { "foo": [1, 2, 3] },
-                "valid": false
-            },
-            {
-                "description": "ref invalid",
-                "data": { "foo": "string" },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "remote ref, containing refs itself",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "$ref": "https://json-schema.org/draft/2020-12/schema"
-        },
-        "tests": [
-            {
-                "description": "remote ref valid",
-                "data": {"minLength": 1},
-                "valid": true
-            },
-            {
-                "description": "remote ref invalid",
-                "data": {"minLength": -1},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "property named $ref that is not a reference",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "properties": {
-                "$ref": {"type": "string"}
-            }
-        },
-        "tests": [
-            {
-                "description": "property named $ref valid",
-                "data": {"$ref": "a"},
-                "valid": true
-            },
-            {
-                "description": "property named $ref invalid",
-                "data": {"$ref": 2},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "property named $ref, containing an actual $ref",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "properties": {
-                "$ref": {"$ref": "#/$defs/is-string"}
-            },
-            "$defs": {
-                "is-string": {
-                    "type": "string"
-                }
-            }
-        },
-        "tests": [
-            {
-                "description": "property named $ref valid",
-                "data": {"$ref": "a"},
-                "valid": true
-            },
-            {
-                "description": "property named $ref invalid",
-                "data": {"$ref": 2},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "$ref to boolean schema true",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "$ref": "#/$defs/bool",
-            "$defs": {
-                "bool": true
-            }
-        },
-        "tests": [
-            {
-                "description": "any value is valid",
-                "data": "foo",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "$ref to boolean schema false",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "$ref": "#/$defs/bool",
-            "$defs": {
-                "bool": false
-            }
-        },
-        "tests": [
-            {
-                "description": "any value is invalid",
-                "data": "foo",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "Recursive references between schemas",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "$id": "http://localhost:1234/draft2020-12/tree",
-            "description": "tree of nodes",
-            "type": "object",
-            "properties": {
-                "meta": {"type": "string"},
-                "nodes": {
-                    "type": "array",
-                    "items": {"$ref": "node"}
-                }
-            },
-            "required": ["meta", "nodes"],
-            "$defs": {
-                "node": {
-                    "$id": "http://localhost:1234/draft2020-12/node",
-                    "description": "node",
-                    "type": "object",
-                    "properties": {
-                        "value": {"type": "number"},
-                        "subtree": {"$ref": "tree"}
-                    },
-                    "required": ["value"]
-                }
-            }
-        },
-        "tests": [
-            {
-                "description": "valid tree",
-                "data": {
-                    "meta": "root",
-                    "nodes": [
-                        {
-                            "value": 1,
-                            "subtree": {
-                                "meta": "child",
-                                "nodes": [
-                                    {"value": 1.1},
-                                    {"value": 1.2}
-                                ]
-                            }
-                        },
-                        {
-                            "value": 2,
-                            "subtree": {
-                                "meta": "child",
-                                "nodes": [
-                                    {"value": 2.1},
-                                    {"value": 2.2}
-                                ]
-                            }
-                        }
-                    ]
-                },
-                "valid": true
-            },
-            {
-                "description": "invalid tree",
-                "data": {
-                    "meta": "root",
-                    "nodes": [
-                        {
-                            "value": 1,
-                            "subtree": {
-                                "meta": "child",
-                                "nodes": [
-                                    {"value": "string is invalid"},
-                                    {"value": 1.2}
-                                ]
-                            }
-                        },
-                        {
-                            "value": 2,
-                            "subtree": {
-                                "meta": "child",
-                                "nodes": [
-                                    {"value": 2.1},
-                                    {"value": 2.2}
-                                ]
-                            }
-                        }
-                    ]
-                },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "refs with quote",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "properties": {
-                "foo\"bar": {"$ref": "#/$defs/foo%22bar"}
-            },
-            "$defs": {
-                "foo\"bar": {"type": "number"}
-            }
-        },
-        "tests": [
-            {
-                "description": "object with numbers is valid",
-                "data": {
-                    "foo\"bar": 1
-                },
-                "valid": true
-            },
-            {
-                "description": "object with strings is invalid",
-                "data": {
-                    "foo\"bar": "1"
-                },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "ref creates new scope when adjacent to keywords",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "$defs": {
-                "A": {
-                    "unevaluatedProperties": false
-                }
-            },
-            "properties": {
-                "prop1": {
-                    "type": "string"
-                }
-            },
-            "$ref": "#/$defs/A"
-        },
-        "tests": [
-            {
-                "description": "referenced subschema doesn't see annotations from properties",
-                "data": {
-                    "prop1": "match"
-                },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "naive replacement of $ref with its destination is not correct",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "$defs": {
-                "a_string": { "type": "string" }
-            },
-            "enum": [
-                { "$ref": "#/$defs/a_string" }
-            ]
-        },
-        "tests": [
-            {
-                "description": "do not evaluate the $ref inside the enum, matching any string",
-                "data": "this is a string",
-                "valid": false
-            },
-            {
-                "description": "do not evaluate the $ref inside the enum, definition exact match",
-                "data": { "type": "string" },
-                "valid": false
-            },
-            {
-                "description": "match the enum exactly",
-                "data": { "$ref": "#/$defs/a_string" },
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "refs with relative uris and defs",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "$id": "http://example.com/schema-relative-uri-defs1.json",
-            "properties": {
-                "foo": {
-                    "$id": "schema-relative-uri-defs2.json",
-                    "$defs": {
-                        "inner": {
-                            "properties": {
-                                "bar": { "type": "string" }
-                            }
-                        }
-                    },
-                    "$ref": "#/$defs/inner"
-                }
-            },
-            "$ref": "schema-relative-uri-defs2.json"
-        },
-        "tests": [
-            {
-                "description": "invalid on inner field",
-                "data": {
-                    "foo": {
-                        "bar": 1
-                    },
-                    "bar": "a"
-                },
-                "valid": false
-            },
-            {
-                "description": "invalid on outer field",
-                "data": {
-                    "foo": {
-                        "bar": "a"
-                    },
-                    "bar": 1
-                },
-                "valid": false
-            },
-            {
-                "description": "valid on both fields",
-                "data": {
-                    "foo": {
-                        "bar": "a"
-                    },
-                    "bar": "a"
-                },
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "relative refs with absolute uris and defs",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "$id": "http://example.com/schema-refs-absolute-uris-defs1.json",
-            "properties": {
-                "foo": {
-                    "$id": "http://example.com/schema-refs-absolute-uris-defs2.json",
-                    "$defs": {
-                        "inner": {
-                            "properties": {
-                                "bar": { "type": "string" }
-                            }
-                        }
-                    },
-                    "$ref": "#/$defs/inner"
-                }
-            },
-            "$ref": "schema-refs-absolute-uris-defs2.json"
-        },
-        "tests": [
-            {
-                "description": "invalid on inner field",
-                "data": {
-                    "foo": {
-                        "bar": 1
-                    },
-                    "bar": "a"
-                },
-                "valid": false
-            },
-            {
-                "description": "invalid on outer field",
-                "data": {
-                    "foo": {
-                        "bar": "a"
-                    },
-                    "bar": 1
-                },
-                "valid": false
-            },
-            {
-                "description": "valid on both fields",
-                "data": {
-                    "foo": {
-                        "bar": "a"
-                    },
-                    "bar": "a"
-                },
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "$id must be resolved against nearest parent, not just immediate parent",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "$id": "http://example.com/a.json",
-            "$defs": {
-                "x": {
-                    "$id": "http://example.com/b/c.json",
-                    "not": {
-                        "$defs": {
-                            "y": {
-                                "$id": "d.json",
-                                "type": "number"
-                            }
-                        }
-                    }
-                }
-            },
-            "allOf": [
-                {
-                    "$ref": "http://example.com/b/d.json"
-                }
-            ]
-        },
-        "tests": [
-            {
-                "description": "number is valid",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "non-number is invalid",
-                "data": "a",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "order of evaluation: $id and $ref",
-        "schema": {
-            "$comment": "$id must be evaluated before $ref to get the proper $ref destination",
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "$id": "/draft2020-12/ref-and-id1/base.json",
-            "$ref": "int.json",
-            "$defs": {
-                "bigint": {
-                    "$comment": "canonical uri: /ref-and-id1/int.json",
-                    "$id": "int.json",
-                    "maximum": 10
-                },
-                "smallint": {
-                    "$comment": "canonical uri: /ref-and-id1-int.json",
-                    "$id": "/draft2020-12/ref-and-id1-int.json",
-                    "maximum": 2
-                }
-            }
-        },
-        "tests": [
-            {
-                "description": "data is valid against first definition",
-                "data": 5,
-                "valid": true
-            },
-            {
-                "description": "data is invalid against first definition",
-                "data": 50,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "order of evaluation: $id and $anchor and $ref",
-        "schema": {
-            "$comment": "$id must be evaluated before $ref to get the proper $ref destination",
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "$id": "/draft2020-12/ref-and-id2/base.json",
-            "$ref": "#bigint",
-            "$defs": {
-                "bigint": {
-                    "$comment": "canonical uri: /ref-and-id2/base.json#/$defs/bigint; another valid uri for this location: /ref-and-id2/base.json#bigint",
-                    "$anchor": "bigint",
-                    "maximum": 10
-                },
-                "smallint": {
-                    "$comment": "canonical uri: /ref-and-id2#/$defs/smallint; another valid uri for this location: /ref-and-id2/#bigint",
-                    "$id": "/draft2020-12/ref-and-id2/",
-                    "$anchor": "bigint",
-                    "maximum": 2
-                }
-            }
-        },
-        "tests": [
-            {
-                "description": "data is valid against first definition",
-                "data": 5,
-                "valid": true
-            },
-            {
-                "description": "data is invalid against first definition",
-                "data": 50,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "simple URN base URI with $ref via the URN",
-        "schema": {
-            "$comment": "URIs do not have to have HTTP(s) schemes",
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "$id": "urn:uuid:deadbeef-1234-ffff-ffff-4321feebdaed",
-            "minimum": 30,
-            "properties": {
-                "foo": {"$ref": "urn:uuid:deadbeef-1234-ffff-ffff-4321feebdaed"}
-            }
-        },
-        "tests": [
-            {
-                "description": "valid under the URN IDed schema",
-                "data": {"foo": 37},
-                "valid": true
-            },
-            {
-                "description": "invalid under the URN IDed schema",
-                "data": {"foo": 12},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "simple URN base URI with JSON pointer",
-        "schema": {
-            "$comment": "URIs do not have to have HTTP(s) schemes",
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "$id": "urn:uuid:deadbeef-1234-00ff-ff00-4321feebdaed",
-            "properties": {
-                "foo": {"$ref": "#/$defs/bar"}
-            },
-            "$defs": {
-                "bar": {"type": "string"}
-            }
-        },
-        "tests": [
-            {
-                "description": "a string is valid",
-                "data": {"foo": "bar"},
-                "valid": true
-            },
-            {
-                "description": "a non-string is invalid",
-                "data": {"foo": 12},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "URN base URI with NSS",
-        "schema": {
-            "$comment": "RFC 8141 §2.2",
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "$id": "urn:example:1/406/47452/2",
-            "properties": {
-                "foo": {"$ref": "#/$defs/bar"}
-            },
-            "$defs": {
-                "bar": {"type": "string"}
-            }
-        },
-        "tests": [
-            {
-                "description": "a string is valid",
-                "data": {"foo": "bar"},
-                "valid": true
-            },
-            {
-                "description": "a non-string is invalid",
-                "data": {"foo": 12},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "URN base URI with r-component",
-        "schema": {
-            "$comment": "RFC 8141 §2.3.1",
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "$id": "urn:example:foo-bar-baz-qux?+CCResolve:cc=uk",
-            "properties": {
-                "foo": {"$ref": "#/$defs/bar"}
-            },
-            "$defs": {
-                "bar": {"type": "string"}
-            }
-        },
-        "tests": [
-            {
-                "description": "a string is valid",
-                "data": {"foo": "bar"},
-                "valid": true
-            },
-            {
-                "description": "a non-string is invalid",
-                "data": {"foo": 12},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "URN base URI with q-component",
-        "schema": {
-            "$comment": "RFC 8141 §2.3.2",
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "$id": "urn:example:weather?=op=map&lat=39.56&lon=-104.85&datetime=1969-07-21T02:56:15Z",
-            "properties": {
-                "foo": {"$ref": "#/$defs/bar"}
-            },
-            "$defs": {
-                "bar": {"type": "string"}
-            }
-        },
-        "tests": [
-            {
-                "description": "a string is valid",
-                "data": {"foo": "bar"},
-                "valid": true
-            },
-            {
-                "description": "a non-string is invalid",
-                "data": {"foo": 12},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "URN base URI with f-component",
-        "schema": {
-            "$comment": "RFC 8141 §2.3.3, but we don't allow fragments",
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "$ref": "https://json-schema.org/draft/2020-12/schema"
-        },
-        "tests": [
-            {
-                "description": "is invalid",
-                "data": {"$id": "urn:example:foo-bar-baz-qux#somepart"},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "URN base URI with URN and JSON pointer ref",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "$id": "urn:uuid:deadbeef-1234-0000-0000-4321feebdaed",
-            "properties": {
-                "foo": {"$ref": "urn:uuid:deadbeef-1234-0000-0000-4321feebdaed#/$defs/bar"}
-            },
-            "$defs": {
-                "bar": {"type": "string"}
-            }
-        },
-        "tests": [
-            {
-                "description": "a string is valid",
-                "data": {"foo": "bar"},
-                "valid": true
-            },
-            {
-                "description": "a non-string is invalid",
-                "data": {"foo": 12},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "URN base URI with URN and anchor ref",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "$id": "urn:uuid:deadbeef-1234-ff00-00ff-4321feebdaed",
-            "properties": {
-                "foo": {"$ref": "urn:uuid:deadbeef-1234-ff00-00ff-4321feebdaed#something"}
-            },
-            "$defs": {
-                "bar": {
-                    "$anchor": "something",
-                    "type": "string"
-                }
-            }
-        },
-        "tests": [
-            {
-                "description": "a string is valid",
-                "data": {"foo": "bar"},
-                "valid": true
-            },
-            {
-                "description": "a non-string is invalid",
-                "data": {"foo": 12},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "URN ref with nested pointer ref",
-        "schema": {
-            "$ref": "urn:uuid:deadbeef-4321-ffff-ffff-1234feebdaed",
-            "$defs": {
-                "foo": {
-                    "$id": "urn:uuid:deadbeef-4321-ffff-ffff-1234feebdaed",
-                    "$defs": {"bar": {"type": "string"}},
-                    "$ref": "#/$defs/bar"
-                }
-            }
-        },
-        "tests": [
-            {
-                "description": "a string is valid",
-                "data": "bar",
-                "valid": true
-            },
-            {
-                "description": "a non-string is invalid",
-                "data": 12,
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft2020-12/refRemote.json b/json/tests/draft2020-12/refRemote.json
deleted file mode 100644
index d3cc401..0000000
--- a/json/tests/draft2020-12/refRemote.json
+++ /dev/null
@@ -1,295 +0,0 @@
-[
-    {
-        "description": "remote ref",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "$ref": "http://localhost:1234/draft2020-12/integer.json"
-        },
-        "tests": [
-            {
-                "description": "remote ref valid",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "remote ref invalid",
-                "data": "a",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "fragment within remote ref",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "$ref": "http://localhost:1234/draft2020-12/subSchemas-defs.json#/$defs/integer"
-        },
-        "tests": [
-            {
-                "description": "remote fragment valid",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "remote fragment invalid",
-                "data": "a",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "ref within remote ref",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "$ref": "http://localhost:1234/draft2020-12/subSchemas-defs.json#/$defs/refToInteger"
-        },
-        "tests": [
-            {
-                "description": "ref within ref valid",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "ref within ref invalid",
-                "data": "a",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "base URI change",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "$id": "http://localhost:1234/draft2020-12/",
-            "items": {
-                "$id": "baseUriChange/",
-                "items": {"$ref": "folderInteger.json"}
-            }
-        },
-        "tests": [
-            {
-                "description": "base URI change ref valid",
-                "data": [[1]],
-                "valid": true
-            },
-            {
-                "description": "base URI change ref invalid",
-                "data": [["a"]],
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "base URI change - change folder",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "$id": "http://localhost:1234/draft2020-12/scope_change_defs1.json",
-            "type" : "object",
-            "properties": {"list": {"$ref": "baseUriChangeFolder/"}},
-            "$defs": {
-                "baz": {
-                    "$id": "baseUriChangeFolder/",
-                    "type": "array",
-                    "items": {"$ref": "folderInteger.json"}
-                }
-            }
-        },
-        "tests": [
-            {
-                "description": "number is valid",
-                "data": {"list": [1]},
-                "valid": true
-            },
-            {
-                "description": "string is invalid",
-                "data": {"list": ["a"]},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "base URI change - change folder in subschema",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "$id": "http://localhost:1234/draft2020-12/scope_change_defs2.json",
-            "type" : "object",
-            "properties": {"list": {"$ref": "baseUriChangeFolderInSubschema/#/$defs/bar"}},
-            "$defs": {
-                "baz": {
-                    "$id": "baseUriChangeFolderInSubschema/",
-                    "$defs": {
-                        "bar": {
-                            "type": "array",
-                            "items": {"$ref": "folderInteger.json"}
-                        }
-                    }
-                }
-            }
-        },
-        "tests": [
-            {
-                "description": "number is valid",
-                "data": {"list": [1]},
-                "valid": true
-            },
-            {
-                "description": "string is invalid",
-                "data": {"list": ["a"]},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "root ref in remote ref",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "$id": "http://localhost:1234/draft2020-12/object",
-            "type": "object",
-            "properties": {
-                "name": {"$ref": "name-defs.json#/$defs/orNull"}
-            }
-        },
-        "tests": [
-            {
-                "description": "string is valid",
-                "data": {
-                    "name": "foo"
-                },
-                "valid": true
-            },
-            {
-                "description": "null is valid",
-                "data": {
-                    "name": null
-                },
-                "valid": true
-            },
-            {
-                "description": "object is invalid",
-                "data": {
-                    "name": {
-                        "name": null
-                    }
-                },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "remote ref with ref to defs",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "$id": "http://localhost:1234/draft2020-12/schema-remote-ref-ref-defs1.json",
-            "$ref": "ref-and-defs.json"
-        },
-        "tests": [
-            {
-                "description": "invalid",
-                "data": {
-                    "bar": 1
-                },
-                "valid": false
-            },
-            {
-                "description": "valid",
-                "data": {
-                    "bar": "a"
-                },
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "Location-independent identifier in remote ref",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "$ref": "http://localhost:1234/draft2020-12/locationIndependentIdentifier.json#/$defs/refToInteger"
-        },
-        "tests": [
-            {
-                "description": "integer is valid",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "string is invalid",
-                "data": "foo",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "retrieved nested refs resolve relative to their URI not $id",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "$id": "http://localhost:1234/draft2020-12/some-id",
-            "properties": {
-                "name": {"$ref": "nested/foo-ref-string.json"}
-            }
-        },
-        "tests": [
-            {
-                "description": "number is invalid",
-                "data": {
-                    "name": {"foo":  1}
-                },
-                "valid": false
-            },
-            {
-                "description": "string is valid",
-                "data": {
-                    "name": {"foo":  "a"}
-                },
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "remote HTTP ref with different $id",
-        "schema": {"$ref": "http://localhost:1234/different-id-ref-string.json"},
-        "tests": [
-            {
-                "description": "number is invalid",
-                "data": 1,
-                "valid": false
-            },
-            {
-                "description": "string is valid",
-                "data": "foo",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "remote HTTP ref with different URN $id",
-        "schema": {"$ref": "http://localhost:1234/urn-ref-string.json"},
-        "tests": [
-            {
-                "description": "number is invalid",
-                "data": 1,
-                "valid": false
-            },
-            {
-                "description": "string is valid",
-                "data": "foo",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "remote HTTP ref with nested absolute ref",
-        "schema": {"$ref": "http://localhost:1234/nested-absolute-ref-to-string.json"},
-        "tests": [
-            {
-                "description": "number is invalid",
-                "data": 1,
-                "valid": false
-            },
-            {
-                "description": "string is valid",
-                "data": "foo",
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft2020-12/required.json b/json/tests/draft2020-12/required.json
deleted file mode 100644
index b7cb99a..0000000
--- a/json/tests/draft2020-12/required.json
+++ /dev/null
@@ -1,158 +0,0 @@
-[
-    {
-        "description": "required validation",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "properties": {
-                "foo": {},
-                "bar": {}
-            },
-            "required": ["foo"]
-        },
-        "tests": [
-            {
-                "description": "present required property is valid",
-                "data": {"foo": 1},
-                "valid": true
-            },
-            {
-                "description": "non-present required property is invalid",
-                "data": {"bar": 1},
-                "valid": false
-            },
-            {
-                "description": "ignores arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "ignores strings",
-                "data": "",
-                "valid": true
-            },
-            {
-                "description": "ignores other non-objects",
-                "data": 12,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "required default validation",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "properties": {
-                "foo": {}
-            }
-        },
-        "tests": [
-            {
-                "description": "not required by default",
-                "data": {},
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "required with empty array",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "properties": {
-                "foo": {}
-            },
-            "required": []
-        },
-        "tests": [
-            {
-                "description": "property not required",
-                "data": {},
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "required with escaped characters",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "required": [
-                "foo\nbar",
-                "foo\"bar",
-                "foo\\bar",
-                "foo\rbar",
-                "foo\tbar",
-                "foo\fbar"
-            ]
-        },
-        "tests": [
-            {
-                "description": "object with all properties present is valid",
-                "data": {
-                    "foo\nbar": 1,
-                    "foo\"bar": 1,
-                    "foo\\bar": 1,
-                    "foo\rbar": 1,
-                    "foo\tbar": 1,
-                    "foo\fbar": 1
-                },
-                "valid": true
-            },
-            {
-                "description": "object with some properties missing is invalid",
-                "data": {
-                    "foo\nbar": "1",
-                    "foo\"bar": "1"
-                },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "required properties whose names are Javascript object property names",
-        "comment": "Ensure JS implementations don't universally consider e.g. __proto__ to always be present in an object.",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "required": ["__proto__", "toString", "constructor"]
-        },
-        "tests": [
-            {
-                "description": "ignores arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "ignores other non-objects",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "none of the properties mentioned",
-                "data": {},
-                "valid": false
-            },
-            {
-                "description": "__proto__ present",
-                "data": { "__proto__": "foo" },
-                "valid": false
-            },
-            {
-                "description": "toString present",
-                "data": { "toString": { "length": 37 } },
-                "valid": false
-            },
-            {
-                "description": "constructor present",
-                "data": { "constructor": { "length": 37 } },
-                "valid": false
-            },
-            {
-                "description": "all present",
-                "data": { 
-                    "__proto__": 12,
-                    "toString": { "length": "foo" },
-                    "constructor": 37
-                },
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft2020-12/type.json b/json/tests/draft2020-12/type.json
deleted file mode 100644
index 2123c40..0000000
--- a/json/tests/draft2020-12/type.json
+++ /dev/null
@@ -1,501 +0,0 @@
-[
-    {
-        "description": "integer type matches integers",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "type": "integer"
-        },
-        "tests": [
-            {
-                "description": "an integer is an integer",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "a float with zero fractional part is an integer",
-                "data": 1.0,
-                "valid": true
-            },
-            {
-                "description": "a float is not an integer",
-                "data": 1.1,
-                "valid": false
-            },
-            {
-                "description": "a string is not an integer",
-                "data": "foo",
-                "valid": false
-            },
-            {
-                "description": "a string is still not an integer, even if it looks like one",
-                "data": "1",
-                "valid": false
-            },
-            {
-                "description": "an object is not an integer",
-                "data": {},
-                "valid": false
-            },
-            {
-                "description": "an array is not an integer",
-                "data": [],
-                "valid": false
-            },
-            {
-                "description": "a boolean is not an integer",
-                "data": true,
-                "valid": false
-            },
-            {
-                "description": "null is not an integer",
-                "data": null,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "number type matches numbers",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "type": "number"
-        },
-        "tests": [
-            {
-                "description": "an integer is a number",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "a float with zero fractional part is a number (and an integer)",
-                "data": 1.0,
-                "valid": true
-            },
-            {
-                "description": "a float is a number",
-                "data": 1.1,
-                "valid": true
-            },
-            {
-                "description": "a string is not a number",
-                "data": "foo",
-                "valid": false
-            },
-            {
-                "description": "a string is still not a number, even if it looks like one",
-                "data": "1",
-                "valid": false
-            },
-            {
-                "description": "an object is not a number",
-                "data": {},
-                "valid": false
-            },
-            {
-                "description": "an array is not a number",
-                "data": [],
-                "valid": false
-            },
-            {
-                "description": "a boolean is not a number",
-                "data": true,
-                "valid": false
-            },
-            {
-                "description": "null is not a number",
-                "data": null,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "string type matches strings",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "type": "string"
-        },
-        "tests": [
-            {
-                "description": "1 is not a string",
-                "data": 1,
-                "valid": false
-            },
-            {
-                "description": "a float is not a string",
-                "data": 1.1,
-                "valid": false
-            },
-            {
-                "description": "a string is a string",
-                "data": "foo",
-                "valid": true
-            },
-            {
-                "description": "a string is still a string, even if it looks like a number",
-                "data": "1",
-                "valid": true
-            },
-            {
-                "description": "an empty string is still a string",
-                "data": "",
-                "valid": true
-            },
-            {
-                "description": "an object is not a string",
-                "data": {},
-                "valid": false
-            },
-            {
-                "description": "an array is not a string",
-                "data": [],
-                "valid": false
-            },
-            {
-                "description": "a boolean is not a string",
-                "data": true,
-                "valid": false
-            },
-            {
-                "description": "null is not a string",
-                "data": null,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "object type matches objects",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "type": "object"
-        },
-        "tests": [
-            {
-                "description": "an integer is not an object",
-                "data": 1,
-                "valid": false
-            },
-            {
-                "description": "a float is not an object",
-                "data": 1.1,
-                "valid": false
-            },
-            {
-                "description": "a string is not an object",
-                "data": "foo",
-                "valid": false
-            },
-            {
-                "description": "an object is an object",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "an array is not an object",
-                "data": [],
-                "valid": false
-            },
-            {
-                "description": "a boolean is not an object",
-                "data": true,
-                "valid": false
-            },
-            {
-                "description": "null is not an object",
-                "data": null,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "array type matches arrays",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "type": "array"
-        },
-        "tests": [
-            {
-                "description": "an integer is not an array",
-                "data": 1,
-                "valid": false
-            },
-            {
-                "description": "a float is not an array",
-                "data": 1.1,
-                "valid": false
-            },
-            {
-                "description": "a string is not an array",
-                "data": "foo",
-                "valid": false
-            },
-            {
-                "description": "an object is not an array",
-                "data": {},
-                "valid": false
-            },
-            {
-                "description": "an array is an array",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "a boolean is not an array",
-                "data": true,
-                "valid": false
-            },
-            {
-                "description": "null is not an array",
-                "data": null,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "boolean type matches booleans",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "type": "boolean"
-        },
-        "tests": [
-            {
-                "description": "an integer is not a boolean",
-                "data": 1,
-                "valid": false
-            },
-            {
-                "description": "zero is not a boolean",
-                "data": 0,
-                "valid": false
-            },
-            {
-                "description": "a float is not a boolean",
-                "data": 1.1,
-                "valid": false
-            },
-            {
-                "description": "a string is not a boolean",
-                "data": "foo",
-                "valid": false
-            },
-            {
-                "description": "an empty string is not a boolean",
-                "data": "",
-                "valid": false
-            },
-            {
-                "description": "an object is not a boolean",
-                "data": {},
-                "valid": false
-            },
-            {
-                "description": "an array is not a boolean",
-                "data": [],
-                "valid": false
-            },
-            {
-                "description": "true is a boolean",
-                "data": true,
-                "valid": true
-            },
-            {
-                "description": "false is a boolean",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "null is not a boolean",
-                "data": null,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "null type matches only the null object",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "type": "null"
-        },
-        "tests": [
-            {
-                "description": "an integer is not null",
-                "data": 1,
-                "valid": false
-            },
-            {
-                "description": "a float is not null",
-                "data": 1.1,
-                "valid": false
-            },
-            {
-                "description": "zero is not null",
-                "data": 0,
-                "valid": false
-            },
-            {
-                "description": "a string is not null",
-                "data": "foo",
-                "valid": false
-            },
-            {
-                "description": "an empty string is not null",
-                "data": "",
-                "valid": false
-            },
-            {
-                "description": "an object is not null",
-                "data": {},
-                "valid": false
-            },
-            {
-                "description": "an array is not null",
-                "data": [],
-                "valid": false
-            },
-            {
-                "description": "true is not null",
-                "data": true,
-                "valid": false
-            },
-            {
-                "description": "false is not null",
-                "data": false,
-                "valid": false
-            },
-            {
-                "description": "null is null",
-                "data": null,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "multiple types can be specified in an array",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "type": ["integer", "string"]
-        },
-        "tests": [
-            {
-                "description": "an integer is valid",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "a string is valid",
-                "data": "foo",
-                "valid": true
-            },
-            {
-                "description": "a float is invalid",
-                "data": 1.1,
-                "valid": false
-            },
-            {
-                "description": "an object is invalid",
-                "data": {},
-                "valid": false
-            },
-            {
-                "description": "an array is invalid",
-                "data": [],
-                "valid": false
-            },
-            {
-                "description": "a boolean is invalid",
-                "data": true,
-                "valid": false
-            },
-            {
-                "description": "null is invalid",
-                "data": null,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "type as array with one item",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "type": ["string"]
-        },
-        "tests": [
-            {
-                "description": "string is valid",
-                "data": "foo",
-                "valid": true
-            },
-            {
-                "description": "number is invalid",
-                "data": 123,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "type: array or object",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "type": ["array", "object"]
-        },
-        "tests": [
-            {
-                "description": "array is valid",
-                "data": [1,2,3],
-                "valid": true
-            },
-            {
-                "description": "object is valid",
-                "data": {"foo": 123},
-                "valid": true
-            },
-            {
-                "description": "number is invalid",
-                "data": 123,
-                "valid": false
-            },
-            {
-                "description": "string is invalid",
-                "data": "foo",
-                "valid": false
-            },
-            {
-                "description": "null is invalid",
-                "data": null,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "type: array, object or null",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "type": ["array", "object", "null"]
-        },
-        "tests": [
-            {
-                "description": "array is valid",
-                "data": [1,2,3],
-                "valid": true
-            },
-            {
-                "description": "object is valid",
-                "data": {"foo": 123},
-                "valid": true
-            },
-            {
-                "description": "null is valid",
-                "data": null,
-                "valid": true
-            },
-            {
-                "description": "number is invalid",
-                "data": 123,
-                "valid": false
-            },
-            {
-                "description": "string is invalid",
-                "data": "foo",
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft2020-12/unevaluatedItems.json b/json/tests/draft2020-12/unevaluatedItems.json
deleted file mode 100644
index 4e9dc72..0000000
--- a/json/tests/draft2020-12/unevaluatedItems.json
+++ /dev/null
@@ -1,675 +0,0 @@
-[
-    {
-        "description": "unevaluatedItems true",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "unevaluatedItems": true
-        },
-        "tests": [
-            {
-                "description": "with no unevaluated items",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "with unevaluated items",
-                "data": ["foo"],
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "unevaluatedItems false",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "unevaluatedItems": false
-        },
-        "tests": [
-            {
-                "description": "with no unevaluated items",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "with unevaluated items",
-                "data": ["foo"],
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "unevaluatedItems as schema",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "unevaluatedItems": { "type": "string" }
-        },
-        "tests": [
-            {
-                "description": "with no unevaluated items",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "with valid unevaluated items",
-                "data": ["foo"],
-                "valid": true
-            },
-            {
-                "description": "with invalid unevaluated items",
-                "data": [42],
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "unevaluatedItems with uniform items",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "items": { "type": "string" },
-            "unevaluatedItems": false
-        },
-        "tests": [
-            {
-                "description": "unevaluatedItems doesn't apply",
-                "data": ["foo", "bar"],
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "unevaluatedItems with tuple",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "prefixItems": [
-                { "type": "string" }
-            ],
-            "unevaluatedItems": false
-        },
-        "tests": [
-            {
-                "description": "with no unevaluated items",
-                "data": ["foo"],
-                "valid": true
-            },
-            {
-                "description": "with unevaluated items",
-                "data": ["foo", "bar"],
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "unevaluatedItems with items",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "prefixItems": [
-                { "type": "string" }
-            ],
-            "items": true,
-            "unevaluatedItems": false
-        },
-        "tests": [
-            {
-                "description": "unevaluatedItems doesn't apply",
-                "data": ["foo", 42],
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "unevaluatedItems with nested tuple",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "prefixItems": [
-                { "type": "string" }
-            ],
-            "allOf": [
-                {
-                    "prefixItems": [
-                        true,
-                        { "type": "number" }
-                    ]
-                }
-            ],
-            "unevaluatedItems": false
-        },
-        "tests": [
-            {
-                "description": "with no unevaluated items",
-                "data": ["foo", 42],
-                "valid": true
-            },
-            {
-                "description": "with unevaluated items",
-                "data": ["foo", 42, true],
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "unevaluatedItems with nested items",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "unevaluatedItems": {"type": "boolean"},
-            "anyOf": [
-                { "items": {"type": "string"} },
-                true
-            ]
-        },
-        "tests": [
-            {
-                "description": "with only (valid) additional items",
-                "data": [true, false],
-                "valid": true
-            },
-            {
-                "description": "with no additional items",
-                "data": ["yes", "no"],
-                "valid": true
-            },
-            {
-                "description": "with invalid additional item",
-                "data": ["yes", false],
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "unevaluatedItems with nested prefixItems and items",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "allOf": [
-                {
-                    "prefixItems": [
-                        { "type": "string" }
-                    ],
-                    "items": true
-                }
-            ],
-            "unevaluatedItems": false
-        },
-        "tests": [
-            {
-                "description": "with no additional items",
-                "data": ["foo"],
-                "valid": true
-            },
-            {
-                "description": "with additional items",
-                "data": ["foo", 42, true],
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "unevaluatedItems with nested unevaluatedItems",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "allOf": [
-                {
-                    "prefixItems": [
-                        { "type": "string" }
-                    ]
-                },
-                { "unevaluatedItems": true }
-            ],
-            "unevaluatedItems": false
-        },
-        "tests": [
-            {
-                "description": "with no additional items",
-                "data": ["foo"],
-                "valid": true
-            },
-            {
-                "description": "with additional items",
-                "data": ["foo", 42, true],
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "unevaluatedItems with anyOf",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "prefixItems": [
-                { "const": "foo" }
-            ],
-            "anyOf": [
-                {
-                    "prefixItems": [
-                        true,
-                        { "const": "bar" }
-                    ]
-                },
-                {
-                    "prefixItems": [
-                        true,
-                        true,
-                        { "const": "baz" }
-                    ]
-                }
-            ],
-            "unevaluatedItems": false
-        },
-        "tests": [
-            {
-                "description": "when one schema matches and has no unevaluated items",
-                "data": ["foo", "bar"],
-                "valid": true
-            },
-            {
-                "description": "when one schema matches and has unevaluated items",
-                "data": ["foo", "bar", 42],
-                "valid": false
-            },
-            {
-                "description": "when two schemas match and has no unevaluated items",
-                "data": ["foo", "bar", "baz"],
-                "valid": true
-            },
-            {
-                "description": "when two schemas match and has unevaluated items",
-                "data": ["foo", "bar", "baz", 42],
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "unevaluatedItems with oneOf",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "prefixItems": [
-                { "const": "foo" }
-            ],
-            "oneOf": [
-                {
-                    "prefixItems": [
-                        true,
-                        { "const": "bar" }
-                    ]
-                },
-                {
-                    "prefixItems": [
-                        true,
-                        { "const": "baz" }
-                    ]
-                }
-            ],
-            "unevaluatedItems": false
-        },
-        "tests": [
-            {
-                "description": "with no unevaluated items",
-                "data": ["foo", "bar"],
-                "valid": true
-            },
-            {
-                "description": "with unevaluated items",
-                "data": ["foo", "bar", 42],
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "unevaluatedItems with not",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "prefixItems": [
-                { "const": "foo" }
-            ],
-            "not": {
-                "not": {
-                    "prefixItems": [
-                        true,
-                        { "const": "bar" }
-                    ]
-                }
-            },
-            "unevaluatedItems": false
-        },
-        "tests": [
-            {
-                "description": "with unevaluated items",
-                "data": ["foo", "bar"],
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "unevaluatedItems with if/then/else",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "prefixItems": [
-                { "const": "foo" }
-            ],
-            "if": {
-                "prefixItems": [
-                    true,
-                    { "const": "bar" }
-                ]
-            },
-            "then": {
-                "prefixItems": [
-                    true,
-                    true,
-                    { "const": "then" }
-                ]
-            },
-            "else": {
-                "prefixItems": [
-                    true,
-                    true,
-                    true,
-                    { "const": "else" }
-                ]
-            },
-            "unevaluatedItems": false
-        },
-        "tests": [
-            {
-                "description": "when if matches and it has no unevaluated items",
-                "data": ["foo", "bar", "then"],
-                "valid": true
-            },
-            {
-                "description": "when if matches and it has unevaluated items",
-                "data": ["foo", "bar", "then", "else"],
-                "valid": false
-            },
-            {
-                "description": "when if doesn't match and it has no unevaluated items",
-                "data": ["foo", 42, 42, "else"],
-                "valid": true
-            },
-            {
-                "description": "when if doesn't match and it has unevaluated items",
-                "data": ["foo", 42, 42, "else", 42],
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "unevaluatedItems with boolean schemas",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "allOf": [true],
-            "unevaluatedItems": false
-        },
-        "tests": [
-            {
-                "description": "with no unevaluated items",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "with unevaluated items",
-                "data": ["foo"],
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "unevaluatedItems with $ref",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "$ref": "#/$defs/bar",
-            "prefixItems": [
-                { "type": "string" }
-            ],
-            "unevaluatedItems": false,
-            "$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 can't see inside cousins",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "allOf": [
-                {
-                    "prefixItems": [ true ]
-                },
-                { "unevaluatedItems": false }
-            ]
-        },
-        "tests": [
-            {
-                "description": "always fails",
-                "data": [ 1 ],
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "item is evaluated in an uncle schema to unevaluatedItems",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "properties": {
-                "foo": {
-                    "prefixItems": [
-                        { "type": "string" }
-                    ],
-                    "unevaluatedItems": false
-                  }
-            },
-            "anyOf": [
-                {
-                    "properties": {
-                        "foo": {
-                            "prefixItems": [
-                                true,
-                                { "type": "string" }
-                            ]
-                        }
-                    }
-                }
-            ]
-        },
-        "tests": [
-            {
-                "description": "no extra items",
-                "data": {
-                    "foo": [
-                        "test"
-                    ]
-                },
-                "valid": true
-            },
-            {
-                "description": "uncle keyword evaluation is not significant",
-                "data": {
-                    "foo": [
-                        "test",
-                        "test"
-                    ]
-                },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "unevaluatedItems depends on adjacent contains",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "prefixItems": [true],
-            "contains": {"type": "string"},
-            "unevaluatedItems": false
-        },
-        "tests": [
-            {
-                "description": "second item is evaluated by contains",
-                "data": [ 1, "foo" ],
-                "valid": true
-            },
-            {
-                "description": "contains fails, second item is not evaluated",
-                "data": [ 1, 2 ],
-                "valid": false
-            },
-            {
-                "description": "contains passes, second item is not evaluated",
-                "data": [ 1, 2, "foo" ],
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "unevaluatedItems depends on multiple nested contains",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "allOf": [
-                { "contains": { "multipleOf": 2 } },
-                { "contains": { "multipleOf": 3 } }
-            ],
-            "unevaluatedItems": { "multipleOf": 5 }
-        },
-        "tests": [
-            {
-                "description": "5 not evaluated, passes unevaluatedItems",
-                "data": [ 2, 3, 4, 5, 6 ],
-                "valid": true
-            },
-            {
-                "description": "7 not evaluated, fails unevaluatedItems",
-                "data": [ 2, 3, 4, 7, 8 ],
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "unevaluatedItems and contains interact to control item dependency relationship",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "if": {
-                "contains": {"const": "a"}
-            },
-            "then": {
-                "if": {
-                    "contains": {"const": "b"}
-                },
-                "then": {
-                    "if": {
-                        "contains": {"const": "c"}
-                    }
-                }
-            },
-            "unevaluatedItems": false
-        },
-        "tests": [
-            {
-                "description": "empty array is valid",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "only a's are valid",
-                "data": [ "a", "a" ],
-                "valid": true
-            },
-            {
-                "description": "a's and b's are valid",
-                "data": [ "a", "b", "a", "b", "a" ],
-                "valid": true
-            },
-            {
-                "description": "a's, b's and c's are valid",
-                "data": [ "c", "a", "c", "c", "b", "a" ],
-                "valid": true
-            },
-            {
-                "description": "only b's are invalid",
-                "data": [ "b", "b" ],
-                "valid": false
-            },
-            {
-                "description": "only c's are invalid",
-                "data": [ "c", "c" ],
-                "valid": false
-            },
-            {
-                "description": "only b's and c's are invalid",
-                "data": [ "c", "b", "c", "b", "c" ],
-                "valid": false
-            },
-            {
-                "description": "only a's and c's are invalid",
-                "data": [ "c", "a", "c", "a", "c" ],
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "non-array instances are valid",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "unevaluatedItems": false
-        },
-        "tests": [
-            {
-                "description": "ignores booleans",
-                "data": true,
-                "valid": true
-            },
-            {
-                "description": "ignores integers",
-                "data": 123,
-                "valid": true
-            },
-            {
-                "description": "ignores floats",
-                "data": 1.0,
-                "valid": true
-            },
-            {
-                "description": "ignores objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "ignores strings",
-                "data": "foo",
-                "valid": true
-            },
-            {
-                "description": "ignores null",
-                "data": null,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "unevaluatedItems with null instance elements",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "unevaluatedItems": {
-                "type": "null"
-            }
-        },
-        "tests": [
-            {
-                "description": "allows null elements",
-                "data": [ null ],
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft2020-12/unevaluatedProperties.json b/json/tests/draft2020-12/unevaluatedProperties.json
deleted file mode 100644
index 31bb691..0000000
--- a/json/tests/draft2020-12/unevaluatedProperties.json
+++ /dev/null
@@ -1,1423 +0,0 @@
-[
-    {
-        "description": "unevaluatedProperties true",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "type": "object",
-            "unevaluatedProperties": true
-        },
-        "tests": [
-            {
-                "description": "with no unevaluated properties",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "with unevaluated properties",
-                "data": {
-                    "foo": "foo"
-                },
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "unevaluatedProperties schema",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "type": "object",
-            "unevaluatedProperties": {
-                "type": "string",
-                "minLength": 3
-            }
-        },
-        "tests": [
-            {
-                "description": "with no unevaluated properties",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "with valid unevaluated properties",
-                "data": {
-                    "foo": "foo"
-                },
-                "valid": true
-            },
-            {
-                "description": "with invalid unevaluated properties",
-                "data": {
-                    "foo": "fo"
-                },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "unevaluatedProperties false",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "type": "object",
-            "unevaluatedProperties": false
-        },
-        "tests": [
-            {
-                "description": "with no unevaluated properties",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "with unevaluated properties",
-                "data": {
-                    "foo": "foo"
-                },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "unevaluatedProperties with adjacent properties",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "type": "object",
-            "properties": {
-                "foo": { "type": "string" }
-            },
-            "unevaluatedProperties": false
-        },
-        "tests": [
-            {
-                "description": "with no unevaluated properties",
-                "data": {
-                    "foo": "foo"
-                },
-                "valid": true
-            },
-            {
-                "description": "with unevaluated properties",
-                "data": {
-                    "foo": "foo",
-                    "bar": "bar"
-                },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "unevaluatedProperties with adjacent patternProperties",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "type": "object",
-            "patternProperties": {
-                "^foo": { "type": "string" }
-            },
-            "unevaluatedProperties": false
-        },
-        "tests": [
-            {
-                "description": "with no unevaluated properties",
-                "data": {
-                    "foo": "foo"
-                },
-                "valid": true
-            },
-            {
-                "description": "with unevaluated properties",
-                "data": {
-                    "foo": "foo",
-                    "bar": "bar"
-                },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "unevaluatedProperties with adjacent additionalProperties",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "type": "object",
-            "properties": {
-                "foo": { "type": "string" }
-            },
-            "additionalProperties": true,
-            "unevaluatedProperties": false
-        },
-        "tests": [
-            {
-                "description": "with no additional properties",
-                "data": {
-                    "foo": "foo"
-                },
-                "valid": true
-            },
-            {
-                "description": "with additional properties",
-                "data": {
-                    "foo": "foo",
-                    "bar": "bar"
-                },
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "unevaluatedProperties with nested properties",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "type": "object",
-            "properties": {
-                "foo": { "type": "string" }
-            },
-            "allOf": [
-                {
-                    "properties": {
-                        "bar": { "type": "string" }
-                    }
-                }
-            ],
-            "unevaluatedProperties": false
-        },
-        "tests": [
-            {
-                "description": "with no additional properties",
-                "data": {
-                    "foo": "foo",
-                    "bar": "bar"
-                },
-                "valid": true
-            },
-            {
-                "description": "with additional properties",
-                "data": {
-                    "foo": "foo",
-                    "bar": "bar",
-                    "baz": "baz"
-                },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "unevaluatedProperties with nested patternProperties",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "type": "object",
-            "properties": {
-                "foo": { "type": "string" }
-            },
-            "allOf": [
-              {
-                  "patternProperties": {
-                      "^bar": { "type": "string" }
-                  }
-              }
-            ],
-            "unevaluatedProperties": false
-        },
-        "tests": [
-            {
-                "description": "with no additional properties",
-                "data": {
-                    "foo": "foo",
-                    "bar": "bar"
-                },
-                "valid": true
-            },
-            {
-                "description": "with additional properties",
-                "data": {
-                    "foo": "foo",
-                    "bar": "bar",
-                    "baz": "baz"
-                },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "unevaluatedProperties with nested additionalProperties",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "type": "object",
-            "properties": {
-                "foo": { "type": "string" }
-            },
-            "allOf": [
-                {
-                    "additionalProperties": true
-                }
-            ],
-            "unevaluatedProperties": false
-        },
-        "tests": [
-            {
-                "description": "with no additional properties",
-                "data": {
-                    "foo": "foo"
-                },
-                "valid": true
-            },
-            {
-                "description": "with additional properties",
-                "data": {
-                    "foo": "foo",
-                    "bar": "bar"
-                },
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "unevaluatedProperties with nested unevaluatedProperties",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "type": "object",
-            "properties": {
-                "foo": { "type": "string" }
-            },
-            "allOf": [
-                {
-                    "unevaluatedProperties": true
-                }
-            ],
-            "unevaluatedProperties": {
-                "type": "string",
-                "maxLength": 2
-            }
-        },
-        "tests": [
-            {
-                "description": "with no nested unevaluated properties",
-                "data": {
-                    "foo": "foo"
-                },
-                "valid": true
-            },
-            {
-                "description": "with nested unevaluated properties",
-                "data": {
-                    "foo": "foo",
-                    "bar": "bar"
-                },
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "unevaluatedProperties with anyOf",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "type": "object",
-            "properties": {
-                "foo": { "type": "string" }
-            },
-            "anyOf": [
-                {
-                    "properties": {
-                        "bar": { "const": "bar" }
-                    },
-                    "required": ["bar"]
-                },
-                {
-                    "properties": {
-                        "baz": { "const": "baz" }
-                    },
-                    "required": ["baz"]
-                },
-                {
-                    "properties": {
-                        "quux": { "const": "quux" }
-                    },
-                    "required": ["quux"]
-                }
-            ],
-            "unevaluatedProperties": false
-        },
-        "tests": [
-            {
-                "description": "when one matches and has no unevaluated properties",
-                "data": {
-                    "foo": "foo",
-                    "bar": "bar"
-                },
-                "valid": true
-            },
-            {
-                "description": "when one matches and has unevaluated properties",
-                "data": {
-                    "foo": "foo",
-                    "bar": "bar",
-                    "baz": "not-baz"
-                },
-                "valid": false
-            },
-            {
-                "description": "when two match and has no unevaluated properties",
-                "data": {
-                    "foo": "foo",
-                    "bar": "bar",
-                    "baz": "baz"
-                },
-                "valid": true
-            },
-            {
-                "description": "when two match and has unevaluated properties",
-                "data": {
-                    "foo": "foo",
-                    "bar": "bar",
-                    "baz": "baz",
-                    "quux": "not-quux"
-                },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "unevaluatedProperties with oneOf",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "type": "object",
-            "properties": {
-                "foo": { "type": "string" }
-            },
-            "oneOf": [
-                {
-                    "properties": {
-                        "bar": { "const": "bar" }
-                    },
-                    "required": ["bar"]
-                },
-                {
-                    "properties": {
-                        "baz": { "const": "baz" }
-                    },
-                    "required": ["baz"]
-                }
-            ],
-            "unevaluatedProperties": false
-        },
-        "tests": [
-            {
-                "description": "with no unevaluated properties",
-                "data": {
-                    "foo": "foo",
-                    "bar": "bar"
-                },
-                "valid": true
-            },
-            {
-                "description": "with unevaluated properties",
-                "data": {
-                    "foo": "foo",
-                    "bar": "bar",
-                    "quux": "quux"
-                },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "unevaluatedProperties with not",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "type": "object",
-            "properties": {
-                "foo": { "type": "string" }
-            },
-            "not": {
-                "not": {
-                    "properties": {
-                        "bar": { "const": "bar" }
-                    },
-                    "required": ["bar"]
-                }
-            },
-            "unevaluatedProperties": false
-        },
-        "tests": [
-            {
-                "description": "with unevaluated properties",
-                "data": {
-                    "foo": "foo",
-                    "bar": "bar"
-                },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "unevaluatedProperties with if/then/else",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "type": "object",
-            "if": {
-                "properties": {
-                    "foo": { "const": "then" }
-                },
-                "required": ["foo"]
-            },
-            "then": {
-                "properties": {
-                    "bar": { "type": "string" }
-                },
-                "required": ["bar"]
-            },
-            "else": {
-                "properties": {
-                    "baz": { "type": "string" }
-                },
-                "required": ["baz"]
-            },
-            "unevaluatedProperties": false
-        },
-        "tests": [
-            {
-                "description": "when if is true and has no unevaluated properties",
-                "data": {
-                    "foo": "then",
-                    "bar": "bar"
-                },
-                "valid": true
-            },
-            {
-                "description": "when if is true and has unevaluated properties",
-                "data": {
-                    "foo": "then",
-                    "bar": "bar",
-                    "baz": "baz"
-                },
-                "valid": false
-            },
-            {
-                "description": "when if is false and has no unevaluated properties",
-                "data": {
-                    "baz": "baz"
-                },
-                "valid": true
-            },
-            {
-                "description": "when if is false and has unevaluated properties",
-                "data": {
-                    "foo": "else",
-                    "baz": "baz"
-                },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "unevaluatedProperties with if/then/else, then not defined",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "type": "object",
-            "if": {
-                "properties": {
-                    "foo": { "const": "then" }
-                },
-                "required": ["foo"]
-            },
-            "else": {
-                "properties": {
-                    "baz": { "type": "string" }
-                },
-                "required": ["baz"]
-            },
-            "unevaluatedProperties": false
-        },
-        "tests": [
-            {
-                "description": "when if is true and has no unevaluated properties",
-                "data": {
-                    "foo": "then",
-                    "bar": "bar"
-                },
-                "valid": false
-            },
-            {
-                "description": "when if is true and has unevaluated properties",
-                "data": {
-                    "foo": "then",
-                    "bar": "bar",
-                    "baz": "baz"
-                },
-                "valid": false
-            },
-            {
-                "description": "when if is false and has no unevaluated properties",
-                "data": {
-                    "baz": "baz"
-                },
-                "valid": true
-            },
-            {
-                "description": "when if is false and has unevaluated properties",
-                "data": {
-                    "foo": "else",
-                    "baz": "baz"
-                },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "unevaluatedProperties with if/then/else, else not defined",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "type": "object",
-            "if": {
-                "properties": {
-                    "foo": { "const": "then" }
-                },
-                "required": ["foo"]
-            },
-            "then": {
-                "properties": {
-                    "bar": { "type": "string" }
-                },
-                "required": ["bar"]
-            },
-            "unevaluatedProperties": false
-        },
-        "tests": [
-            {
-                "description": "when if is true and has no unevaluated properties",
-                "data": {
-                    "foo": "then",
-                    "bar": "bar"
-                },
-                "valid": true
-            },
-            {
-                "description": "when if is true and has unevaluated properties",
-                "data": {
-                    "foo": "then",
-                    "bar": "bar",
-                    "baz": "baz"
-                },
-                "valid": false
-            },
-            {
-                "description": "when if is false and has no unevaluated properties",
-                "data": {
-                    "baz": "baz"
-                },
-                "valid": false
-            },
-            {
-                "description": "when if is false and has unevaluated properties",
-                "data": {
-                    "foo": "else",
-                    "baz": "baz"
-                },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "unevaluatedProperties with dependentSchemas",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "type": "object",
-            "properties": {
-                "foo": { "type": "string" }
-            },
-            "dependentSchemas": {
-                "foo": {
-                    "properties": {
-                        "bar": { "const": "bar" }
-                    },
-                    "required": ["bar"]
-                }
-            },
-            "unevaluatedProperties": false
-        },
-        "tests": [
-            {
-                "description": "with no unevaluated properties",
-                "data": {
-                    "foo": "foo",
-                    "bar": "bar"
-                },
-                "valid": true
-            },
-            {
-                "description": "with unevaluated properties",
-                "data": {
-                    "bar": "bar"
-                },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "unevaluatedProperties with boolean schemas",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "type": "object",
-            "properties": {
-                "foo": { "type": "string" }
-            },
-            "allOf": [true],
-            "unevaluatedProperties": false
-        },
-        "tests": [
-            {
-                "description": "with no unevaluated properties",
-                "data": {
-                    "foo": "foo"
-                },
-                "valid": true
-            },
-            {
-                "description": "with unevaluated properties",
-                "data": {
-                    "bar": "bar"
-                },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "unevaluatedProperties with $ref",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "type": "object",
-            "$ref": "#/$defs/bar",
-            "properties": {
-                "foo": { "type": "string" }
-            },
-            "unevaluatedProperties": false,
-            "$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 can't see inside cousins",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "allOf": [
-                {
-                    "properties": {
-                        "foo": true
-                    }
-                },
-                {
-                    "unevaluatedProperties": false
-                }
-            ]
-        },
-        "tests": [
-            {
-                "description": "always fails",
-                "data": {
-                    "foo": 1
-                },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "unevaluatedProperties can't see inside cousins (reverse order)",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "allOf": [
-                {
-                    "unevaluatedProperties": false
-                },
-                {
-                    "properties": {
-                        "foo": true
-                    }
-                }
-            ]
-        },
-        "tests": [
-            {
-                "description": "always fails",
-                "data": {
-                    "foo": 1
-                },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "nested unevaluatedProperties, outer false, inner true, properties outside",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "type": "object",
-            "properties": {
-                "foo": { "type": "string" }
-            },
-            "allOf": [
-                {
-                    "unevaluatedProperties": true
-                }
-            ],
-            "unevaluatedProperties": false
-        },
-        "tests": [
-            {
-                "description": "with no nested unevaluated properties",
-                "data": {
-                    "foo": "foo"
-                },
-                "valid": true
-            },
-            {
-                "description": "with nested unevaluated properties",
-                "data": {
-                    "foo": "foo",
-                    "bar": "bar"
-                },
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "nested unevaluatedProperties, outer false, inner true, properties inside",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "type": "object",
-            "allOf": [
-                {
-                    "properties": {
-                        "foo": { "type": "string" }
-                    },
-                    "unevaluatedProperties": true
-                }
-            ],
-            "unevaluatedProperties": false
-        },
-        "tests": [
-            {
-                "description": "with no nested unevaluated properties",
-                "data": {
-                    "foo": "foo"
-                },
-                "valid": true
-            },
-            {
-                "description": "with nested unevaluated properties",
-                "data": {
-                    "foo": "foo",
-                    "bar": "bar"
-                },
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "nested unevaluatedProperties, outer true, inner false, properties outside",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "type": "object",
-            "properties": {
-                "foo": { "type": "string" }
-            },
-            "allOf": [
-                {
-                    "unevaluatedProperties": false
-                }
-            ],
-            "unevaluatedProperties": true
-        },
-        "tests": [
-            {
-                "description": "with no nested unevaluated properties",
-                "data": {
-                    "foo": "foo"
-                },
-                "valid": false
-            },
-            {
-                "description": "with nested unevaluated properties",
-                "data": {
-                    "foo": "foo",
-                    "bar": "bar"
-                },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "nested unevaluatedProperties, outer true, inner false, properties inside",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "type": "object",
-            "allOf": [
-                {
-                    "properties": {
-                        "foo": { "type": "string" }
-                    },
-                    "unevaluatedProperties": false
-                }
-            ],
-            "unevaluatedProperties": true
-        },
-        "tests": [
-            {
-                "description": "with no nested unevaluated properties",
-                "data": {
-                    "foo": "foo"
-                },
-                "valid": true
-            },
-            {
-                "description": "with nested unevaluated properties",
-                "data": {
-                    "foo": "foo",
-                    "bar": "bar"
-                },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "cousin unevaluatedProperties, true and false, true with properties",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "type": "object",
-            "allOf": [
-                {
-                    "properties": {
-                        "foo": { "type": "string" }
-                    },
-                    "unevaluatedProperties": true
-                },
-                {
-                    "unevaluatedProperties": false
-                }
-            ]
-        },
-        "tests": [
-            {
-                "description": "with no nested unevaluated properties",
-                "data": {
-                    "foo": "foo"
-                },
-                "valid": false
-            },
-            {
-                "description": "with nested unevaluated properties",
-                "data": {
-                    "foo": "foo",
-                    "bar": "bar"
-                },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "cousin unevaluatedProperties, true and false, false with properties",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "type": "object",
-            "allOf": [
-                {
-                    "unevaluatedProperties": true
-                },
-                {
-                    "properties": {
-                        "foo": { "type": "string" }
-                    },
-                    "unevaluatedProperties": false
-                }
-            ]
-        },
-        "tests": [
-            {
-                "description": "with no nested unevaluated properties",
-                "data": {
-                    "foo": "foo"
-                },
-                "valid": true
-            },
-            {
-                "description": "with nested unevaluated properties",
-                "data": {
-                    "foo": "foo",
-                    "bar": "bar"
-                },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "property is evaluated in an uncle schema to unevaluatedProperties",
-        "comment": "see https://stackoverflow.com/questions/66936884/deeply-nested-unevaluatedproperties-and-their-expectations",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "type": "object",
-            "properties": {
-                "foo": {
-                    "type": "object",
-                    "properties": {
-                        "bar": {
-                            "type": "string"
-                        }
-                    },
-                    "unevaluatedProperties": false
-                  }
-            },
-            "anyOf": [
-                {
-                    "properties": {
-                        "foo": {
-                            "properties": {
-                                "faz": {
-                                    "type": "string"
-                                }
-                            }
-                        }
-                    }
-                }
-            ]
-        },
-        "tests": [
-            {
-                "description": "no extra properties",
-                "data": {
-                    "foo": {
-                        "bar": "test"
-                    }
-                },
-                "valid": true
-            },
-            {
-                "description": "uncle keyword evaluation is not significant",
-                "data": {
-                    "foo": {
-                        "bar": "test",
-                        "faz": "test"
-                    }
-                },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "in-place applicator siblings, allOf has unevaluated",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "type": "object",
-            "allOf": [
-                {
-                    "properties": {
-                        "foo": true
-                    },
-                    "unevaluatedProperties": false
-                }
-            ],
-            "anyOf": [
-                {
-                    "properties": {
-                        "bar": true
-                    }
-                }
-            ]
-        },
-        "tests": [
-            {
-                "description": "base case: both properties present",
-                "data": {
-                    "foo": 1,
-                    "bar": 1
-                },
-                "valid": false
-            },
-            {
-                "description": "in place applicator siblings, bar is missing",
-                "data": {
-                    "foo": 1
-                },
-                "valid": true
-            },
-            {
-                "description": "in place applicator siblings, foo is missing",
-                "data": {
-                    "bar": 1
-                },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "in-place applicator siblings, anyOf has unevaluated",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "type": "object",
-            "allOf": [
-                {
-                    "properties": {
-                        "foo": true
-                    }
-                }
-            ],
-            "anyOf": [
-                {
-                    "properties": {
-                        "bar": true
-                    },
-                    "unevaluatedProperties": false
-                }
-            ]
-        },
-        "tests": [
-            {
-                "description": "base case: both properties present",
-                "data": {
-                    "foo": 1,
-                    "bar": 1
-                },
-                "valid": false
-            },
-            {
-                "description": "in place applicator siblings, bar is missing",
-                "data": {
-                    "foo": 1
-                },
-                "valid": false
-            },
-            {
-                "description": "in place applicator siblings, foo is missing",
-                "data": {
-                    "bar": 1
-                },
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "unevaluatedProperties + single cyclic ref",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "type": "object",
-            "properties": {
-                "x": { "$ref": "#" }
-            },
-            "unevaluatedProperties": false
-        },
-        "tests": [
-            {
-                "description": "Empty is valid",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "Single is valid",
-                "data": { "x": {} },
-                "valid": true
-            },
-            {
-                "description": "Unevaluated on 1st level is invalid",
-                "data": { "x": {}, "y": {} },
-                "valid": false
-            },
-            {
-                "description": "Nested is valid",
-                "data": { "x": { "x": {} } },
-                "valid": true
-            },
-            {
-                "description": "Unevaluated on 2nd level is invalid",
-                "data": { "x": { "x": {}, "y": {} } },
-                "valid": false
-            },
-            {
-                "description": "Deep nested is valid",
-                "data": { "x": { "x": { "x": {} } } },
-                "valid": true
-            },
-            {
-                "description": "Unevaluated on 3rd level is invalid",
-                "data": { "x": { "x": { "x": {}, "y": {} } } },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "unevaluatedProperties + ref inside allOf / oneOf",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "$defs": {
-                "one": {
-                    "properties": { "a": true }
-                },
-                "two": {
-                    "required": ["x"],
-                    "properties": { "x": true }
-                }
-            },
-            "allOf": [
-                { "$ref": "#/$defs/one" },
-                { "properties": { "b": true } },
-                {
-                    "oneOf": [
-                        { "$ref": "#/$defs/two" },
-                        {
-                            "required": ["y"],
-                            "properties": { "y": true }
-                        }
-                    ]
-                }
-            ],
-            "unevaluatedProperties": false
-        },
-        "tests": [
-            {
-                "description": "Empty is invalid (no x or y)",
-                "data": {},
-                "valid": false
-            },
-            {
-                "description": "a and b are invalid (no x or y)",
-                "data": { "a": 1, "b": 1 },
-                "valid": false
-            },
-            {
-                "description": "x and y are invalid",
-                "data": { "x": 1, "y": 1 },
-                "valid": false
-            },
-            {
-                "description": "a and x are valid",
-                "data": { "a": 1, "x": 1 },
-                "valid": true
-            },
-            {
-                "description": "a and y are valid",
-                "data": { "a": 1, "y": 1 },
-                "valid": true
-            },
-            {
-                "description": "a and b and x are valid",
-                "data": { "a": 1, "b": 1, "x": 1 },
-                "valid": true
-            },
-            {
-                "description": "a and b and y are valid",
-                "data": { "a": 1, "b": 1, "y": 1 },
-                "valid": true
-            },
-            {
-                "description": "a and b and x and y are invalid",
-                "data": { "a": 1, "b": 1, "x": 1, "y": 1 },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "dynamic evalation inside nested refs",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "$defs": {
-                "one": {
-                    "oneOf": [
-                        { "$ref": "#/$defs/two" },
-                        { "required": ["b"], "properties": { "b": true } },
-                        { "required": ["xx"], "patternProperties": { "x": true } },
-                        { "required": ["all"], "unevaluatedProperties": true }
-                    ]
-                },
-                "two": {
-                    "oneOf": [
-                        { "required": ["c"], "properties": { "c": true } },
-                        { "required": ["d"], "properties": { "d": true } }
-                    ]
-                }
-            },
-            "oneOf": [
-                { "$ref": "#/$defs/one" },
-                { "required": ["a"], "properties": { "a": true } }
-            ],
-            "unevaluatedProperties": false
-        },
-        "tests": [
-            {
-                "description": "Empty is invalid",
-                "data": {},
-                "valid": false
-            },
-            {
-                "description": "a is valid",
-                "data": { "a": 1 },
-                "valid": true
-            },
-            {
-                "description": "b is valid",
-                "data": { "b": 1 },
-                "valid": true
-            },
-            {
-                "description": "c is valid",
-                "data": { "c": 1 },
-                "valid": true
-            },
-            {
-                "description": "d is valid",
-                "data": { "d": 1 },
-                "valid": true
-            },
-            {
-                "description": "a + b is invalid",
-                "data": { "a": 1, "b": 1 },
-                "valid": false
-            },
-            {
-                "description": "a + c is invalid",
-                "data": { "a": 1, "c": 1 },
-                "valid": false
-            },
-            {
-                "description": "a + d is invalid",
-                "data": { "a": 1, "d": 1 },
-                "valid": false
-            },
-            {
-                "description": "b + c is invalid",
-                "data": { "b": 1, "c": 1 },
-                "valid": false
-            },
-            {
-                "description": "b + d is invalid",
-                "data": { "b": 1, "d": 1 },
-                "valid": false
-            },
-            {
-                "description": "c + d is invalid",
-                "data": { "c": 1, "d": 1 },
-                "valid": false
-            },
-            {
-                "description": "xx is valid",
-                "data": { "xx": 1 },
-                "valid": true
-            },
-            {
-                "description": "xx + foox is valid",
-                "data": { "xx": 1, "foox": 1 },
-                "valid": true
-            },
-            {
-                "description": "xx + foo is invalid",
-                "data": { "xx": 1, "foo": 1 },
-                "valid": false
-            },
-            {
-                "description": "xx + a is invalid",
-                "data": { "xx": 1, "a": 1 },
-                "valid": false
-            },
-            {
-                "description": "xx + b is invalid",
-                "data": { "xx": 1, "b": 1 },
-                "valid": false
-            },
-            {
-                "description": "xx + c is invalid",
-                "data": { "xx": 1, "c": 1 },
-                "valid": false
-            },
-            {
-                "description": "xx + d is invalid",
-                "data": { "xx": 1, "d": 1 },
-                "valid": false
-            },
-            {
-                "description": "all is valid",
-                "data": { "all": 1 },
-                "valid": true
-            },
-            {
-                "description": "all + foo is valid",
-                "data": { "all": 1, "foo": 1 },
-                "valid": true
-            },
-            {
-                "description": "all + a is invalid",
-                "data": { "all": 1, "a": 1 },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "non-object instances are valid",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "unevaluatedProperties": false
-        },
-        "tests": [
-            {
-                "description": "ignores booleans",
-                "data": true,
-                "valid": true
-            },
-            {
-                "description": "ignores integers",
-                "data": 123,
-                "valid": true
-            },
-            {
-                "description": "ignores floats",
-                "data": 1.0,
-                "valid": true
-            },
-            {
-                "description": "ignores arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "ignores strings",
-                "data": "foo",
-                "valid": true
-            },
-            {
-                "description": "ignores null",
-                "data": null,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "unevaluatedProperties with null valued instance properties",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "unevaluatedProperties": {
-                "type": "null"
-            }
-        },
-        "tests": [
-            {
-                "description": "allows null valued properties",
-                "data": {"foo": null},
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft2020-12/uniqueItems.json b/json/tests/draft2020-12/uniqueItems.json
deleted file mode 100644
index 707235c..0000000
--- a/json/tests/draft2020-12/uniqueItems.json
+++ /dev/null
@@ -1,414 +0,0 @@
-[
-    {
-        "description": "uniqueItems validation",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "uniqueItems": true
-        },
-        "tests": [
-            {
-                "description": "unique array of integers is valid",
-                "data": [1, 2],
-                "valid": true
-            },
-            {
-                "description": "non-unique array of integers is invalid",
-                "data": [1, 1],
-                "valid": false
-            },
-            {
-                "description": "non-unique array of more than two integers is invalid",
-                "data": [1, 2, 1],
-                "valid": false
-            },
-            {
-                "description": "numbers are unique if mathematically unequal",
-                "data": [1.0, 1.00, 1],
-                "valid": false
-            },
-            {
-                "description": "false is not equal to zero",
-                "data": [0, false],
-                "valid": true
-            },
-            {
-                "description": "true is not equal to one",
-                "data": [1, true],
-                "valid": true
-            },
-            {
-                "description": "unique array of strings is valid",
-                "data": ["foo", "bar", "baz"],
-                "valid": true
-            },
-            {
-                "description": "non-unique array of strings is invalid",
-                "data": ["foo", "bar", "foo"],
-                "valid": false
-            },
-            {
-                "description": "unique array of objects is valid",
-                "data": [{"foo": "bar"}, {"foo": "baz"}],
-                "valid": true
-            },
-            {
-                "description": "non-unique array of objects is invalid",
-                "data": [{"foo": "bar"}, {"foo": "bar"}],
-                "valid": false
-            },
-            {
-                "description": "unique array of nested objects is valid",
-                "data": [
-                    {"foo": {"bar" : {"baz" : true}}},
-                    {"foo": {"bar" : {"baz" : false}}}
-                ],
-                "valid": true
-            },
-            {
-                "description": "non-unique array of nested objects is invalid",
-                "data": [
-                    {"foo": {"bar" : {"baz" : true}}},
-                    {"foo": {"bar" : {"baz" : true}}}
-                ],
-                "valid": false
-            },
-            {
-                "description": "unique array of arrays is valid",
-                "data": [["foo"], ["bar"]],
-                "valid": true
-            },
-            {
-                "description": "non-unique array of arrays is invalid",
-                "data": [["foo"], ["foo"]],
-                "valid": false
-            },
-            {
-                "description": "non-unique array of more than two arrays is invalid",
-                "data": [["foo"], ["bar"], ["foo"]],
-                "valid": false
-            },
-            {
-                "description": "1 and true are unique",
-                "data": [1, true],
-                "valid": true
-            },
-            {
-                "description": "0 and false are unique",
-                "data": [0, false],
-                "valid": true
-            },
-            {
-                "description": "[1] and [true] are unique",
-                "data": [[1], [true]],
-                "valid": true
-            },
-            {
-                "description": "[0] and [false] are unique",
-                "data": [[0], [false]],
-                "valid": true
-            },
-            {
-                "description": "nested [1] and [true] are unique",
-                "data": [[[1], "foo"], [[true], "foo"]],
-                "valid": true
-            },
-            {
-                "description": "nested [0] and [false] are unique",
-                "data": [[[0], "foo"], [[false], "foo"]],
-                "valid": true
-            },
-            {
-                "description": "unique heterogeneous types are valid",
-                "data": [{}, [1], true, null, 1, "{}"],
-                "valid": true
-            },
-            {
-                "description": "non-unique heterogeneous types are invalid",
-                "data": [{}, [1], true, null, {}, 1],
-                "valid": false
-            },
-            {
-                "description": "different objects are unique",
-                "data": [{"a": 1, "b": 2}, {"a": 2, "b": 1}],
-                "valid": true
-            },
-            {
-                "description": "objects are non-unique despite key order",
-                "data": [{"a": 1, "b": 2}, {"b": 2, "a": 1}],
-                "valid": false
-            },
-            {
-                "description": "{\"a\": false} and {\"a\": 0} are unique",
-                "data": [{"a": false}, {"a": 0}],
-                "valid": true
-            },
-            {
-                "description": "{\"a\": true} and {\"a\": 1} are unique",
-                "data": [{"a": true}, {"a": 1}],
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "uniqueItems with an array of items",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "prefixItems": [{"type": "boolean"}, {"type": "boolean"}],
-            "uniqueItems": true
-        },
-        "tests": [
-            {
-                "description": "[false, true] from items array is valid",
-                "data": [false, true],
-                "valid": true
-            },
-            {
-                "description": "[true, false] from items array is valid",
-                "data": [true, false],
-                "valid": true
-            },
-            {
-                "description": "[false, false] from items array is not valid",
-                "data": [false, false],
-                "valid": false
-            },
-            {
-                "description": "[true, true] from items array is not valid",
-                "data": [true, true],
-                "valid": false
-            },
-            {
-                "description": "unique array extended from [false, true] is valid",
-                "data": [false, true, "foo", "bar"],
-                "valid": true
-            },
-            {
-                "description": "unique array extended from [true, false] is valid",
-                "data": [true, false, "foo", "bar"],
-                "valid": true
-            },
-            {
-                "description": "non-unique array extended from [false, true] is not valid",
-                "data": [false, true, "foo", "foo"],
-                "valid": false
-            },
-            {
-                "description": "non-unique array extended from [true, false] is not valid",
-                "data": [true, false, "foo", "foo"],
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "uniqueItems with an array of items and additionalItems=false",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "prefixItems": [{"type": "boolean"}, {"type": "boolean"}],
-            "uniqueItems": true,
-            "items": false
-        },
-        "tests": [
-            {
-                "description": "[false, true] from items array is valid",
-                "data": [false, true],
-                "valid": true
-            },
-            {
-                "description": "[true, false] from items array is valid",
-                "data": [true, false],
-                "valid": true
-            },
-            {
-                "description": "[false, false] from items array is not valid",
-                "data": [false, false],
-                "valid": false
-            },
-            {
-                "description": "[true, true] from items array is not valid",
-                "data": [true, true],
-                "valid": false
-            },
-            {
-                "description": "extra items are invalid even if unique",
-                "data": [false, true, null],
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "uniqueItems=false validation",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "uniqueItems": false
-        },
-        "tests": [
-            {
-                "description": "unique array of integers is valid",
-                "data": [1, 2],
-                "valid": true
-            },
-            {
-                "description": "non-unique array of integers is valid",
-                "data": [1, 1],
-                "valid": true
-            },
-            {
-                "description": "numbers are unique if mathematically unequal",
-                "data": [1.0, 1.00, 1],
-                "valid": true
-            },
-            {
-                "description": "false is not equal to zero",
-                "data": [0, false],
-                "valid": true
-            },
-            {
-                "description": "true is not equal to one",
-                "data": [1, true],
-                "valid": true
-            },
-            {
-                "description": "unique array of objects is valid",
-                "data": [{"foo": "bar"}, {"foo": "baz"}],
-                "valid": true
-            },
-            {
-                "description": "non-unique array of objects is valid",
-                "data": [{"foo": "bar"}, {"foo": "bar"}],
-                "valid": true
-            },
-            {
-                "description": "unique array of nested objects is valid",
-                "data": [
-                    {"foo": {"bar" : {"baz" : true}}},
-                    {"foo": {"bar" : {"baz" : false}}}
-                ],
-                "valid": true
-            },
-            {
-                "description": "non-unique array of nested objects is valid",
-                "data": [
-                    {"foo": {"bar" : {"baz" : true}}},
-                    {"foo": {"bar" : {"baz" : true}}}
-                ],
-                "valid": true
-            },
-            {
-                "description": "unique array of arrays is valid",
-                "data": [["foo"], ["bar"]],
-                "valid": true
-            },
-            {
-                "description": "non-unique array of arrays is valid",
-                "data": [["foo"], ["foo"]],
-                "valid": true
-            },
-            {
-                "description": "1 and true are unique",
-                "data": [1, true],
-                "valid": true
-            },
-            {
-                "description": "0 and false are unique",
-                "data": [0, false],
-                "valid": true
-            },
-            {
-                "description": "unique heterogeneous types are valid",
-                "data": [{}, [1], true, null, 1],
-                "valid": true
-            },
-            {
-                "description": "non-unique heterogeneous types are valid",
-                "data": [{}, [1], true, null, {}, 1],
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "uniqueItems=false with an array of items",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "prefixItems": [{"type": "boolean"}, {"type": "boolean"}],
-            "uniqueItems": false
-        },
-        "tests": [
-            {
-                "description": "[false, true] from items array is valid",
-                "data": [false, true],
-                "valid": true
-            },
-            {
-                "description": "[true, false] from items array is valid",
-                "data": [true, false],
-                "valid": true
-            },
-            {
-                "description": "[false, false] from items array is valid",
-                "data": [false, false],
-                "valid": true
-            },
-            {
-                "description": "[true, true] from items array is valid",
-                "data": [true, true],
-                "valid": true
-            },
-            {
-                "description": "unique array extended from [false, true] is valid",
-                "data": [false, true, "foo", "bar"],
-                "valid": true
-            },
-            {
-                "description": "unique array extended from [true, false] is valid",
-                "data": [true, false, "foo", "bar"],
-                "valid": true
-            },
-            {
-                "description": "non-unique array extended from [false, true] is valid",
-                "data": [false, true, "foo", "foo"],
-                "valid": true
-            },
-            {
-                "description": "non-unique array extended from [true, false] is valid",
-                "data": [true, false, "foo", "foo"],
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "uniqueItems=false with an array of items and additionalItems=false",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "prefixItems": [{"type": "boolean"}, {"type": "boolean"}],
-            "uniqueItems": false,
-            "items": false
-        },
-        "tests": [
-            {
-                "description": "[false, true] from items array is valid",
-                "data": [false, true],
-                "valid": true
-            },
-            {
-                "description": "[true, false] from items array is valid",
-                "data": [true, false],
-                "valid": true
-            },
-            {
-                "description": "[false, false] from items array is valid",
-                "data": [false, false],
-                "valid": true
-            },
-            {
-                "description": "[true, true] from items array is valid",
-                "data": [true, true],
-                "valid": true
-            },
-            {
-                "description": "extra items are invalid even if unique",
-                "data": [false, true, null],
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft2020-12/unknownKeyword.json b/json/tests/draft2020-12/unknownKeyword.json
deleted file mode 100644
index 28b0c4c..0000000
--- a/json/tests/draft2020-12/unknownKeyword.json
+++ /dev/null
@@ -1,57 +0,0 @@
-[
-    {
-        "description": "$id inside an unknown keyword is not a real identifier",
-        "comment": "the implementation must not be confused by an $id in locations we do not know how to parse",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "$defs": {
-                "id_in_unknown0": {
-                    "not": {
-                        "array_of_schemas": [
-                            {
-                              "$id": "https://localhost:1234/draft2020-12/unknownKeyword/my_identifier.json",
-                              "type": "null"
-                            }
-                        ]
-                    }
-                },
-                "real_id_in_schema": {
-                    "$id": "https://localhost:1234/draft2020-12/unknownKeyword/my_identifier.json",
-                    "type": "string"
-                },
-                "id_in_unknown1": {
-                    "not": {
-                        "object_of_schemas": {
-                            "foo": {
-                              "$id": "https://localhost:1234/draft2020-12/unknownKeyword/my_identifier.json",
-                              "type": "integer"
-                            }
-                        }
-                    }
-                }
-            },
-            "anyOf": [
-                { "$ref": "#/$defs/id_in_unknown0" },
-                { "$ref": "#/$defs/id_in_unknown1" },
-                { "$ref": "https://localhost:1234/draft2020-12/unknownKeyword/my_identifier.json" }
-            ]
-        },
-        "tests": [
-            {
-                "description": "type matches second anyOf, which has a real schema in it",
-                "data": "a string",
-                "valid": true
-            },
-            {
-                "description": "type matches non-schema in first anyOf",
-                "data": null,
-                "valid": false
-            },
-            {
-                "description": "type matches non-schema in third anyOf",
-                "data": 1,
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft2020-12/vocabulary.json b/json/tests/draft2020-12/vocabulary.json
deleted file mode 100644
index d84f8f1..0000000
--- a/json/tests/draft2020-12/vocabulary.json
+++ /dev/null
@@ -1,38 +0,0 @@
-[
-    {
-        "description": "schema that uses custom metaschema with with no validation vocabulary",
-        "schema": {
-            "$id": "https://schema/using/no/validation",
-            "$schema": "http://localhost:1234/draft2020-12/metaschema-no-validation.json",
-            "properties": {
-                "badProperty": false,
-                "numberProperty": {
-                    "minimum": 10
-                }
-            }
-        },
-        "tests": [
-            {
-                "description": "applicator vocabulary still works",
-                "data": {
-                    "badProperty": "this property should not exist"
-                },
-                "valid": false
-            },
-            {
-                "description": "no validation: valid number",
-                "data": {
-                    "numberProperty": 20
-                },
-                "valid": true
-            },
-            {
-                "description": "no validation: invalid number, but it still validates",
-                "data": {
-                    "numberProperty": 1
-                },
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft3/additionalItems.json b/json/tests/draft3/additionalItems.json
deleted file mode 100644
index 0cb6687..0000000
--- a/json/tests/draft3/additionalItems.json
+++ /dev/null
@@ -1,128 +0,0 @@
-[
-    {
-        "description": "additionalItems as schema",
-        "schema": {
-            "items": [],
-            "additionalItems": {"type": "integer"}
-        },
-        "tests": [
-            {
-                "description": "additional items match schema",
-                "data": [ 1, 2, 3, 4 ],
-                "valid": true
-            },
-            {
-                "description": "additional items do not match schema",
-                "data": [ 1, 2, 3, "foo" ],
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "when items is schema, additionalItems does nothing",
-        "schema": {
-            "items": {},
-            "additionalItems": false
-        },
-        "tests": [
-            {
-                "description": "all items match schema",
-                "data": [ 1, 2, 3, 4, 5 ],
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "array of items with no additionalItems permitted",
-        "schema": {
-            "items": [{}, {}, {}],
-            "additionalItems": false
-        },
-        "tests": [
-            {
-                "description": "empty array",
-                "data": [ ],
-                "valid": true
-            },
-            {
-                "description": "fewer number of items present (1)",
-                "data": [ 1 ],
-                "valid": true
-            },
-            {
-                "description": "fewer number of items present (2)",
-                "data": [ 1, 2 ],
-                "valid": true
-            },
-            {
-                "description": "equal number of items present",
-                "data": [ 1, 2, 3 ],
-                "valid": true
-            },
-            {
-                "description": "additional items are not permitted",
-                "data": [ 1, 2, 3, 4 ],
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "additionalItems as false without items",
-        "schema": {"additionalItems": false},
-        "tests": [
-            {
-                "description":
-                    "items defaults to empty schema so everything is valid",
-                "data": [ 1, 2, 3, 4, 5 ],
-                "valid": true
-            },
-            {
-                "description": "ignores non-arrays",
-                "data": {"foo" : "bar"},
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "additionalItems are allowed by default",
-        "schema": {"items": [{"type": "integer"}]},
-        "tests": [
-            {
-                "description": "only the first item is validated",
-                "data": [1, "foo", false],
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "additionalItems does not look in applicators",
-        "schema": {
-            "extends": [
-                { "items": [ { "type": "integer" } ] }
-            ],
-            "additionalItems": { "type": "boolean" }
-        },
-        "tests": [
-            {
-                "description": "items defined in extends are not examined",
-                "data": [ 1, null ],
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "additionalItems with null instance elements",
-        "schema": {
-            "additionalItems": {
-                "type": "null"
-            }
-        },
-        "tests": [
-            {
-                "description": "allows null elements",
-                "data": [ null ],
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft3/additionalProperties.json b/json/tests/draft3/additionalProperties.json
deleted file mode 100644
index af7bfc6..0000000
--- a/json/tests/draft3/additionalProperties.json
+++ /dev/null
@@ -1,147 +0,0 @@
-[
-    {
-        "description":
-            "additionalProperties being false does not allow other properties",
-        "schema": {
-            "properties": {"foo": {}, "bar": {}},
-            "patternProperties": { "^v": {} },
-            "additionalProperties": false
-        },
-        "tests": [
-            {
-                "description": "no additional properties is valid",
-                "data": {"foo": 1},
-                "valid": true
-            },
-            {
-                "description": "an additional property is invalid",
-                "data": {"foo" : 1, "bar" : 2, "quux" : "boom"},
-                "valid": false
-            },
-            {
-                "description": "ignores arrays",
-                "data": [1, 2, 3],
-                "valid": true
-            },
-            {
-                "description": "ignores strings",
-                "data": "foobarbaz",
-                "valid": true
-            },
-            {
-                "description": "ignores other non-objects",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "patternProperties are not additional properties",
-                "data": {"foo":1, "vroom": 2},
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "non-ASCII pattern with additionalProperties",
-        "schema": {
-            "patternProperties": {"^á": {}},
-            "additionalProperties": false
-        },
-        "tests": [
-            {
-                "description": "matching the pattern is valid",
-                "data": {"ármányos": 2},
-                "valid": true
-            },
-            {
-                "description": "not matching the pattern is invalid",
-                "data": {"élmény": 2},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "additionalProperties with schema",
-        "schema": {
-            "properties": {"foo": {}, "bar": {}},
-            "additionalProperties": {"type": "boolean"}
-        },
-        "tests": [
-            {
-                "description": "no additional properties is valid",
-                "data": {"foo": 1},
-                "valid": true
-            },
-            {
-                "description": "an additional valid property is valid",
-                "data": {"foo" : 1, "bar" : 2, "quux" : true},
-                "valid": true
-            },
-            {
-                "description": "an additional invalid property is invalid",
-                "data": {"foo" : 1, "bar" : 2, "quux" : 12},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description":
-            "additionalProperties can exist by itself",
-        "schema": {
-            "additionalProperties": {"type": "boolean"}
-        },
-        "tests": [
-            {
-                "description": "an additional valid property is valid",
-                "data": {"foo" : true},
-                "valid": true
-            },
-            {
-                "description": "an additional invalid property is invalid",
-                "data": {"foo" : 1},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "additionalProperties are allowed by default",
-        "schema": {"properties": {"foo": {}, "bar": {}}},
-        "tests": [
-            {
-                "description": "additional properties are allowed",
-                "data": {"foo": 1, "bar": 2, "quux": true},
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "additionalProperties does not look in applicators",
-        "schema": {
-            "extends": [
-                {"properties": {"foo": {}}}
-            ],
-            "additionalProperties": {"type": "boolean"}
-        },
-        "tests": [
-            {
-                "description": "properties defined in extends are not examined",
-                "data": {"foo": 1, "bar": true},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "additionalProperties with null valued instance properties",
-        "schema": {
-            "additionalProperties": {
-                "type": "null"
-            }
-        },
-        "tests": [
-            {
-                "description": "allows null values",
-                "data": {"foo": null},
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft3/default.json b/json/tests/draft3/default.json
deleted file mode 100644
index 289a9b6..0000000
--- a/json/tests/draft3/default.json
+++ /dev/null
@@ -1,79 +0,0 @@
-[
-    {
-        "description": "invalid type for default",
-        "schema": {
-            "properties": {
-                "foo": {
-                    "type": "integer",
-                    "default": []
-                }
-            }
-        },
-        "tests": [
-            {
-                "description": "valid when property is specified",
-                "data": {"foo": 13},
-                "valid": true
-            },
-            {
-                "description": "still valid when the invalid default is used",
-                "data": {},
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "invalid string value for default",
-        "schema": {
-            "properties": {
-                "bar": {
-                    "type": "string",
-                    "minLength": 4,
-                    "default": "bad"
-                }
-            }
-        },
-        "tests": [
-            {
-                "description": "valid when property is specified",
-                "data": {"bar": "good"},
-                "valid": true
-            },
-            {
-                "description": "still valid when the invalid default is used",
-                "data": {},
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "the default keyword does not do anything if the property is missing",
-        "schema": {
-            "type": "object",
-            "properties": {
-                "alpha": {
-                    "type": "number",
-                    "maximum": 3,
-                    "default": 5
-                }
-            }
-        },
-        "tests": [
-            {
-                "description": "an explicit property value is checked against maximum (passing)",
-                "data": { "alpha": 1 },
-                "valid": true
-            },
-            {
-                "description": "an explicit property value is checked against maximum (failing)",
-                "data": { "alpha": 5 },
-                "valid": false
-            },
-            {
-                "description": "missing properties are not filled in with the default",
-                "data": {},
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft3/dependencies.json b/json/tests/draft3/dependencies.json
deleted file mode 100644
index 0ffa6bf..0000000
--- a/json/tests/draft3/dependencies.json
+++ /dev/null
@@ -1,123 +0,0 @@
-[
-    {
-        "description": "dependencies",
-        "schema": {
-            "dependencies": {"bar": "foo"}
-        },
-        "tests": [
-            {
-                "description": "neither",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "nondependant",
-                "data": {"foo": 1},
-                "valid": true
-            },
-            {
-                "description": "with dependency",
-                "data": {"foo": 1, "bar": 2},
-                "valid": true
-            },
-            {
-                "description": "missing dependency",
-                "data": {"bar": 2},
-                "valid": false
-            },
-            {
-                "description": "ignores arrays",
-                "data": ["bar"],
-                "valid": true
-            },
-            {
-                "description": "ignores strings",
-                "data": "foobar",
-                "valid": true
-            },
-            {
-                "description": "ignores other non-objects",
-                "data": 12,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "multiple dependencies",
-        "schema": {
-            "dependencies": {"quux": ["foo", "bar"]}
-        },
-        "tests": [
-            {
-                "description": "neither",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "nondependants",
-                "data": {"foo": 1, "bar": 2},
-                "valid": true
-            },
-            {
-                "description": "with dependencies",
-                "data": {"foo": 1, "bar": 2, "quux": 3},
-                "valid": true
-            },
-            {
-                "description": "missing dependency",
-                "data": {"foo": 1, "quux": 2},
-                "valid": false
-            },
-            {
-                "description": "missing other dependency",
-                "data": {"bar": 1, "quux": 2},
-                "valid": false
-            },
-            {
-                "description": "missing both dependencies",
-                "data": {"quux": 1},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "multiple dependencies subschema",
-        "schema": {
-            "dependencies": {
-                "bar": {
-                    "properties": {
-                        "foo": {"type": "integer"},
-                        "bar": {"type": "integer"}
-                    }
-                }
-            }
-        },
-        "tests": [
-            {
-                "description": "valid",
-                "data": {"foo": 1, "bar": 2},
-                "valid": true
-            },
-            {
-                "description": "no dependency",
-                "data": {"foo": "quux"},
-                "valid": true
-            },
-            {
-                "description": "wrong type",
-                "data": {"foo": "quux", "bar": 2},
-                "valid": false
-            },
-            {
-                "description": "wrong type other",
-                "data": {"foo": 2, "bar": "quux"},
-                "valid": false
-            },
-            {
-                "description": "wrong type both",
-                "data": {"foo": "quux", "bar": "quux"},
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft3/disallow.json b/json/tests/draft3/disallow.json
deleted file mode 100644
index a5c9d90..0000000
--- a/json/tests/draft3/disallow.json
+++ /dev/null
@@ -1,80 +0,0 @@
-[
-    {
-        "description": "disallow",
-        "schema": {
-            "disallow": "integer"
-        },
-        "tests": [
-            {
-                "description": "allowed",
-                "data": "foo",
-                "valid": true
-            },
-            {
-                "description": "disallowed",
-                "data": 1,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "multiple disallow",
-        "schema": {
-            "disallow": ["integer", "boolean"]
-        },
-        "tests": [
-            {
-                "description": "valid",
-                "data": "foo",
-                "valid": true
-            },
-            {
-                "description": "mismatch",
-                "data": 1,
-                "valid": false
-            },
-            {
-                "description": "other mismatch",
-                "data": true,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "multiple disallow subschema",
-        "schema": {
-            "disallow":
-                ["string",
-                 {
-                    "type": "object",
-                    "properties": {
-                        "foo": {
-                            "type": "string"
-                        }
-                    }
-                 }]
-        },
-        "tests": [
-            {
-                "description": "match",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "other match",
-                "data": {"foo": 1},
-                "valid": true
-            },
-            {
-                "description": "mismatch",
-                "data": "foo",
-                "valid": false
-            },
-            {
-                "description": "other mismatch",
-                "data": {"foo": "bar"},
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft3/divisibleBy.json b/json/tests/draft3/divisibleBy.json
deleted file mode 100644
index ef7cc14..0000000
--- a/json/tests/draft3/divisibleBy.json
+++ /dev/null
@@ -1,60 +0,0 @@
-[
-    {
-        "description": "by int",
-        "schema": {"divisibleBy": 2},
-        "tests": [
-            {
-                "description": "int by int",
-                "data": 10,
-                "valid": true
-            },
-            {
-                "description": "int by int fail",
-                "data": 7,
-                "valid": false
-            },
-            {
-                "description": "ignores non-numbers",
-                "data": "foo",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "by number",
-        "schema": {"divisibleBy": 1.5},
-        "tests": [
-            {
-                "description": "zero is divisible by anything (except 0)",
-                "data": 0,
-                "valid": true
-            },
-            {
-                "description": "4.5 is divisible by 1.5",
-                "data": 4.5,
-                "valid": true
-            },
-            {
-                "description": "35 is not divisible by 1.5",
-                "data": 35,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "by small number",
-        "schema": {"divisibleBy": 0.0001},
-        "tests": [
-            {
-                "description": "0.0075 is divisible by 0.0001",
-                "data": 0.0075,
-                "valid": true
-            },
-            {
-                "description": "0.00751 is not divisible by 0.0001",
-                "data": 0.00751,
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft3/enum.json b/json/tests/draft3/enum.json
deleted file mode 100644
index 5a1ab3b..0000000
--- a/json/tests/draft3/enum.json
+++ /dev/null
@@ -1,118 +0,0 @@
-[
-    {
-        "description": "simple enum validation",
-        "schema": {"enum": [1, 2, 3]},
-        "tests": [
-            {
-                "description": "one of the enum is valid",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "something else is invalid",
-                "data": 4,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "heterogeneous enum validation",
-        "schema": {"enum": [6, "foo", [], true, {"foo": 12}]},
-        "tests": [
-            {
-                "description": "one of the enum is valid",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "something else is invalid",
-                "data": null,
-                "valid": false
-            },
-            {
-                "description": "objects are deep compared",
-                "data": {"foo": false},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "heterogeneous enum-with-null validation",
-        "schema": { "enum": [6, null] },
-        "tests": [
-            {
-                "description": "null is valid",
-                "data": null,
-                "valid": true
-            },
-            {
-                "description": "number is valid",
-                "data": 6,
-                "valid": true
-            },
-            {
-                "description": "something else is invalid",
-                "data": "test",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "enums in properties",
-        "schema": {
-            "type":"object",
-            "properties": {
-                "foo": {"enum":["foo"]},
-                "bar": {"enum":["bar"], "required":true}
-            }
-        },
-        "tests": [
-            {
-                "description": "both properties are valid",
-                "data": {"foo":"foo", "bar":"bar"},
-                "valid": true
-            },
-            {
-                "description": "wrong foo value",
-                "data": {"foo":"foot", "bar":"bar"},
-                "valid": false
-            },
-            {
-                "description": "wrong bar value",
-                "data": {"foo":"foo", "bar":"bart"},
-                "valid": false
-            },
-            {
-                "description": "missing optional property is valid",
-                "data": {"bar":"bar"},
-                "valid": true
-            },
-            {
-                "description": "missing required property is invalid",
-                "data": {"foo":"foo"},
-                "valid": false
-            },
-            {
-                "description": "missing all properties is invalid",
-                "data": {},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "nul characters in strings",
-        "schema": { "enum": [ "hello\u0000there" ] },
-        "tests": [
-            {
-                "description": "match string with nul",
-                "data": "hello\u0000there",
-                "valid": true
-            },
-            {
-                "description": "do not match string lacking nul",
-                "data": "hellothere",
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft3/extends.json b/json/tests/draft3/extends.json
deleted file mode 100644
index 909bce5..0000000
--- a/json/tests/draft3/extends.json
+++ /dev/null
@@ -1,94 +0,0 @@
-[
-    {
-        "description": "extends",
-        "schema": {
-            "properties": {"bar": {"type": "integer", "required": true}},
-            "extends": {
-                "properties": {
-                    "foo": {"type": "string", "required": true}
-                }
-            }
-        },
-        "tests": [
-            {
-                "description": "extends",
-                "data": {"foo": "baz", "bar": 2},
-                "valid": true
-            },
-            {
-                "description": "mismatch extends",
-                "data": {"foo": "baz"},
-                "valid": false
-            },
-            {
-                "description": "mismatch extended",
-                "data": {"bar": 2},
-                "valid": false
-            },
-            {
-                "description": "wrong type",
-                "data": {"foo": "baz", "bar": "quux"},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "multiple extends",
-        "schema": {
-            "properties": {"bar": {"type": "integer", "required": true}},
-            "extends" : [
-                {
-                    "properties": {
-                        "foo": {"type": "string", "required": true}
-                    }
-                },
-                {
-                    "properties": {
-                        "baz": {"type": "null", "required": true}
-                    }
-                }
-            ]
-        },
-        "tests": [
-            {
-                "description": "valid",
-                "data": {"foo": "quux", "bar": 2, "baz": null},
-                "valid": true
-            },
-            {
-                "description": "mismatch first extends",
-                "data": {"bar": 2, "baz": null},
-                "valid": false
-            },
-            {
-                "description": "mismatch second extends",
-                "data": {"foo": "quux", "bar": 2},
-                "valid": false
-            },
-            {
-                "description": "mismatch both",
-                "data": {"bar": 2},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "extends simple types",
-        "schema": {
-            "minimum": 20,
-            "extends": {"maximum": 30}
-        },
-        "tests": [
-            {
-                "description": "valid",
-                "data": 25,
-                "valid": true
-            },
-            {
-                "description": "mismatch extends",
-                "data": 35,
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft3/format.json b/json/tests/draft3/format.json
deleted file mode 100644
index a5447c9..0000000
--- a/json/tests/draft3/format.json
+++ /dev/null
@@ -1,362 +0,0 @@
-[
-    {
-        "description": "email format",
-        "schema": { "format": "email" },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "ip-address format",
-        "schema": { "format": "ip-address" },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "ipv6 format",
-        "schema": { "format": "ipv6" },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "host-name format",
-        "schema": { "format": "host-name" },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "date-time format",
-        "schema": { "format": "date-time" },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "regex format",
-        "schema": { "format": "regex" },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "date format",
-        "schema": { "format": "date" },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "time format",
-        "schema": { "format": "time" },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "color format",
-        "schema": { "format": "color" },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "uri format",
-        "schema": { "format": "uri" },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft3/infinite-loop-detection.json b/json/tests/draft3/infinite-loop-detection.json
deleted file mode 100644
index 090f49a..0000000
--- a/json/tests/draft3/infinite-loop-detection.json
+++ /dev/null
@@ -1,32 +0,0 @@
-[
-    {
-        "description": "evaluating the same schema location against the same data location twice is not a sign of an infinite loop",
-        "schema": {
-            "definitions": {
-                "int": { "type": "integer" }
-            },
-            "properties": {
-                "foo": {
-                    "$ref": "#/definitions/int"
-                }
-            },
-            "extends": {
-                "additionalProperties": {
-                    "$ref": "#/definitions/int"
-                }
-            }
-        },
-        "tests": [
-            {
-                "description": "passing case",
-                "data": { "foo": 1 },
-                "valid": true
-            },
-            {
-                "description": "failing case",
-                "data": { "foo": "a string" },
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft3/items.json b/json/tests/draft3/items.json
deleted file mode 100644
index e8bda22..0000000
--- a/json/tests/draft3/items.json
+++ /dev/null
@@ -1,78 +0,0 @@
-[
-    {
-        "description": "a schema given for items",
-        "schema": {
-            "items": {"type": "integer"}
-        },
-        "tests": [
-            {
-                "description": "valid items",
-                "data": [ 1, 2, 3 ],
-                "valid": true
-            },
-            {
-                "description": "wrong type of items",
-                "data": [1, "x"],
-                "valid": false
-            },
-            {
-                "description": "ignores non-arrays",
-                "data": {"foo" : "bar"},
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "an array of schemas for items",
-        "schema": {
-            "items": [
-                {"type": "integer"},
-                {"type": "string"}
-            ]
-        },
-        "tests": [
-            {
-                "description": "correct types",
-                "data": [ 1, "foo" ],
-                "valid": true
-            },
-            {
-                "description": "wrong types",
-                "data": [ "foo", 1 ],
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "items with null instance elements",
-        "schema": {
-            "items": {
-                "type": "null"
-            }
-        },
-        "tests": [
-            {
-                "description": "allows null elements",
-                "data": [ null ],
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "array-form items with null instance elements",
-        "schema": {
-            "items": [
-                {
-                    "type": "null"
-                }
-            ]
-        },
-        "tests": [
-            {
-                "description": "allows null elements",
-                "data": [ null ],
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft3/maxItems.json b/json/tests/draft3/maxItems.json
deleted file mode 100644
index 3b53a6b..0000000
--- a/json/tests/draft3/maxItems.json
+++ /dev/null
@@ -1,28 +0,0 @@
-[
-    {
-        "description": "maxItems validation",
-        "schema": {"maxItems": 2},
-        "tests": [
-            {
-                "description": "shorter is valid",
-                "data": [1],
-                "valid": true
-            },
-            {
-                "description": "exact length is valid",
-                "data": [1, 2],
-                "valid": true
-            },
-            {
-                "description": "too long is invalid",
-                "data": [1, 2, 3],
-                "valid": false
-            },
-            {
-                "description": "ignores non-arrays",
-                "data": "foobar",
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft3/maxLength.json b/json/tests/draft3/maxLength.json
deleted file mode 100644
index 4de42bc..0000000
--- a/json/tests/draft3/maxLength.json
+++ /dev/null
@@ -1,33 +0,0 @@
-[
-    {
-        "description": "maxLength validation",
-        "schema": {"maxLength": 2},
-        "tests": [
-            {
-                "description": "shorter is valid",
-                "data": "f",
-                "valid": true
-            },
-            {
-                "description": "exact length is valid",
-                "data": "fo",
-                "valid": true
-            },
-            {
-                "description": "too long is invalid",
-                "data": "foo",
-                "valid": false
-            },
-            {
-                "description": "ignores non-strings",
-                "data": 10,
-                "valid": true
-            },
-            {
-                "description": "two supplementary Unicode code points is long enough",
-                "data": "\uD83D\uDCA9\uD83D\uDCA9",
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft3/maximum.json b/json/tests/draft3/maximum.json
deleted file mode 100644
index ccb79c6..0000000
--- a/json/tests/draft3/maximum.json
+++ /dev/null
@@ -1,99 +0,0 @@
-[
-    {
-        "description": "maximum validation",
-        "schema": {"maximum": 3.0},
-        "tests": [
-            {
-                "description": "below the maximum is valid",
-                "data": 2.6,
-                "valid": true
-            },
-            {
-                "description": "boundary point is valid",
-                "data": 3.0,
-                "valid": true
-            },
-            {
-                "description": "above the maximum is invalid",
-                "data": 3.5,
-                "valid": false
-            },
-            {
-                "description": "ignores non-numbers",
-                "data": "x",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "maximum validation with unsigned integer",
-        "schema": {"maximum": 300},
-        "tests":  [
-            {
-                "description": "below the maximum is invalid",
-                "data": 299.97,
-                "valid": true
-            },
-            {
-                "description": "boundary point integer is valid",
-                "data": 300,
-                "valid": true
-            },
-            {
-                "description": "boundary point float is valid",
-                "data": 300.00,
-                "valid": true
-            },
-            {
-                "description": "above the maximum is invalid",
-                "data": 300.5,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "maximum validation (explicit false exclusivity)",
-        "schema": {"maximum": 3.0, "exclusiveMaximum": false},
-        "tests": [
-            {
-                "description": "below the maximum is valid",
-                "data": 2.6,
-                "valid": true
-            },
-            {
-                "description": "boundary point is valid",
-                "data": 3.0,
-                "valid": true
-            },
-            {
-                "description": "above the maximum is invalid",
-                "data": 3.5,
-                "valid": false
-            },
-            {
-                "description": "ignores non-numbers",
-                "data": "x",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "exclusiveMaximum validation",
-        "schema": {
-            "maximum": 3.0,
-            "exclusiveMaximum": true
-        },
-        "tests": [
-            {
-                "description": "below the maximum is still valid",
-                "data": 2.2,
-                "valid": true
-            },
-            {
-                "description": "boundary point is invalid",
-                "data": 3.0,
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft3/minItems.json b/json/tests/draft3/minItems.json
deleted file mode 100644
index ed51188..0000000
--- a/json/tests/draft3/minItems.json
+++ /dev/null
@@ -1,28 +0,0 @@
-[
-    {
-        "description": "minItems validation",
-        "schema": {"minItems": 1},
-        "tests": [
-            {
-                "description": "longer is valid",
-                "data": [1, 2],
-                "valid": true
-            },
-            {
-                "description": "exact length is valid",
-                "data": [1],
-                "valid": true
-            },
-            {
-                "description": "too short is invalid",
-                "data": [],
-                "valid": false
-            },
-            {
-                "description": "ignores non-arrays",
-                "data": "",
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft3/minLength.json b/json/tests/draft3/minLength.json
deleted file mode 100644
index 3f09158..0000000
--- a/json/tests/draft3/minLength.json
+++ /dev/null
@@ -1,33 +0,0 @@
-[
-    {
-        "description": "minLength validation",
-        "schema": {"minLength": 2},
-        "tests": [
-            {
-                "description": "longer is valid",
-                "data": "foo",
-                "valid": true
-            },
-            {
-                "description": "exact length is valid",
-                "data": "fo",
-                "valid": true
-            },
-            {
-                "description": "too short is invalid",
-                "data": "f",
-                "valid": false
-            },
-            {
-                "description": "ignores non-strings",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "one supplementary Unicode code point is not long enough",
-                "data": "\uD83D\uDCA9",
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft3/minimum.json b/json/tests/draft3/minimum.json
deleted file mode 100644
index d579536..0000000
--- a/json/tests/draft3/minimum.json
+++ /dev/null
@@ -1,88 +0,0 @@
-[
-    {
-        "description": "minimum validation",
-        "schema": {"minimum": 1.1},
-        "tests": [
-            {
-                "description": "above the minimum is valid",
-                "data": 2.6,
-                "valid": true
-            },
-            {
-                "description": "boundary point is valid",
-                "data": 1.1,
-                "valid": true
-            },
-            {
-                "description": "below the minimum is invalid",
-                "data": 0.6,
-                "valid": false
-            },
-            {
-                "description": "ignores non-numbers",
-                "data": "x",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "exclusiveMinimum validation",
-        "schema": {
-            "minimum": 1.1,
-            "exclusiveMinimum": true
-        },
-        "tests": [
-            {
-                "description": "above the minimum is still valid",
-                "data": 1.2,
-                "valid": true
-            },
-            {
-                "description": "boundary point is invalid",
-                "data": 1.1,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "minimum validation with signed integer",
-        "schema": {"minimum": -2},
-        "tests": [
-            {
-                "description": "negative above the minimum is valid",
-                "data": -1,
-                "valid": true
-            },
-            {
-                "description": "positive above the minimum is valid",
-                "data": 0,
-                "valid": true
-            },
-            {
-                "description": "boundary point is valid",
-                "data": -2,
-                "valid": true
-            },
-            {
-                "description": "boundary point with float is valid",
-                "data": -2.0,
-                "valid": true
-            },
-            {
-                "description": "float below the minimum is invalid",
-                "data": -2.0001,
-                "valid": false
-            },
-            {
-                "description": "int below the minimum is invalid",
-                "data": -3,
-                "valid": false
-            },
-            {
-                "description": "ignores non-numbers",
-                "data": "x",
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft3/optional/bignum.json b/json/tests/draft3/optional/bignum.json
deleted file mode 100644
index 1bc8eb2..0000000
--- a/json/tests/draft3/optional/bignum.json
+++ /dev/null
@@ -1,95 +0,0 @@
-[
-    {
-        "description": "integer",
-        "schema": { "type": "integer" },
-        "tests": [
-            {
-                "description": "a bignum is an integer",
-                "data": 12345678910111213141516171819202122232425262728293031,
-                "valid": true
-            },
-            {
-                "description": "a negative bignum is an integer",
-                "data": -12345678910111213141516171819202122232425262728293031,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "number",
-        "schema": { "type": "number" },
-        "tests": [
-            {
-                "description": "a bignum is a number",
-                "data": 98249283749234923498293171823948729348710298301928331,
-                "valid": true
-            },
-            {
-                "description": "a negative bignum is a number",
-                "data": -98249283749234923498293171823948729348710298301928331,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "string",
-        "schema": { "type": "string" },
-        "tests": [
-            {
-                "description": "a bignum is not a string",
-                "data": 98249283749234923498293171823948729348710298301928331,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "maximum integer comparison",
-        "schema": { "maximum": 18446744073709551615 },
-        "tests": [
-            {
-                "description": "comparison works for high numbers",
-                "data": 18446744073709551600,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "float comparison with high precision",
-        "schema": {
-            "maximum": 972783798187987123879878123.18878137,
-            "exclusiveMaximum": true
-        },
-        "tests": [
-            {
-                "description": "comparison works for high numbers",
-                "data": 972783798187987123879878123.188781371,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "minimum integer comparison",
-        "schema": { "minimum": -18446744073709551615 },
-        "tests": [
-            {
-                "description": "comparison works for very negative numbers",
-                "data": -18446744073709551600,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "float comparison with high precision on negative numbers",
-        "schema": {
-            "minimum": -972783798187987123879878123.18878137,
-            "exclusiveMinimum": true
-        },
-        "tests": [
-            {
-                "description": "comparison works for very negative numbers",
-                "data": -972783798187987123879878123.188781371,
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft3/optional/ecmascript-regex.json b/json/tests/draft3/optional/ecmascript-regex.json
deleted file mode 100644
index 03fe977..0000000
--- a/json/tests/draft3/optional/ecmascript-regex.json
+++ /dev/null
@@ -1,18 +0,0 @@
-[
-    {
-        "description": "ECMA 262 regex dialect recognition",
-        "schema": { "format": "regex" },
-        "tests": [
-            {
-                "description": "[^] is a valid regex",
-                "data": "[^]",
-                "valid": true
-            },
-            {
-                "description": "ECMA 262 has no support for lookbehind",
-                "data": "(?<=foo)bar",
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft3/optional/format/color.json b/json/tests/draft3/optional/format/color.json
deleted file mode 100644
index 0c0b534..0000000
--- a/json/tests/draft3/optional/format/color.json
+++ /dev/null
@@ -1,38 +0,0 @@
-[
-    {
-        "description": "validation of CSS colors",
-        "schema": { "format": "color" },
-        "tests": [
-            {
-                "description": "a valid CSS color name",
-                "data": "fuchsia",
-                "valid": true
-            },
-            {
-                "description": "a valid six-digit CSS color code",
-                "data": "#CC8899",
-                "valid": true
-            },
-            {
-                "description": "a valid three-digit CSS color code",
-                "data": "#C89",
-                "valid": true
-            },
-            {
-                "description": "an invalid CSS color code",
-                "data": "#00332520",
-                "valid": false
-            },
-            {
-                "description": "an invalid CSS color name",
-                "data": "puce",
-                "valid": false
-            },
-            {
-                "description": "a CSS color name containing invalid characters",
-                "data": "light_grayish_red-violet",
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft3/optional/format/date-time.json b/json/tests/draft3/optional/format/date-time.json
deleted file mode 100644
index 1f1e6fb..0000000
--- a/json/tests/draft3/optional/format/date-time.json
+++ /dev/null
@@ -1,38 +0,0 @@
-[
-    {
-        "description": "validation of date-time strings",
-        "schema": { "format": "date-time" },
-        "tests": [
-            {
-                "description": "a valid date-time string",
-                "data": "1963-06-19T08:30:06.283185Z",
-                "valid": true
-            },
-            {
-                "description": "an invalid date-time string",
-                "data": "06/19/1963 08:30:06 PST",
-                "valid": false
-            },
-            {
-                "description": "case-insensitive T and Z",
-                "data": "1963-06-19t08:30:06.283185z",
-                "valid": true
-            },
-            {
-                "description": "only RFC3339 not all of ISO 8601 are valid",
-                "data": "2013-350T01:01:01",
-                "valid": false
-            },
-            {
-                "description": "invalid non-padded month dates",
-                "data": "1963-6-19T08:30:06.283185Z",
-                "valid": false
-            },
-            {
-                "description": "invalid non-padded day dates",
-                "data": "1963-06-1T08:30:06.283185Z",
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft3/optional/format/date.json b/json/tests/draft3/optional/format/date.json
deleted file mode 100644
index 796bc46..0000000
--- a/json/tests/draft3/optional/format/date.json
+++ /dev/null
@@ -1,168 +0,0 @@
-[
-    {
-        "description": "validation of date strings",
-        "schema": { "format": "date" },
-        "tests": [
-            {
-                "description": "a valid date string",
-                "data": "1963-06-19",
-                "valid": true
-            },
-            {
-                "description": "a valid date string with 31 days in January",
-                "data": "2020-01-31",
-                "valid": true
-            },
-            {
-                "description": "a invalid date string with 32 days in January",
-                "data": "2020-01-32",
-                "valid": false
-            },
-            {
-                "description": "a valid date string with 28 days in February (normal)",
-                "data": "2021-02-28",
-                "valid": true
-            },
-            {
-                "description": "a invalid date string with 29 days in February (normal)",
-                "data": "2021-02-29",
-                "valid": false
-            },
-            {
-                "description": "a valid date string with 29 days in February (leap)",
-                "data": "2020-02-29",
-                "valid": true
-            },
-            {
-                "description": "a invalid date string with 30 days in February (leap)",
-                "data": "2020-02-30",
-                "valid": false
-            },
-            {
-                "description": "a valid date string with 31 days in March",
-                "data": "2020-03-31",
-                "valid": true
-            },
-            {
-                "description": "a invalid date string with 32 days in March",
-                "data": "2020-03-32",
-                "valid": false
-            },
-            {
-                "description": "a valid date string with 30 days in April",
-                "data": "2020-04-30",
-                "valid": true
-            },
-            {
-                "description": "a invalid date string with 31 days in April",
-                "data": "2020-04-31",
-                "valid": false
-            },
-            {
-                "description": "a valid date string with 31 days in May",
-                "data": "2020-05-31",
-                "valid": true
-            },
-            {
-                "description": "a invalid date string with 32 days in May",
-                "data": "2020-05-32",
-                "valid": false
-            },
-            {
-                "description": "a valid date string with 30 days in June",
-                "data": "2020-06-30",
-                "valid": true
-            },
-            {
-                "description": "a invalid date string with 31 days in June",
-                "data": "2020-06-31",
-                "valid": false
-            },
-            {
-                "description": "a valid date string with 31 days in July",
-                "data": "2020-07-31",
-                "valid": true
-            },
-            {
-                "description": "a invalid date string with 32 days in July",
-                "data": "2020-07-32",
-                "valid": false
-            },
-            {
-                "description": "a valid date string with 31 days in August",
-                "data": "2020-08-31",
-                "valid": true
-            },
-            {
-                "description": "a invalid date string with 32 days in August",
-                "data": "2020-08-32",
-                "valid": false
-            },
-            {
-                "description": "a valid date string with 30 days in September",
-                "data": "2020-09-30",
-                "valid": true
-            },
-            {
-                "description": "a invalid date string with 31 days in September",
-                "data": "2020-09-31",
-                "valid": false
-            },
-            {
-                "description": "a valid date string with 31 days in October",
-                "data": "2020-10-31",
-                "valid": true
-            },
-            {
-                "description": "a invalid date string with 32 days in October",
-                "data": "2020-10-32",
-                "valid": false
-            },
-            {
-                "description": "a valid date string with 30 days in November",
-                "data": "2020-11-30",
-                "valid": true
-            },
-            {
-                "description": "a invalid date string with 31 days in November",
-                "data": "2020-11-31",
-                "valid": false
-            },
-            {
-                "description": "a valid date string with 31 days in December",
-                "data": "2020-12-31",
-                "valid": true
-            },
-            {
-                "description": "a invalid date string with 32 days in December",
-                "data": "2020-12-32",
-                "valid": false
-            },
-            {
-                "description": "a invalid date string with invalid month",
-                "data": "2020-13-01",
-                "valid": false
-            },
-            {
-                "description": "an invalid date string",
-                "data": "06/19/1963",
-                "valid": false
-            },
-            {
-                "description": "only RFC3339 not all of ISO 8601 are valid",
-                "data": "2013-350",
-                "valid": false
-            },
-            {
-                "description": "invalidates non-padded month dates",
-                "data": "1998-1-20",
-                "valid": false
-            },
-            {
-                "description": "invalidates non-padded day dates",
-                "data": "1998-01-1",
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft3/optional/format/email.json b/json/tests/draft3/optional/format/email.json
deleted file mode 100644
index 059615a..0000000
--- a/json/tests/draft3/optional/format/email.json
+++ /dev/null
@@ -1,53 +0,0 @@
-[
-    {
-        "description": "validation of e-mail addresses",
-        "schema": { "format": "email" },
-        "tests": [
-            {
-                "description": "a valid e-mail address",
-                "data": "joe.bloggs@example.com",
-                "valid": true
-            },
-            {
-                "description": "an invalid e-mail address",
-                "data": "2962",
-                "valid": false
-            },
-            {
-                "description": "tilde in local part is valid",
-                "data": "te~st@example.com",
-                "valid": true
-            },
-            {
-                "description": "tilde before local part is valid",
-                "data": "~test@example.com",
-                "valid": true
-            },
-            {
-                "description": "tilde after local part is valid",
-                "data": "test~@example.com",
-                "valid": true
-            },
-            {
-                "description": "dot before local part is not valid",
-                "data": ".test@example.com",
-                "valid": false
-            },
-            {
-                "description": "dot after local part is not valid",
-                "data": "test.@example.com",
-                "valid": false
-            },
-            {
-                "description": "two separated dots inside local part are valid",
-                "data": "te.s.t@example.com",
-                "valid": true
-            },
-            {
-                "description": "two subsequent dots inside local part are not valid",
-                "data": "te..st@example.com",
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft3/optional/format/host-name.json b/json/tests/draft3/optional/format/host-name.json
deleted file mode 100644
index d418f37..0000000
--- a/json/tests/draft3/optional/format/host-name.json
+++ /dev/null
@@ -1,63 +0,0 @@
-[
-    {
-        "description": "validation of host names",
-        "schema": { "format": "host-name" },
-        "tests": [
-            {
-                "description": "a valid host name",
-                "data": "www.example.com",
-                "valid": true
-            },
-            {
-                "description": "a host name starting with an illegal character",
-                "data": "-a-host-name-that-starts-with--",
-                "valid": false
-            },
-            {
-                "description": "a host name containing illegal characters",
-                "data": "not_a_valid_host_name",
-                "valid": false
-            },
-            {
-                "description": "a host name with a component too long",
-                "data": "a-vvvvvvvvvvvvvvvveeeeeeeeeeeeeeeerrrrrrrrrrrrrrrryyyyyyyyyyyyyyyy-long-host-name-component",
-                "valid": false
-            },
-            {
-                "description": "starts with hyphen",
-                "data": "-hostname",
-                "valid": false
-            },
-            {
-                "description": "ends with hyphen",
-                "data": "hostname-",
-                "valid": false
-            },
-            {
-                "description": "starts with underscore",
-                "data": "_hostname",
-                "valid": false
-            },
-            {
-                "description": "ends with underscore",
-                "data": "hostname_",
-                "valid": false
-            },
-            {
-                "description": "contains underscore",
-                "data": "host_name",
-                "valid": false
-            },
-            {
-                "description": "maximum label length",
-                "data": "abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijk.com",
-                "valid": true
-            },
-            {
-                "description": "exceeds maximum label length",
-                "data": "abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijkl.com",
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft3/optional/format/ip-address.json b/json/tests/draft3/optional/format/ip-address.json
deleted file mode 100644
index 91cac9f..0000000
--- a/json/tests/draft3/optional/format/ip-address.json
+++ /dev/null
@@ -1,23 +0,0 @@
-[
-    {
-        "description": "validation of IP addresses",
-        "schema": { "format": "ip-address" },
-        "tests": [
-            {
-                "description": "a valid IP address",
-                "data": "192.168.0.1",
-                "valid": true
-            },
-            {
-                "description": "an IP address with too many components",
-                "data": "127.0.0.0.1",
-                "valid": false
-            },
-            {
-                "description": "an IP address with out-of-range values",
-                "data": "256.256.256.256",
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft3/optional/format/ipv6.json b/json/tests/draft3/optional/format/ipv6.json
deleted file mode 100644
index c3ef379..0000000
--- a/json/tests/draft3/optional/format/ipv6.json
+++ /dev/null
@@ -1,68 +0,0 @@
-[
-    {
-        "description": "validation of IPv6 addresses",
-        "schema": { "format": "ipv6" },
-        "tests": [
-            {
-                "description": "a valid IPv6 address",
-                "data": "::1",
-                "valid": true
-            },
-            {
-                "description": "an IPv6 address with out-of-range values",
-                "data": "12345::",
-                "valid": false
-            },
-            {
-                "description": "an IPv6 address with too many components",
-                "data": "1:1:1:1:1:1:1:1:1:1:1:1:1:1:1:1",
-                "valid": false
-            },
-            {
-                "description": "an IPv6 address containing illegal characters",
-                "data": "::laptop",
-                "valid": false
-            },
-            {
-                "description": "no digits is valid",
-                "data": "::",
-                "valid": true
-            },
-            {
-                "description": "leading colons is valid",
-                "data": "::1",
-                "valid": true
-            },
-            {
-                "description": "trailing colons is valid",
-                "data": "d6::",
-                "valid": true
-            },
-            {
-                "description": "two sets of double colons is invalid",
-                "data": "1::d6::42",
-                "valid": false
-            },
-            {
-                "description": "mixed format with the ipv4 section as decimal octets",
-                "data": "1::d6:192.168.0.1",
-                "valid": true
-            },
-            {
-                "description": "mixed format with double colons between the sections",
-                "data": "1:2::192.168.0.1",
-                "valid": true
-            },
-            {
-                "description": "mixed format with ipv4 section with octet out of range",
-                "data": "1::2:192.168.256.1",
-                "valid": false
-            },
-            {
-                "description": "mixed format with ipv4 section with a hex octet",
-                "data": "1::2:192.168.ff.1",
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft3/optional/format/regex.json b/json/tests/draft3/optional/format/regex.json
deleted file mode 100644
index 8a37763..0000000
--- a/json/tests/draft3/optional/format/regex.json
+++ /dev/null
@@ -1,18 +0,0 @@
-[
-    {
-        "description": "validation of regular expressions",
-        "schema": { "format": "regex" },
-        "tests": [
-            {
-                "description": "a valid regular expression",
-                "data": "([abc])+\\s+$",
-                "valid": true
-            },
-            {
-                "description": "a regular expression with unclosed parens is invalid",
-                "data": "^(abc]",
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft3/optional/format/time.json b/json/tests/draft3/optional/format/time.json
deleted file mode 100644
index 36c823e..0000000
--- a/json/tests/draft3/optional/format/time.json
+++ /dev/null
@@ -1,18 +0,0 @@
-[
-    {
-        "description": "validation of time strings",
-        "schema": { "format": "time" },
-        "tests": [
-            {
-                "description": "a valid time string",
-                "data": "08:30:06",
-                "valid": true
-            },
-            {
-                "description": "an invalid time string",
-                "data": "8:30 AM",
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft3/optional/format/uri.json b/json/tests/draft3/optional/format/uri.json
deleted file mode 100644
index f024b62..0000000
--- a/json/tests/draft3/optional/format/uri.json
+++ /dev/null
@@ -1,28 +0,0 @@
-[
-    {
-        "description": "validation of URIs",
-        "schema": { "format": "uri" },
-        "tests": [
-            {
-                "description": "a valid URI",
-                "data": "http://foo.bar/?baz=qux#quux",
-                "valid": true
-            },
-            {
-                "description": "an invalid protocol-relative URI Reference",
-                "data": "//foo.bar/?baz=qux#quux",
-                "valid": false
-            },
-            {
-                "description": "an invalid URI",
-                "data": "\\\\WINDOWS\\fileshare",
-                "valid": false
-            },
-            {
-                "description": "an invalid URI though valid URI reference",
-                "data": "abc",
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft3/optional/non-bmp-regex.json b/json/tests/draft3/optional/non-bmp-regex.json
deleted file mode 100644
index dd67af2..0000000
--- a/json/tests/draft3/optional/non-bmp-regex.json
+++ /dev/null
@@ -1,82 +0,0 @@
-[
-    {
-        "description": "Proper UTF-16 surrogate pair handling: pattern",
-        "comment": "Optional because .Net doesn't correctly handle 32-bit Unicode characters",
-        "schema": { "pattern": "^🐲*$" },
-        "tests": [
-            {
-                "description": "matches empty",
-                "data": "",
-                "valid": true
-            },
-            {
-                "description": "matches single",
-                "data": "🐲",
-                "valid": true
-            },
-            {
-                "description": "matches two",
-                "data": "🐲🐲",
-                "valid": true
-            },
-            {
-                "description": "doesn't match one",
-                "data": "🐉",
-                "valid": false
-            },
-            {
-                "description": "doesn't match two",
-                "data": "🐉🐉",
-                "valid": false
-            },
-            {
-                "description": "doesn't match one ASCII",
-                "data": "D",
-                "valid": false
-            },
-            {
-                "description": "doesn't match two ASCII",
-                "data": "DD",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "Proper UTF-16 surrogate pair handling: patternProperties",
-        "comment": "Optional because .Net doesn't correctly handle 32-bit Unicode characters",
-        "schema": {
-            "patternProperties": {
-                "^🐲*$": {
-                    "type": "integer"
-                }
-            }
-        },
-        "tests": [
-            {
-                "description": "matches empty",
-                "data": { "": 1 },
-                "valid": true
-            },
-            {
-                "description": "matches single",
-                "data": { "🐲": 1 },
-                "valid": true
-            },
-            {
-                "description": "matches two",
-                "data": { "🐲🐲": 1 },
-                "valid": true
-            },
-            {
-                "description": "doesn't match one",
-                "data": { "🐲": "hello" },
-                "valid": false
-            },
-            {
-                "description": "doesn't match two",
-                "data": { "🐲🐲": "hello" },
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft3/optional/zeroTerminatedFloats.json b/json/tests/draft3/optional/zeroTerminatedFloats.json
deleted file mode 100644
index 9b50ea2..0000000
--- a/json/tests/draft3/optional/zeroTerminatedFloats.json
+++ /dev/null
@@ -1,15 +0,0 @@
-[
-    {
-        "description": "some languages do not distinguish between different types of numeric value",
-        "schema": {
-            "type": "integer"
-        },
-        "tests": [
-            {
-                "description": "a float is not an integer even without fractional part",
-                "data": 1.0,
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft3/pattern.json b/json/tests/draft3/pattern.json
deleted file mode 100644
index 92db0f9..0000000
--- a/json/tests/draft3/pattern.json
+++ /dev/null
@@ -1,59 +0,0 @@
-[
-    {
-        "description": "pattern validation",
-        "schema": {"pattern": "^a*$"},
-        "tests": [
-            {
-                "description": "a matching pattern is valid",
-                "data": "aaa",
-                "valid": true
-            },
-            {
-                "description": "a non-matching pattern is invalid",
-                "data": "abc",
-                "valid": false
-            },
-            {
-                "description": "ignores booleans",
-                "data": true,
-                "valid": true
-            },
-            {
-                "description": "ignores integers",
-                "data": 123,
-                "valid": true
-            },
-            {
-                "description": "ignores floats",
-                "data": 1.0,
-                "valid": true
-            },
-            {
-                "description": "ignores objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "ignores arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "ignores null",
-                "data": null,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "pattern is not anchored",
-        "schema": {"pattern": "a+"},
-        "tests": [
-            {
-                "description": "matches a substring",
-                "data": "xxaayy",
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft3/patternProperties.json b/json/tests/draft3/patternProperties.json
deleted file mode 100644
index b0f2a8e..0000000
--- a/json/tests/draft3/patternProperties.json
+++ /dev/null
@@ -1,130 +0,0 @@
-[
-    {
-        "description":
-            "patternProperties validates properties matching a regex",
-        "schema": {
-            "patternProperties": {
-                "f.*o": {"type": "integer"}
-            }
-        },
-        "tests": [
-            {
-                "description": "a single valid match is valid",
-                "data": {"foo": 1},
-                "valid": true
-            },
-            {
-                "description": "multiple valid matches is valid",
-                "data": {"foo": 1, "foooooo" : 2},
-                "valid": true
-            },
-            {
-                "description": "a single invalid match is invalid",
-                "data": {"foo": "bar", "fooooo": 2},
-                "valid": false
-            },
-            {
-                "description": "multiple invalid matches is invalid",
-                "data": {"foo": "bar", "foooooo" : "baz"},
-                "valid": false
-            },
-            {
-                "description": "ignores arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "ignores other non-objects",
-                "data": 12,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "multiple simultaneous patternProperties are validated",
-        "schema": {
-            "patternProperties": {
-                "a*": {"type": "integer"},
-                "aaa*": {"maximum": 20}
-            }
-        },
-        "tests": [
-            {
-                "description": "a single valid match is valid",
-                "data": {"a": 21},
-                "valid": true
-            },
-            {
-                "description": "a simultaneous match is valid",
-                "data": {"aaaa": 18},
-                "valid": true
-            },
-            {
-                "description": "multiple matches is valid",
-                "data": {"a": 21, "aaaa": 18},
-                "valid": true
-            },
-            {
-                "description": "an invalid due to one is invalid",
-                "data": {"a": "bar"},
-                "valid": false
-            },
-            {
-                "description": "an invalid due to the other is invalid",
-                "data": {"aaaa": 31},
-                "valid": false
-            },
-            {
-                "description": "an invalid due to both is invalid",
-                "data": {"aaa": "foo", "aaaa": 31},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "regexes are not anchored by default and are case sensitive",
-        "schema": {
-            "patternProperties": {
-                "[0-9]{2,}": { "type": "boolean" },
-                "X_": { "type": "string" }
-            }
-        },
-        "tests": [
-            {
-                "description": "non recognized members are ignored",
-                "data": { "answer 1": "42" },
-                "valid": true
-            },
-            {
-                "description": "recognized members are accounted for",
-                "data": { "a31b": null },
-                "valid": false
-            },
-            {
-                "description": "regexes are case sensitive",
-                "data": { "a_x_3": 3 },
-                "valid": true
-            },
-            {
-                "description": "regexes are case sensitive, 2",
-                "data": { "a_X_3": 3 },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "patternProperties with null valued instance properties",
-        "schema": {
-            "patternProperties": {
-                "^.*bar$": {"type": "null"}
-            }
-        },
-        "tests": [
-            {
-                "description": "allows null values",
-                "data": {"foobar": null},
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft3/properties.json b/json/tests/draft3/properties.json
deleted file mode 100644
index cd23801..0000000
--- a/json/tests/draft3/properties.json
+++ /dev/null
@@ -1,112 +0,0 @@
-[
-    {
-        "description": "object properties validation",
-        "schema": {
-            "properties": {
-                "foo": {"type": "integer"},
-                "bar": {"type": "string"}
-            }
-        },
-        "tests": [
-            {
-                "description": "both properties present and valid is valid",
-                "data": {"foo": 1, "bar": "baz"},
-                "valid": true
-            },
-            {
-                "description": "one property invalid is invalid",
-                "data": {"foo": 1, "bar": {}},
-                "valid": false
-            },
-            {
-                "description": "both properties invalid is invalid",
-                "data": {"foo": [], "bar": {}},
-                "valid": false
-            },
-            {
-                "description": "doesn't invalidate other properties",
-                "data": {"quux": []},
-                "valid": true
-            },
-            {
-                "description": "ignores arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "ignores other non-objects",
-                "data": 12,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description":
-            "properties, patternProperties, additionalProperties interaction",
-        "schema": {
-            "properties": {
-                "foo": {"type": "array", "maxItems": 3},
-                "bar": {"type": "array"}
-            },
-            "patternProperties": {"f.o": {"minItems": 2}},
-            "additionalProperties": {"type": "integer"}
-        },
-        "tests": [
-            {
-                "description": "property validates property",
-                "data": {"foo": [1, 2]},
-                "valid": true
-            },
-            {
-                "description": "property invalidates property",
-                "data": {"foo": [1, 2, 3, 4]},
-                "valid": false
-            },
-            {
-                "description": "patternProperty invalidates property",
-                "data": {"foo": []},
-                "valid": false
-            },
-            {
-                "description": "patternProperty validates nonproperty",
-                "data": {"fxo": [1, 2]},
-                "valid": true
-            },
-            {
-                "description": "patternProperty invalidates nonproperty",
-                "data": {"fxo": []},
-                "valid": false
-            },
-            {
-                "description": "additionalProperty ignores property",
-                "data": {"bar": []},
-                "valid": true
-            },
-            {
-                "description": "additionalProperty validates others",
-                "data": {"quux": 3},
-                "valid": true
-            },
-            {
-                "description": "additionalProperty invalidates others",
-                "data": {"quux": "foo"},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "properties with null valued instance properties",
-        "schema": {
-            "properties": {
-                "foo": {"type": "null"}
-            }
-        },
-        "tests": [
-            {
-                "description": "allows null values",
-                "data": {"foo": null},
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft3/ref.json b/json/tests/draft3/ref.json
deleted file mode 100644
index 609eaa4..0000000
--- a/json/tests/draft3/ref.json
+++ /dev/null
@@ -1,278 +0,0 @@
-[
-    {
-        "description": "root pointer ref",
-        "schema": {
-            "properties": {
-                "foo": {"$ref": "#"}
-            },
-            "additionalProperties": false
-        },
-        "tests": [
-            {
-                "description": "match",
-                "data": {"foo": false},
-                "valid": true
-            },
-            {
-                "description": "recursive match",
-                "data": {"foo": {"foo": false}},
-                "valid": true
-            },
-            {
-                "description": "mismatch",
-                "data": {"bar": false},
-                "valid": false
-            },
-            {
-                "description": "recursive mismatch",
-                "data": {"foo": {"bar": false}},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "relative pointer ref to object",
-        "schema": {
-            "properties": {
-                "foo": {"type": "integer"},
-                "bar": {"$ref": "#/properties/foo"}
-            }
-        },
-        "tests": [
-            {
-                "description": "match",
-                "data": {"bar": 3},
-                "valid": true
-            },
-            {
-                "description": "mismatch",
-                "data": {"bar": true},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "relative pointer ref to array",
-        "schema": {
-            "items": [
-                {"type": "integer"},
-                {"$ref": "#/items/0"}
-            ]
-        },
-        "tests": [
-            {
-                "description": "match array",
-                "data": [1, 2],
-                "valid": true
-            },
-            {
-                "description": "mismatch array",
-                "data": [1, "foo"],
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "escaped pointer ref",
-        "schema": {
-            "definitions": {
-                "tilde~field": {"type": "integer"},
-                "slash/field": {"type": "integer"},
-                "percent%field": {"type": "integer"}
-            },
-            "properties": {
-                "tilde": {"$ref": "#/definitions/tilde~0field"},
-                "slash": {"$ref": "#/definitions/slash~1field"},
-                "percent": {"$ref": "#/definitions/percent%25field"}
-            }
-        },
-        "tests": [
-            {
-                "description": "slash invalid",
-                "data": {"slash": "aoeu"},
-                "valid": false
-            },
-            {
-                "description": "tilde invalid",
-                "data": {"tilde": "aoeu"},
-                "valid": false
-            },
-            {
-                "description": "percent invalid",
-                "data": {"percent": "aoeu"},
-                "valid": false
-            },
-            {
-                "description": "slash valid",
-                "data": {"slash": 123},
-                "valid": true
-            },
-            {
-                "description": "tilde valid",
-                "data": {"tilde": 123},
-                "valid": true
-            },
-            {
-                "description": "percent valid",
-                "data": {"percent": 123},
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "nested refs",
-        "schema": {
-            "definitions": {
-                "a": {"type": "integer"},
-                "b": {"$ref": "#/definitions/a"},
-                "c": {"$ref": "#/definitions/b"}
-            },
-            "$ref": "#/definitions/c"
-        },
-        "tests": [
-            {
-                "description": "nested ref valid",
-                "data": 5,
-                "valid": true
-            },
-            {
-                "description": "nested ref invalid",
-                "data": "a",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "ref overrides any sibling keywords",
-        "schema": {
-            "definitions": {
-                "reffed": {
-                    "type": "array"
-                }
-            },
-            "properties": {
-                "foo": {
-                    "$ref": "#/definitions/reffed",
-                    "maxItems": 2
-                }
-            }
-        },
-        "tests": [
-            {
-                "description": "remote ref valid",
-                "data": { "foo": [] },
-                "valid": true
-            },
-            {
-                "description": "remote ref valid, maxItems ignored",
-                "data": { "foo": [ 1, 2, 3] },
-                "valid": true
-            },
-            {
-                "description": "ref invalid",
-                "data": { "foo": "string" },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "property named $ref, containing an actual $ref",
-        "schema": {
-            "properties": {
-                "$ref": {"$ref": "#/definitions/is-string"}
-            },
-            "definitions": {
-                "is-string": {
-                    "type": "string"
-                }
-            }
-        },
-        "tests": [
-            {
-                "description": "property named $ref valid",
-                "data": {"$ref": "a"},
-                "valid": true
-            },
-            {
-                "description": "property named $ref invalid",
-                "data": {"$ref": 2},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "$ref prevents a sibling id from changing the base uri",
-        "schema": {
-            "id": "http://localhost:1234/sibling_id/base/",
-            "definitions": {
-                "foo": {
-                    "id": "http://localhost:1234/sibling_id/foo.json",
-                    "type": "string"
-                },
-                "base_foo": {
-                    "$comment": "this canonical uri is http://localhost:1234/sibling_id/base/foo.json",
-                    "id": "foo.json",
-                    "type": "number"
-                }
-            },
-            "extends": [
-                {
-                    "$comment": "$ref resolves to http://localhost:1234/sibling_id/base/foo.json, not http://localhost:1234/sibling_id/foo.json",
-                    "id": "http://localhost:1234/sibling_id/",
-                    "$ref": "foo.json"
-                }
-            ]
-        },
-        "tests": [
-            {
-                "description": "$ref resolves to /definitions/base_foo, data does not validate",
-                "data": "a",
-                "valid": false
-            },
-            {
-                "description": "$ref resolves to /definitions/base_foo, data validates",
-                "data": 1,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "remote ref, containing refs itself",
-        "schema": {"$ref": "http://json-schema.org/draft-03/schema#"},
-        "tests": [
-            {
-                "description": "remote ref valid",
-                "data": {"items": {"type": "integer"}},
-                "valid": true
-            },
-            {
-                "description": "remote ref invalid",
-                "data": {"items": {"type": 1}},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "naive replacement of $ref with its destination is not correct",
-        "schema": {
-            "definitions": {
-                "a_string": { "type": "string" }
-            },
-            "enum": [
-                { "$ref": "#/definitions/a_string" }
-            ]
-        },
-        "tests": [
-            {
-                "description": "do not evaluate the $ref inside the enum, matching any string",
-                "data": "this is a string",
-                "valid": false
-            },
-            {
-                "description": "match the enum exactly",
-                "data": { "$ref": "#/definitions/a_string" },
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft3/refRemote.json b/json/tests/draft3/refRemote.json
deleted file mode 100644
index de0cb43..0000000
--- a/json/tests/draft3/refRemote.json
+++ /dev/null
@@ -1,74 +0,0 @@
-[
-    {
-        "description": "remote ref",
-        "schema": {"$ref": "http://localhost:1234/integer.json"},
-        "tests": [
-            {
-                "description": "remote ref valid",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "remote ref invalid",
-                "data": "a",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "fragment within remote ref",
-        "schema": {"$ref": "http://localhost:1234/subSchemas.json#/integer"},
-        "tests": [
-            {
-                "description": "remote fragment valid",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "remote fragment invalid",
-                "data": "a",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "ref within remote ref",
-        "schema": {
-            "$ref": "http://localhost:1234/subSchemas.json#/refToInteger"
-        },
-        "tests": [
-            {
-                "description": "ref within ref valid",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "ref within ref invalid",
-                "data": "a",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "change resolution scope",
-        "schema": {
-            "id": "http://localhost:1234/",
-            "items": {
-                "id": "baseUriChange/",
-                "items": {"$ref": "folderInteger.json"}
-            }
-        },
-        "tests": [
-            {
-                "description": "changed scope ref valid",
-                "data": [[1]],
-                "valid": true
-            },
-            {
-                "description": "changed scope ref invalid",
-                "data": [["a"]],
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft3/required.json b/json/tests/draft3/required.json
deleted file mode 100644
index aaaf024..0000000
--- a/json/tests/draft3/required.json
+++ /dev/null
@@ -1,53 +0,0 @@
-[
-    {
-        "description": "required validation",
-        "schema": {
-            "properties": {
-                "foo": {"required" : true},
-                "bar": {}
-            }
-        },
-        "tests": [
-            {
-                "description": "present required property is valid",
-                "data": {"foo": 1},
-                "valid": true
-            },
-            {
-                "description": "non-present required property is invalid",
-                "data": {"bar": 1},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "required default validation",
-        "schema": {
-            "properties": {
-                "foo": {}
-            }
-        },
-        "tests": [
-            {
-                "description": "not required by default",
-                "data": {},
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "required explicitly false validation",
-        "schema": {
-            "properties": {
-                "foo": {"required": false}
-            }
-        },
-        "tests": [
-            {
-                "description": "not required if required is false",
-                "data": {},
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft3/type.json b/json/tests/draft3/type.json
deleted file mode 100644
index 8447bc8..0000000
--- a/json/tests/draft3/type.json
+++ /dev/null
@@ -1,493 +0,0 @@
-[
-    {
-        "description": "integer type matches integers",
-        "schema": {"type": "integer"},
-        "tests": [
-            {
-                "description": "an integer is an integer",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "a float is not an integer",
-                "data": 1.1,
-                "valid": false
-            },
-            {
-                "description": "a string is not an integer",
-                "data": "foo",
-                "valid": false
-            },
-            {
-                "description": "a string is still not an integer, even if it looks like one",
-                "data": "1",
-                "valid": false
-            },
-            {
-                "description": "an object is not an integer",
-                "data": {},
-                "valid": false
-            },
-            {
-                "description": "an array is not an integer",
-                "data": [],
-                "valid": false
-            },
-            {
-                "description": "a boolean is not an integer",
-                "data": true,
-                "valid": false
-            },
-            {
-                "description": "null is not an integer",
-                "data": null,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "number type matches numbers",
-        "schema": {"type": "number"},
-        "tests": [
-            {
-                "description": "an integer is a number",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "a float with zero fractional part is a number",
-                "data": 1.0,
-                "valid": true
-            },
-            {
-                "description": "a float is a number",
-                "data": 1.1,
-                "valid": true
-            },
-            {
-                "description": "a string is not a number",
-                "data": "foo",
-                "valid": false
-            },
-            {
-                "description": "a string is still not a number, even if it looks like one",
-                "data": "1",
-                "valid": false
-            },
-            {
-                "description": "an object is not a number",
-                "data": {},
-                "valid": false
-            },
-            {
-                "description": "an array is not a number",
-                "data": [],
-                "valid": false
-            },
-            {
-                "description": "a boolean is not a number",
-                "data": true,
-                "valid": false
-            },
-            {
-                "description": "null is not a number",
-                "data": null,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "string type matches strings",
-        "schema": {"type": "string"},
-        "tests": [
-            {
-                "description": "1 is not a string",
-                "data": 1,
-                "valid": false
-            },
-            {
-                "description": "a float is not a string",
-                "data": 1.1,
-                "valid": false
-            },
-            {
-                "description": "a string is a string",
-                "data": "foo",
-                "valid": true
-            },
-            {
-                "description": "a string is still a string, even if it looks like a number",
-                "data": "1",
-                "valid": true
-            },
-            {
-                "description": "an object is not a string",
-                "data": {},
-                "valid": false
-            },
-            {
-                "description": "an array is not a string",
-                "data": [],
-                "valid": false
-            },
-            {
-                "description": "a boolean is not a string",
-                "data": true,
-                "valid": false
-            },
-            {
-                "description": "null is not a string",
-                "data": null,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "object type matches objects",
-        "schema": {"type": "object"},
-        "tests": [
-            {
-                "description": "an integer is not an object",
-                "data": 1,
-                "valid": false
-            },
-            {
-                "description": "a float is not an object",
-                "data": 1.1,
-                "valid": false
-            },
-            {
-                "description": "a string is not an object",
-                "data": "foo",
-                "valid": false
-            },
-            {
-                "description": "an object is an object",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "an array is not an object",
-                "data": [],
-                "valid": false
-            },
-            {
-                "description": "a boolean is not an object",
-                "data": true,
-                "valid": false
-            },
-            {
-                "description": "null is not an object",
-                "data": null,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "array type matches arrays",
-        "schema": {"type": "array"},
-        "tests": [
-            {
-                "description": "an integer is not an array",
-                "data": 1,
-                "valid": false
-            },
-            {
-                "description": "a float is not an array",
-                "data": 1.1,
-                "valid": false
-            },
-            {
-                "description": "a string is not an array",
-                "data": "foo",
-                "valid": false
-            },
-            {
-                "description": "an object is not an array",
-                "data": {},
-                "valid": false
-            },
-            {
-                "description": "an array is an array",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "a boolean is not an array",
-                "data": true,
-                "valid": false
-            },
-            {
-                "description": "null is not an array",
-                "data": null,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "boolean type matches booleans",
-        "schema": {"type": "boolean"},
-        "tests": [
-            {
-                "description": "an integer is not a boolean",
-                "data": 1,
-                "valid": false
-            },
-            {
-                "description": "a float is not a boolean",
-                "data": 1.1,
-                "valid": false
-            },
-            {
-                "description": "a string is not a boolean",
-                "data": "foo",
-                "valid": false
-            },
-            {
-                "description": "an object is not a boolean",
-                "data": {},
-                "valid": false
-            },
-            {
-                "description": "an array is not a boolean",
-                "data": [],
-                "valid": false
-            },
-            {
-                "description": "a boolean is a boolean",
-                "data": true,
-                "valid": true
-            },
-            {
-                "description": "null is not a boolean",
-                "data": null,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "null type matches only the null object",
-        "schema": {"type": "null"},
-        "tests": [
-            {
-                "description": "an integer is not null",
-                "data": 1,
-                "valid": false
-            },
-            {
-                "description": "a float is not null",
-                "data": 1.1,
-                "valid": false
-            },
-            {
-                "description": "a string is not null",
-                "data": "foo",
-                "valid": false
-            },
-            {
-                "description": "an object is not null",
-                "data": {},
-                "valid": false
-            },
-            {
-                "description": "an array is not null",
-                "data": [],
-                "valid": false
-            },
-            {
-                "description": "a boolean is not null",
-                "data": true,
-                "valid": false
-            },
-            {
-                "description": "null is null",
-                "data": null,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "any type matches any type",
-        "schema": {"type": "any"},
-        "tests": [
-            {
-                "description": "any type includes integers",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "any type includes float",
-                "data": 1.1,
-                "valid": true
-            },
-            {
-                "description": "any type includes string",
-                "data": "foo",
-                "valid": true
-            },
-            {
-                "description": "any type includes object",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "any type includes array",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "any type includes boolean",
-                "data": true,
-                "valid": true
-            },
-            {
-                "description": "any type includes null",
-                "data": null,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "multiple types can be specified in an array",
-        "schema": {"type": ["integer", "string"]},
-        "tests": [
-            {
-                "description": "an integer is valid",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "a string is valid",
-                "data": "foo",
-                "valid": true
-            },
-            {
-                "description": "a float is invalid",
-                "data": 1.1,
-                "valid": false
-            },
-            {
-                "description": "an object is invalid",
-                "data": {},
-                "valid": false
-            },
-            {
-                "description": "an array is invalid",
-                "data": [],
-                "valid": false
-            },
-            {
-                "description": "a boolean is invalid",
-                "data": true,
-                "valid": false
-            },
-            {
-                "description": "null is invalid",
-                "data": null,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "types can include schemas",
-        "schema": {
-            "type": [
-                "array",
-                {"type": "object"}
-            ]
-        },
-        "tests": [
-            {
-                "description": "an integer is invalid",
-                "data": 1,
-                "valid": false
-            },
-            {
-                "description": "a string is invalid",
-                "data": "foo",
-                "valid": false
-            },
-            {
-                "description": "a float is invalid",
-                "data": 1.1,
-                "valid": false
-            },
-            {
-                "description": "an object is valid",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "an array is valid",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "a boolean is invalid",
-                "data": true,
-                "valid": false
-            },
-            {
-                "description": "null is invalid",
-                "data": null,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "applies a nested schema",
-        "schema": {
-            "type": [
-                "integer",
-                {
-                    "properties": {
-                        "foo": {"type": "null"}
-                    }
-                }
-            ]
-        },
-        "tests": [
-            {
-                "description": "an integer is valid",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "an object is valid only if it is fully valid",
-                "data": {"foo": null},
-                "valid": true
-            },
-            {
-                "description": "an object is invalid otherwise",
-                "data": {"foo": "bar"},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "types from separate schemas are merged",
-        "schema": {
-            "type": [
-                {"type": ["string"]},
-                {"type": ["array", "null"]}
-            ]
-        },
-        "tests": [
-            {
-                "description": "an integer is invalid",
-                "data": 1,
-                "valid": false
-            },
-            {
-                "description": "a string is valid",
-                "data": "foo",
-                "valid": true
-            },
-            {
-                "description": "an array is valid",
-                "data": [1, 2, 3],
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft3/uniqueItems.json b/json/tests/draft3/uniqueItems.json
deleted file mode 100644
index c48c6a0..0000000
--- a/json/tests/draft3/uniqueItems.json
+++ /dev/null
@@ -1,374 +0,0 @@
-[
-    {
-        "description": "uniqueItems validation",
-        "schema": {"uniqueItems": true},
-        "tests": [
-            {
-                "description": "unique array of integers is valid",
-                "data": [1, 2],
-                "valid": true
-            },
-            {
-                "description": "non-unique array of integers is invalid",
-                "data": [1, 1],
-                "valid": false
-            },
-            {
-                "description": "non-unique array of more than two integers is invalid",
-                "data": [1, 2, 1],
-                "valid": false
-            },
-            {
-                "description": "numbers are unique if mathematically unequal",
-                "data": [1.0, 1.00, 1],
-                "valid": false
-            },
-            {
-                "description": "unique array of strings is valid",
-                "data": ["foo", "bar", "baz"],
-                "valid": true
-            },
-            {
-                "description": "non-unique array of strings is invalid",
-                "data": ["foo", "bar", "foo"],
-                "valid": false
-            },
-            {
-                "description": "unique array of objects is valid",
-                "data": [{"foo": "bar"}, {"foo": "baz"}],
-                "valid": true
-            },
-            {
-                "description": "non-unique array of objects is invalid",
-                "data": [{"foo": "bar"}, {"foo": "bar"}],
-                "valid": false
-            },
-            {
-                "description": "unique array of nested objects is valid",
-                "data": [
-                    {"foo": {"bar" : {"baz" : true}}},
-                    {"foo": {"bar" : {"baz" : false}}}
-                ],
-                "valid": true
-            },
-            {
-                "description": "non-unique array of nested objects is invalid",
-                "data": [
-                    {"foo": {"bar" : {"baz" : true}}},
-                    {"foo": {"bar" : {"baz" : true}}}
-                ],
-                "valid": false
-            },
-            {
-                "description": "unique array of arrays is valid",
-                "data": [["foo"], ["bar"]],
-                "valid": true
-            },
-            {
-                "description": "non-unique array of arrays is invalid",
-                "data": [["foo"], ["foo"]],
-                "valid": false
-            },
-            {
-                "description": "non-unique array of more than two arrays is invalid",
-                "data": [["foo"], ["bar"], ["foo"]],
-                "valid": false
-            },
-            {
-                "description": "1 and true are unique",
-                "data": [1, true],
-                "valid": true
-            },
-            {
-                "description": "0 and false are unique",
-                "data": [0, false],
-                "valid": true
-            },
-            {
-                "description": "[1] and [true] are unique",
-                "data": [[1], [true]],
-                "valid": true
-            },
-            {
-                "description": "[0] and [false] are unique",
-                "data": [[0], [false]],
-                "valid": true
-            },
-            {
-                "description": "nested [1] and [true] are unique",
-                "data": [[[1], "foo"], [[true], "foo"]],
-                "valid": true
-            },
-            {
-                "description": "nested [0] and [false] are unique",
-                "data": [[[0], "foo"], [[false], "foo"]],
-                "valid": true
-            },
-            {
-                "description": "unique heterogeneous types are valid",
-                "data": [{}, [1], true, null, 1],
-                "valid": true
-            },
-            {
-                "description": "non-unique heterogeneous types are invalid",
-                "data": [{}, [1], true, null, {}, 1],
-                "valid": false
-            },
-            {
-                "description": "{\"a\": false} and {\"a\": 0} are unique",
-                "data": [{"a": false}, {"a": 0}],
-                "valid": true
-            },
-            {
-                "description": "{\"a\": true} and {\"a\": 1} are unique",
-                "data": [{"a": true}, {"a": 1}],
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "uniqueItems with an array of items",
-        "schema": {
-            "items": [{"type": "boolean"}, {"type": "boolean"}],
-            "uniqueItems": true
-        },
-        "tests": [
-            {
-                "description": "[false, true] from items array is valid",
-                "data": [false, true],
-                "valid": true
-            },
-            {
-                "description": "[true, false] from items array is valid",
-                "data": [true, false],
-                "valid": true
-            },
-            {
-                "description": "[false, false] from items array is not valid",
-                "data": [false, false],
-                "valid": false
-            },
-            {
-                "description": "[true, true] from items array is not valid",
-                "data": [true, true],
-                "valid": false
-            },
-            {
-                "description": "unique array extended from [false, true] is valid",
-                "data": [false, true, "foo", "bar"],
-                "valid": true
-            },
-            {
-                "description": "unique array extended from [true, false] is valid",
-                "data": [true, false, "foo", "bar"],
-                "valid": true
-            },
-            {
-                "description": "non-unique array extended from [false, true] is not valid",
-                "data": [false, true, "foo", "foo"],
-                "valid": false
-            },
-            {
-                "description": "non-unique array extended from [true, false] is not valid",
-                "data": [true, false, "foo", "foo"],
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "uniqueItems with an array of items and additionalItems=false",
-        "schema": {
-            "items": [{"type": "boolean"}, {"type": "boolean"}],
-            "uniqueItems": true,
-            "additionalItems": false
-        },
-        "tests": [
-            {
-                "description": "[false, true] from items array is valid",
-                "data": [false, true],
-                "valid": true
-            },
-            {
-                "description": "[true, false] from items array is valid",
-                "data": [true, false],
-                "valid": true
-            },
-            {
-                "description": "[false, false] from items array is not valid",
-                "data": [false, false],
-                "valid": false
-            },
-            {
-                "description": "[true, true] from items array is not valid",
-                "data": [true, true],
-                "valid": false
-            },
-            {
-                "description": "extra items are invalid even if unique",
-                "data": [false, true, null],
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "uniqueItems=false validation",
-        "schema": { "uniqueItems": false },
-        "tests": [
-            {
-                "description": "unique array of integers is valid",
-                "data": [1, 2],
-                "valid": true
-            },
-            {
-                "description": "non-unique array of integers is valid",
-                "data": [1, 1],
-                "valid": true
-            },
-            {
-                "description": "numbers are unique if mathematically unequal",
-                "data": [1.0, 1.00, 1],
-                "valid": true
-            },
-            {
-                "description": "unique array of objects is valid",
-                "data": [{"foo": "bar"}, {"foo": "baz"}],
-                "valid": true
-            },
-            {
-                "description": "non-unique array of objects is valid",
-                "data": [{"foo": "bar"}, {"foo": "bar"}],
-                "valid": true
-            },
-            {
-                "description": "unique array of nested objects is valid",
-                "data": [
-                    {"foo": {"bar" : {"baz" : true}}},
-                    {"foo": {"bar" : {"baz" : false}}}
-                ],
-                "valid": true
-            },
-            {
-                "description": "non-unique array of nested objects is valid",
-                "data": [
-                    {"foo": {"bar" : {"baz" : true}}},
-                    {"foo": {"bar" : {"baz" : true}}}
-                ],
-                "valid": true
-            },
-            {
-                "description": "unique array of arrays is valid",
-                "data": [["foo"], ["bar"]],
-                "valid": true
-            },
-            {
-                "description": "non-unique array of arrays is valid",
-                "data": [["foo"], ["foo"]],
-                "valid": true
-            },
-            {
-                "description": "1 and true are unique",
-                "data": [1, true],
-                "valid": true
-            },
-            {
-                "description": "0 and false are unique",
-                "data": [0, false],
-                "valid": true
-            },
-            {
-                "description": "unique heterogeneous types are valid",
-                "data": [{}, [1], true, null, 1],
-                "valid": true
-            },
-            {
-                "description": "non-unique heterogeneous types are valid",
-                "data": [{}, [1], true, null, {}, 1],
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "uniqueItems=false with an array of items",
-        "schema": {
-            "items": [{"type": "boolean"}, {"type": "boolean"}],
-            "uniqueItems": false
-        },
-        "tests": [
-            {
-                "description": "[false, true] from items array is valid",
-                "data": [false, true],
-                "valid": true
-            },
-            {
-                "description": "[true, false] from items array is valid",
-                "data": [true, false],
-                "valid": true
-            },
-            {
-                "description": "[false, false] from items array is valid",
-                "data": [false, false],
-                "valid": true
-            },
-            {
-                "description": "[true, true] from items array is valid",
-                "data": [true, true],
-                "valid": true
-            },
-            {
-                "description": "unique array extended from [false, true] is valid",
-                "data": [false, true, "foo", "bar"],
-                "valid": true
-            },
-            {
-                "description": "unique array extended from [true, false] is valid",
-                "data": [true, false, "foo", "bar"],
-                "valid": true
-            },
-            {
-                "description": "non-unique array extended from [false, true] is valid",
-                "data": [false, true, "foo", "foo"],
-                "valid": true
-            },
-            {
-                "description": "non-unique array extended from [true, false] is valid",
-                "data": [true, false, "foo", "foo"],
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "uniqueItems=false with an array of items and additionalItems=false",
-        "schema": {
-            "items": [{"type": "boolean"}, {"type": "boolean"}],
-            "uniqueItems": false,
-            "additionalItems": false
-        },
-        "tests": [
-            {
-                "description": "[false, true] from items array is valid",
-                "data": [false, true],
-                "valid": true
-            },
-            {
-                "description": "[true, false] from items array is valid",
-                "data": [true, false],
-                "valid": true
-            },
-            {
-                "description": "[false, false] from items array is valid",
-                "data": [false, false],
-                "valid": true
-            },
-            {
-                "description": "[true, true] from items array is valid",
-                "data": [true, true],
-                "valid": true
-            },
-            {
-                "description": "extra items are invalid even if unique",
-                "data": [false, true, null],
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft4/additionalItems.json b/json/tests/draft4/additionalItems.json
deleted file mode 100644
index deb44fd..0000000
--- a/json/tests/draft4/additionalItems.json
+++ /dev/null
@@ -1,164 +0,0 @@
-[
-    {
-        "description": "additionalItems as schema",
-        "schema": {
-            "items": [{}],
-            "additionalItems": {"type": "integer"}
-        },
-        "tests": [
-            {
-                "description": "additional items match schema",
-                "data": [ null, 2, 3, 4 ],
-                "valid": true
-            },
-            {
-                "description": "additional items do not match schema",
-                "data": [ null, 2, 3, "foo" ],
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "when items is schema, additionalItems does nothing",
-        "schema": {
-            "items": {},
-            "additionalItems": false
-        },
-        "tests": [
-            {
-                "description": "all items match schema",
-                "data": [ 1, 2, 3, 4, 5 ],
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "array of items with no additionalItems permitted",
-        "schema": {
-            "items": [{}, {}, {}],
-            "additionalItems": false
-        },
-        "tests": [
-            {
-                "description": "empty array",
-                "data": [ ],
-                "valid": true
-            },
-            {
-                "description": "fewer number of items present (1)",
-                "data": [ 1 ],
-                "valid": true
-            },
-            {
-                "description": "fewer number of items present (2)",
-                "data": [ 1, 2 ],
-                "valid": true
-            },
-            {
-                "description": "equal number of items present",
-                "data": [ 1, 2, 3 ],
-                "valid": true
-            },
-            {
-                "description": "additional items are not permitted",
-                "data": [ 1, 2, 3, 4 ],
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "additionalItems as false without items",
-        "schema": {"additionalItems": false},
-        "tests": [
-            {
-                "description":
-                    "items defaults to empty schema so everything is valid",
-                "data": [ 1, 2, 3, 4, 5 ],
-                "valid": true
-            },
-            {
-                "description": "ignores non-arrays",
-                "data": {"foo" : "bar"},
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "additionalItems are allowed by default",
-        "schema": {"items": [{"type": "integer"}]},
-        "tests": [
-            {
-                "description": "only the first item is validated",
-                "data": [1, "foo", false],
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "additionalItems does not look in applicators, valid case",
-        "schema": {
-            "allOf": [
-                { "items": [ { "type": "integer" } ] }
-            ],
-            "additionalItems": { "type": "boolean" }
-        },
-        "tests": [
-            {
-                "description": "items defined in allOf are not examined",
-                "data": [ 1, null ],
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "additionalItems does not look in applicators, invalid case",
-        "schema": {
-            "allOf": [
-                { "items": [ { "type": "integer" }, { "type": "string" } ] }
-            ],
-            "items": [ {"type": "integer" } ],
-            "additionalItems": { "type": "boolean" }
-        },
-        "tests": [
-            {
-                "description": "items defined in allOf are not examined",
-                "data": [ 1, "hello" ],
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "items validation adjusts the starting index for additionalItems",
-        "schema": {
-            "items": [ { "type": "string" } ],
-            "additionalItems": { "type": "integer" }
-        },
-        "tests": [
-            {
-                "description": "valid items",
-                "data": [ "x", 2, 3 ],
-                "valid": true
-            },
-            {
-                "description": "wrong type of second item",
-                "data": [ "x", "y" ],
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "additionalItems with null instance elements",
-        "schema": {
-            "additionalItems": {
-                "type": "null"
-            }
-        },
-        "tests": [
-            {
-                "description": "allows null elements",
-                "data": [ null ],
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft4/additionalProperties.json b/json/tests/draft4/additionalProperties.json
deleted file mode 100644
index 0f8e162..0000000
--- a/json/tests/draft4/additionalProperties.json
+++ /dev/null
@@ -1,147 +0,0 @@
-[
-    {
-        "description":
-            "additionalProperties being false does not allow other properties",
-        "schema": {
-            "properties": {"foo": {}, "bar": {}},
-            "patternProperties": { "^v": {} },
-            "additionalProperties": false
-        },
-        "tests": [
-            {
-                "description": "no additional properties is valid",
-                "data": {"foo": 1},
-                "valid": true
-            },
-            {
-                "description": "an additional property is invalid",
-                "data": {"foo" : 1, "bar" : 2, "quux" : "boom"},
-                "valid": false
-            },
-            {
-                "description": "ignores arrays",
-                "data": [1, 2, 3],
-                "valid": true
-            },
-            {
-                "description": "ignores strings",
-                "data": "foobarbaz",
-                "valid": true
-            },
-            {
-                "description": "ignores other non-objects",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "patternProperties are not additional properties",
-                "data": {"foo":1, "vroom": 2},
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "non-ASCII pattern with additionalProperties",
-        "schema": {
-            "patternProperties": {"^á": {}},
-            "additionalProperties": false
-        },
-        "tests": [
-            {
-                "description": "matching the pattern is valid",
-                "data": {"ármányos": 2},
-                "valid": true
-            },
-            {
-                "description": "not matching the pattern is invalid",
-                "data": {"élmény": 2},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "additionalProperties with schema",
-        "schema": {
-            "properties": {"foo": {}, "bar": {}},
-            "additionalProperties": {"type": "boolean"}
-        },
-        "tests": [
-            {
-                "description": "no additional properties is valid",
-                "data": {"foo": 1},
-                "valid": true
-            },
-            {
-                "description": "an additional valid property is valid",
-                "data": {"foo" : 1, "bar" : 2, "quux" : true},
-                "valid": true
-            },
-            {
-                "description": "an additional invalid property is invalid",
-                "data": {"foo" : 1, "bar" : 2, "quux" : 12},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description":
-            "additionalProperties can exist by itself",
-        "schema": {
-            "additionalProperties": {"type": "boolean"}
-        },
-        "tests": [
-            {
-                "description": "an additional valid property is valid",
-                "data": {"foo" : true},
-                "valid": true
-            },
-            {
-                "description": "an additional invalid property is invalid",
-                "data": {"foo" : 1},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "additionalProperties are allowed by default",
-        "schema": {"properties": {"foo": {}, "bar": {}}},
-        "tests": [
-            {
-                "description": "additional properties are allowed",
-                "data": {"foo": 1, "bar": 2, "quux": true},
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "additionalProperties does not look in applicators",
-        "schema": {
-            "allOf": [
-                {"properties": {"foo": {}}}
-            ],
-            "additionalProperties": {"type": "boolean"}
-        },
-        "tests": [
-            {
-                "description": "properties defined in allOf are not examined",
-                "data": {"foo": 1, "bar": true},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "additionalProperties with null valued instance properties",
-        "schema": {
-            "additionalProperties": {
-                "type": "null"
-            }
-        },
-        "tests": [
-            {
-                "description": "allows null values",
-                "data": {"foo": null},
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft4/allOf.json b/json/tests/draft4/allOf.json
deleted file mode 100644
index fc7dec5..0000000
--- a/json/tests/draft4/allOf.json
+++ /dev/null
@@ -1,261 +0,0 @@
-[
-    {
-        "description": "allOf",
-        "schema": {
-            "allOf": [
-                {
-                    "properties": {
-                        "bar": {"type": "integer"}
-                    },
-                    "required": ["bar"]
-                },
-                {
-                    "properties": {
-                        "foo": {"type": "string"}
-                    },
-                    "required": ["foo"]
-                }
-            ]
-        },
-        "tests": [
-            {
-                "description": "allOf",
-                "data": {"foo": "baz", "bar": 2},
-                "valid": true
-            },
-            {
-                "description": "mismatch second",
-                "data": {"foo": "baz"},
-                "valid": false
-            },
-            {
-                "description": "mismatch first",
-                "data": {"bar": 2},
-                "valid": false
-            },
-            {
-                "description": "wrong type",
-                "data": {"foo": "baz", "bar": "quux"},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "allOf with base schema",
-        "schema": {
-            "properties": {"bar": {"type": "integer"}},
-            "required": ["bar"],
-            "allOf" : [
-                {
-                    "properties": {
-                        "foo": {"type": "string"}
-                    },
-                    "required": ["foo"]
-                },
-                {
-                    "properties": {
-                        "baz": {"type": "null"}
-                    },
-                    "required": ["baz"]
-                }
-            ]
-        },
-        "tests": [
-            {
-                "description": "valid",
-                "data": {"foo": "quux", "bar": 2, "baz": null},
-                "valid": true
-            },
-            {
-                "description": "mismatch base schema",
-                "data": {"foo": "quux", "baz": null},
-                "valid": false
-            },
-            {
-                "description": "mismatch first allOf",
-                "data": {"bar": 2, "baz": null},
-                "valid": false
-            },
-            {
-                "description": "mismatch second allOf",
-                "data": {"foo": "quux", "bar": 2},
-                "valid": false
-            },
-            {
-                "description": "mismatch both",
-                "data": {"bar": 2},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "allOf simple types",
-        "schema": {
-            "allOf": [
-                {"maximum": 30},
-                {"minimum": 20}
-            ]
-        },
-        "tests": [
-            {
-                "description": "valid",
-                "data": 25,
-                "valid": true
-            },
-            {
-                "description": "mismatch one",
-                "data": 35,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "allOf with one empty schema",
-        "schema": {
-            "allOf": [
-                {}
-            ]
-        },
-        "tests": [
-            {
-                "description": "any data is valid",
-                "data": 1,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "allOf with two empty schemas",
-        "schema": {
-            "allOf": [
-                {},
-                {}
-            ]
-        },
-        "tests": [
-            {
-                "description": "any data is valid",
-                "data": 1,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "allOf with the first empty schema",
-        "schema": {
-            "allOf": [
-                {},
-                { "type": "number" }
-            ]
-        },
-        "tests": [
-            {
-                "description": "number is valid",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "string is invalid",
-                "data": "foo",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "allOf with the last empty schema",
-        "schema": {
-            "allOf": [
-                { "type": "number" },
-                {}
-            ]
-        },
-        "tests": [
-            {
-                "description": "number is valid",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "string is invalid",
-                "data": "foo",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "nested allOf, to check validation semantics",
-        "schema": {
-            "allOf": [
-                {
-                    "allOf": [
-                        {
-                            "type": "null"
-                        }
-                    ]
-                }
-            ]
-        },
-        "tests": [
-            {
-                "description": "null is valid",
-                "data": null,
-                "valid": true
-            },
-            {
-                "description": "anything non-null is invalid",
-                "data": 123,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "allOf combined with anyOf, oneOf",
-        "schema": {
-            "allOf": [ { "multipleOf": 2 } ],
-            "anyOf": [ { "multipleOf": 3 } ],
-            "oneOf": [ { "multipleOf": 5 } ]
-        },
-        "tests": [
-            {
-                "description": "allOf: false, anyOf: false, oneOf: false",
-                "data": 1,
-                "valid": false
-            },
-            {
-                "description": "allOf: false, anyOf: false, oneOf: true",
-                "data": 5,
-                "valid": false
-            },
-            {
-                "description": "allOf: false, anyOf: true, oneOf: false",
-                "data": 3,
-                "valid": false
-            },
-            {
-                "description": "allOf: false, anyOf: true, oneOf: true",
-                "data": 15,
-                "valid": false
-            },
-            {
-                "description": "allOf: true, anyOf: false, oneOf: false",
-                "data": 2,
-                "valid": false
-            },
-            {
-                "description": "allOf: true, anyOf: false, oneOf: true",
-                "data": 10,
-                "valid": false
-            },
-            {
-                "description": "allOf: true, anyOf: true, oneOf: false",
-                "data": 6,
-                "valid": false
-            },
-            {
-                "description": "allOf: true, anyOf: true, oneOf: true",
-                "data": 30,
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft4/anyOf.json b/json/tests/draft4/anyOf.json
deleted file mode 100644
index 09cc3c2..0000000
--- a/json/tests/draft4/anyOf.json
+++ /dev/null
@@ -1,156 +0,0 @@
-[
-    {
-        "description": "anyOf",
-        "schema": {
-            "anyOf": [
-                {
-                    "type": "integer"
-                },
-                {
-                    "minimum": 2
-                }
-            ]
-        },
-        "tests": [
-            {
-                "description": "first anyOf valid",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "second anyOf valid",
-                "data": 2.5,
-                "valid": true
-            },
-            {
-                "description": "both anyOf valid",
-                "data": 3,
-                "valid": true
-            },
-            {
-                "description": "neither anyOf valid",
-                "data": 1.5,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "anyOf with base schema",
-        "schema": {
-            "type": "string",
-            "anyOf" : [
-                {
-                    "maxLength": 2
-                },
-                {
-                    "minLength": 4
-                }
-            ]
-        },
-        "tests": [
-            {
-                "description": "mismatch base schema",
-                "data": 3,
-                "valid": false
-            },
-            {
-                "description": "one anyOf valid",
-                "data": "foobar",
-                "valid": true
-            },
-            {
-                "description": "both anyOf invalid",
-                "data": "foo",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "anyOf complex types",
-        "schema": {
-            "anyOf": [
-                {
-                    "properties": {
-                        "bar": {"type": "integer"}
-                    },
-                    "required": ["bar"]
-                },
-                {
-                    "properties": {
-                        "foo": {"type": "string"}
-                    },
-                    "required": ["foo"]
-                }
-            ]
-        },
-        "tests": [
-            {
-                "description": "first anyOf valid (complex)",
-                "data": {"bar": 2},
-                "valid": true
-            },
-            {
-                "description": "second anyOf valid (complex)",
-                "data": {"foo": "baz"},
-                "valid": true
-            },
-            {
-                "description": "both anyOf valid (complex)",
-                "data": {"foo": "baz", "bar": 2},
-                "valid": true
-            },
-            {
-                "description": "neither anyOf valid (complex)",
-                "data": {"foo": 2, "bar": "quux"},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "anyOf with one empty schema",
-        "schema": {
-            "anyOf": [
-                { "type": "number" },
-                {}
-            ]
-        },
-        "tests": [
-            {
-                "description": "string is valid",
-                "data": "foo",
-                "valid": true
-            },
-            {
-                "description": "number is valid",
-                "data": 123,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "nested anyOf, to check validation semantics",
-        "schema": {
-            "anyOf": [
-                {
-                    "anyOf": [
-                        {
-                            "type": "null"
-                        }
-                    ]
-                }
-            ]
-        },
-        "tests": [
-            {
-                "description": "null is valid",
-                "data": null,
-                "valid": true
-            },
-            {
-                "description": "anything non-null is invalid",
-                "data": 123,
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft4/default.json b/json/tests/draft4/default.json
deleted file mode 100644
index 289a9b6..0000000
--- a/json/tests/draft4/default.json
+++ /dev/null
@@ -1,79 +0,0 @@
-[
-    {
-        "description": "invalid type for default",
-        "schema": {
-            "properties": {
-                "foo": {
-                    "type": "integer",
-                    "default": []
-                }
-            }
-        },
-        "tests": [
-            {
-                "description": "valid when property is specified",
-                "data": {"foo": 13},
-                "valid": true
-            },
-            {
-                "description": "still valid when the invalid default is used",
-                "data": {},
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "invalid string value for default",
-        "schema": {
-            "properties": {
-                "bar": {
-                    "type": "string",
-                    "minLength": 4,
-                    "default": "bad"
-                }
-            }
-        },
-        "tests": [
-            {
-                "description": "valid when property is specified",
-                "data": {"bar": "good"},
-                "valid": true
-            },
-            {
-                "description": "still valid when the invalid default is used",
-                "data": {},
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "the default keyword does not do anything if the property is missing",
-        "schema": {
-            "type": "object",
-            "properties": {
-                "alpha": {
-                    "type": "number",
-                    "maximum": 3,
-                    "default": 5
-                }
-            }
-        },
-        "tests": [
-            {
-                "description": "an explicit property value is checked against maximum (passing)",
-                "data": { "alpha": 1 },
-                "valid": true
-            },
-            {
-                "description": "an explicit property value is checked against maximum (failing)",
-                "data": { "alpha": 5 },
-                "valid": false
-            },
-            {
-                "description": "missing properties are not filled in with the default",
-                "data": {},
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft4/definitions.json b/json/tests/draft4/definitions.json
deleted file mode 100644
index 482823b..0000000
--- a/json/tests/draft4/definitions.json
+++ /dev/null
@@ -1,26 +0,0 @@
-[
-    {
-        "description": "validate definition against metaschema",
-        "schema": {"$ref": "http://json-schema.org/draft-04/schema#"},
-        "tests": [
-            {
-                "description": "valid definition schema",
-                "data": {
-                    "definitions": {
-                        "foo": {"type": "integer"}
-                    }
-                },
-                "valid": true
-            },
-            {
-                "description": "invalid definition schema",
-                "data": {
-                    "definitions": {
-                        "foo": {"type": 1}
-                    }
-                },
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft4/dependencies.json b/json/tests/draft4/dependencies.json
deleted file mode 100644
index 51eeddf..0000000
--- a/json/tests/draft4/dependencies.json
+++ /dev/null
@@ -1,194 +0,0 @@
-[
-    {
-        "description": "dependencies",
-        "schema": {
-            "dependencies": {"bar": ["foo"]}
-        },
-        "tests": [
-            {
-                "description": "neither",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "nondependant",
-                "data": {"foo": 1},
-                "valid": true
-            },
-            {
-                "description": "with dependency",
-                "data": {"foo": 1, "bar": 2},
-                "valid": true
-            },
-            {
-                "description": "missing dependency",
-                "data": {"bar": 2},
-                "valid": false
-            },
-            {
-                "description": "ignores arrays",
-                "data": ["bar"],
-                "valid": true
-            },
-            {
-                "description": "ignores strings",
-                "data": "foobar",
-                "valid": true
-            },
-            {
-                "description": "ignores other non-objects",
-                "data": 12,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "multiple dependencies",
-        "schema": {
-            "dependencies": {"quux": ["foo", "bar"]}
-        },
-        "tests": [
-            {
-                "description": "neither",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "nondependants",
-                "data": {"foo": 1, "bar": 2},
-                "valid": true
-            },
-            {
-                "description": "with dependencies",
-                "data": {"foo": 1, "bar": 2, "quux": 3},
-                "valid": true
-            },
-            {
-                "description": "missing dependency",
-                "data": {"foo": 1, "quux": 2},
-                "valid": false
-            },
-            {
-                "description": "missing other dependency",
-                "data": {"bar": 1, "quux": 2},
-                "valid": false
-            },
-            {
-                "description": "missing both dependencies",
-                "data": {"quux": 1},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "multiple dependencies subschema",
-        "schema": {
-            "dependencies": {
-                "bar": {
-                    "properties": {
-                        "foo": {"type": "integer"},
-                        "bar": {"type": "integer"}
-                    }
-                }
-            }
-        },
-        "tests": [
-            {
-                "description": "valid",
-                "data": {"foo": 1, "bar": 2},
-                "valid": true
-            },
-            {
-                "description": "no dependency",
-                "data": {"foo": "quux"},
-                "valid": true
-            },
-            {
-                "description": "wrong type",
-                "data": {"foo": "quux", "bar": 2},
-                "valid": false
-            },
-            {
-                "description": "wrong type other",
-                "data": {"foo": 2, "bar": "quux"},
-                "valid": false
-            },
-            {
-                "description": "wrong type both",
-                "data": {"foo": "quux", "bar": "quux"},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "dependencies with escaped characters",
-        "schema": {
-            "dependencies": {
-                "foo\nbar": ["foo\rbar"],
-                "foo\tbar": {
-                    "minProperties": 4
-                },
-                "foo'bar": {"required": ["foo\"bar"]},
-                "foo\"bar": ["foo'bar"]
-            }
-        },
-        "tests": [
-            {
-                "description": "valid object 1",
-                "data": {
-                    "foo\nbar": 1,
-                    "foo\rbar": 2
-                },
-                "valid": true
-            },
-            {
-                "description": "valid object 2",
-                "data": {
-                    "foo\tbar": 1,
-                    "a": 2,
-                    "b": 3,
-                    "c": 4
-                },
-                "valid": true
-            },
-            {
-                "description": "valid object 3",
-                "data": {
-                    "foo'bar": 1,
-                    "foo\"bar": 2
-                },
-                "valid": true
-            },
-            {
-                "description": "invalid object 1",
-                "data": {
-                    "foo\nbar": 1,
-                    "foo": 2
-                },
-                "valid": false
-            },
-            {
-                "description": "invalid object 2",
-                "data": {
-                    "foo\tbar": 1,
-                    "a": 2
-                },
-                "valid": false
-            },
-            {
-                "description": "invalid object 3",
-                "data": {
-                    "foo'bar": 1
-                },
-                "valid": false
-            },
-            {
-                "description": "invalid object 4",
-                "data": {
-                    "foo\"bar": 2
-                },
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft4/enum.json b/json/tests/draft4/enum.json
deleted file mode 100644
index f085097..0000000
--- a/json/tests/draft4/enum.json
+++ /dev/null
@@ -1,236 +0,0 @@
-[
-    {
-        "description": "simple enum validation",
-        "schema": {"enum": [1, 2, 3]},
-        "tests": [
-            {
-                "description": "one of the enum is valid",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "something else is invalid",
-                "data": 4,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "heterogeneous enum validation",
-        "schema": {"enum": [6, "foo", [], true, {"foo": 12}]},
-        "tests": [
-            {
-                "description": "one of the enum is valid",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "something else is invalid",
-                "data": null,
-                "valid": false
-            },
-            {
-                "description": "objects are deep compared",
-                "data": {"foo": false},
-                "valid": false
-            },
-            {
-                "description": "valid object matches",
-                "data": {"foo": 12},
-                "valid": true
-            },
-            {
-                "description": "extra properties in object is invalid",
-                "data": {"foo": 12, "boo": 42},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "heterogeneous enum-with-null validation",
-        "schema": { "enum": [6, null] },
-        "tests": [
-            {
-                "description": "null is valid",
-                "data": null,
-                "valid": true
-            },
-            {
-                "description": "number is valid",
-                "data": 6,
-                "valid": true
-            },
-            {
-                "description": "something else is invalid",
-                "data": "test",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "enums in properties",
-        "schema": {
-            "type":"object",
-            "properties": {
-                "foo": {"enum":["foo"]},
-                "bar": {"enum":["bar"]}
-            },
-            "required": ["bar"]
-        },
-        "tests": [
-            {
-                "description": "both properties are valid",
-                "data": {"foo":"foo", "bar":"bar"},
-                "valid": true
-            },
-            {
-                "description": "wrong foo value",
-                "data": {"foo":"foot", "bar":"bar"},
-                "valid": false
-            },
-            {
-                "description": "wrong bar value",
-                "data": {"foo":"foo", "bar":"bart"},
-                "valid": false
-            },
-            {
-                "description": "missing optional property is valid",
-                "data": {"bar":"bar"},
-                "valid": true
-            },
-            {
-                "description": "missing required property is invalid",
-                "data": {"foo":"foo"},
-                "valid": false
-            },
-            {
-                "description": "missing all properties is invalid",
-                "data": {},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "enum with escaped characters",
-        "schema": {
-            "enum": ["foo\nbar", "foo\rbar"]
-        },
-        "tests": [
-            {
-                "description": "member 1 is valid",
-                "data": "foo\nbar",
-                "valid": true
-            },
-            {
-                "description": "member 2 is valid",
-                "data": "foo\rbar",
-                "valid": true
-            },
-            {
-                "description": "another string is invalid",
-                "data": "abc",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "enum with false does not match 0",
-        "schema": {"enum": [false]},
-        "tests": [
-            {
-                "description": "false is valid",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "integer zero is invalid",
-                "data": 0,
-                "valid": false
-            },
-            {
-                "description": "float zero is invalid",
-                "data": 0.0,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "enum with true does not match 1",
-        "schema": {"enum": [true]},
-        "tests": [
-            {
-                "description": "true is valid",
-                "data": true,
-                "valid": true
-            },
-            {
-                "description": "integer one is invalid",
-                "data": 1,
-                "valid": false
-            },
-            {
-                "description": "float one is invalid",
-                "data": 1.0,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "enum with 0 does not match false",
-        "schema": {"enum": [0]},
-        "tests": [
-            {
-                "description": "false is invalid",
-                "data": false,
-                "valid": false
-            },
-            {
-                "description": "integer zero is valid",
-                "data": 0,
-                "valid": true
-            },
-            {
-                "description": "float zero is valid",
-                "data": 0.0,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "enum with 1 does not match true",
-        "schema": {"enum": [1]},
-        "tests": [
-            {
-                "description": "true is invalid",
-                "data": true,
-                "valid": false
-            },
-            {
-                "description": "integer one is valid",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "float one is valid",
-                "data": 1.0,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "nul characters in strings",
-        "schema": { "enum": [ "hello\u0000there" ] },
-        "tests": [
-            {
-                "description": "match string with nul",
-                "data": "hello\u0000there",
-                "valid": true
-            },
-            {
-                "description": "do not match string lacking nul",
-                "data": "hellothere",
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft4/format.json b/json/tests/draft4/format.json
deleted file mode 100644
index 5bd83cc..0000000
--- a/json/tests/draft4/format.json
+++ /dev/null
@@ -1,218 +0,0 @@
-[
-    {
-        "description": "email format",
-        "schema": { "format": "email" },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "ipv4 format",
-        "schema": { "format": "ipv4" },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "ipv6 format",
-        "schema": { "format": "ipv6" },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "hostname format",
-        "schema": { "format": "hostname" },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "date-time format",
-        "schema": { "format": "date-time" },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "uri format",
-        "schema": { "format": "uri" },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft4/id.json b/json/tests/draft4/id.json
deleted file mode 100644
index 1c91d33..0000000
--- a/json/tests/draft4/id.json
+++ /dev/null
@@ -1,53 +0,0 @@
-[
-    {
-        "description": "id inside an enum is not a real identifier",
-        "comment": "the implementation must not be confused by an id buried in the enum",
-        "schema": {
-            "definitions": {
-                "id_in_enum": {
-                    "enum": [
-                        {
-                          "id": "https://localhost:1234/my_identifier.json",
-                          "type": "null"
-                        }
-                    ]
-                },
-                "real_id_in_schema": {
-                    "id": "https://localhost:1234/my_identifier.json",
-                    "type": "string"
-                },
-                "zzz_id_in_const": {
-                    "const": {
-                        "id": "https://localhost:1234/my_identifier.json",
-                        "type": "null"
-                    }
-                }
-            },
-            "anyOf": [
-                { "$ref": "#/definitions/id_in_enum" },
-                { "$ref": "https://localhost:1234/my_identifier.json" }
-            ]
-        },
-        "tests": [
-            {
-                "description": "exact match to enum, and type matches",
-                "data": {
-                    "id": "https://localhost:1234/my_identifier.json",
-                    "type": "null"
-                },
-                "valid": true
-            },
-            {
-                "description": "match $ref to id",
-                "data": "a string to match #/definitions/id_in_enum",
-                "valid": true
-            },
-            {
-                "description": "no match on enum or $ref to id",
-                "data": 1,
-                "valid": false
-            }
-        ]
-    }
-
-]
diff --git a/json/tests/draft4/infinite-loop-detection.json b/json/tests/draft4/infinite-loop-detection.json
deleted file mode 100644
index f98c74f..0000000
--- a/json/tests/draft4/infinite-loop-detection.json
+++ /dev/null
@@ -1,36 +0,0 @@
-[
-    {
-        "description": "evaluating the same schema location against the same data location twice is not a sign of an infinite loop",
-        "schema": {
-            "definitions": {
-                "int": { "type": "integer" }
-            },
-            "allOf": [
-                {
-                    "properties": {
-                        "foo": {
-                            "$ref": "#/definitions/int"
-                        }
-                    }
-                },
-                {
-                    "additionalProperties": {
-                        "$ref": "#/definitions/int"
-                    }
-                }
-            ]
-        },
-        "tests": [
-            {
-                "description": "passing case",
-                "data": { "foo": 1 },
-                "valid": true
-            },
-            {
-                "description": "failing case",
-                "data": { "foo": "a string" },
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft4/items.json b/json/tests/draft4/items.json
deleted file mode 100644
index 16ea070..0000000
--- a/json/tests/draft4/items.json
+++ /dev/null
@@ -1,227 +0,0 @@
-[
-    {
-        "description": "a schema given for items",
-        "schema": {
-            "items": {"type": "integer"}
-        },
-        "tests": [
-            {
-                "description": "valid items",
-                "data": [ 1, 2, 3 ],
-                "valid": true
-            },
-            {
-                "description": "wrong type of items",
-                "data": [1, "x"],
-                "valid": false
-            },
-            {
-                "description": "ignores non-arrays",
-                "data": {"foo" : "bar"},
-                "valid": true
-            },
-            {
-                "description": "JavaScript pseudo-array is valid",
-                "data": {
-                    "0": "invalid",
-                    "length": 1
-                },
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "an array of schemas for items",
-        "schema": {
-            "items": [
-                {"type": "integer"},
-                {"type": "string"}
-            ]
-        },
-        "tests": [
-            {
-                "description": "correct types",
-                "data": [ 1, "foo" ],
-                "valid": true
-            },
-            {
-                "description": "wrong types",
-                "data": [ "foo", 1 ],
-                "valid": false
-            },
-            {
-                "description": "incomplete array of items",
-                "data": [ 1 ],
-                "valid": true
-            },
-            {
-                "description": "array with additional items",
-                "data": [ 1, "foo", true ],
-                "valid": true
-            },
-            {
-                "description": "empty array",
-                "data": [ ],
-                "valid": true
-            },
-            {
-                "description": "JavaScript pseudo-array is valid",
-                "data": {
-                    "0": "invalid",
-                    "1": "valid",
-                    "length": 2
-                },
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "items and subitems",
-        "schema": {
-            "definitions": {
-                "item": {
-                    "type": "array",
-                    "additionalItems": false,
-                    "items": [
-                        { "$ref": "#/definitions/sub-item" },
-                        { "$ref": "#/definitions/sub-item" }
-                    ]
-                },
-                "sub-item": {
-                    "type": "object",
-                    "required": ["foo"]
-                }
-            },
-            "type": "array",
-            "additionalItems": false,
-            "items": [
-                { "$ref": "#/definitions/item" },
-                { "$ref": "#/definitions/item" },
-                { "$ref": "#/definitions/item" }
-            ]
-        },
-        "tests": [
-            {
-                "description": "valid items",
-                "data": [
-                    [ {"foo": null}, {"foo": null} ],
-                    [ {"foo": null}, {"foo": null} ],
-                    [ {"foo": null}, {"foo": null} ]
-                ],
-                "valid": true
-            },
-            {
-                "description": "too many items",
-                "data": [
-                    [ {"foo": null}, {"foo": null} ],
-                    [ {"foo": null}, {"foo": null} ],
-                    [ {"foo": null}, {"foo": null} ],
-                    [ {"foo": null}, {"foo": null} ]
-                ],
-                "valid": false
-            },
-            {
-                "description": "too many sub-items",
-                "data": [
-                    [ {"foo": null}, {"foo": null}, {"foo": null} ],
-                    [ {"foo": null}, {"foo": null} ],
-                    [ {"foo": null}, {"foo": null} ]
-                ],
-                "valid": false
-            },
-            {
-                "description": "wrong item",
-                "data": [
-                    {"foo": null},
-                    [ {"foo": null}, {"foo": null} ],
-                    [ {"foo": null}, {"foo": null} ]
-                ],
-                "valid": false
-            },
-            {
-                "description": "wrong sub-item",
-                "data": [
-                    [ {}, {"foo": null} ],
-                    [ {"foo": null}, {"foo": null} ],
-                    [ {"foo": null}, {"foo": null} ]
-                ],
-                "valid": false
-            },
-            {
-                "description": "fewer items is valid",
-                "data": [
-                    [ {"foo": null} ],
-                    [ {"foo": null} ]
-                ],
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "nested items",
-        "schema": {
-            "type": "array",
-            "items": {
-                "type": "array",
-                "items": {
-                    "type": "array",
-                    "items": {
-                        "type": "array",
-                        "items": {
-                            "type": "number"
-                        }
-                    }
-                }
-            }
-        },
-        "tests": [
-            {
-                "description": "valid nested array",
-                "data": [[[[1]], [[2],[3]]], [[[4], [5], [6]]]],
-                "valid": true
-            },
-            {
-                "description": "nested array with invalid type",
-                "data": [[[["1"]], [[2],[3]]], [[[4], [5], [6]]]],
-                "valid": false
-            },
-            {
-                "description": "not deep enough",
-                "data": [[[1], [2],[3]], [[4], [5], [6]]],
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "items with null instance elements",
-        "schema": {
-            "items": {
-                "type": "null"
-            }
-        },
-        "tests": [
-            {
-                "description": "allows null elements",
-                "data": [ null ],
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "array-form items with null instance elements",
-        "schema": {
-            "items": [
-                {
-                    "type": "null"
-                }
-            ]
-        },
-        "tests": [
-            {
-                "description": "allows null elements",
-                "data": [ null ],
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft4/maxItems.json b/json/tests/draft4/maxItems.json
deleted file mode 100644
index 3b53a6b..0000000
--- a/json/tests/draft4/maxItems.json
+++ /dev/null
@@ -1,28 +0,0 @@
-[
-    {
-        "description": "maxItems validation",
-        "schema": {"maxItems": 2},
-        "tests": [
-            {
-                "description": "shorter is valid",
-                "data": [1],
-                "valid": true
-            },
-            {
-                "description": "exact length is valid",
-                "data": [1, 2],
-                "valid": true
-            },
-            {
-                "description": "too long is invalid",
-                "data": [1, 2, 3],
-                "valid": false
-            },
-            {
-                "description": "ignores non-arrays",
-                "data": "foobar",
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft4/maxLength.json b/json/tests/draft4/maxLength.json
deleted file mode 100644
index 811d35b..0000000
--- a/json/tests/draft4/maxLength.json
+++ /dev/null
@@ -1,33 +0,0 @@
-[
-    {
-        "description": "maxLength validation",
-        "schema": {"maxLength": 2},
-        "tests": [
-            {
-                "description": "shorter is valid",
-                "data": "f",
-                "valid": true
-            },
-            {
-                "description": "exact length is valid",
-                "data": "fo",
-                "valid": true
-            },
-            {
-                "description": "too long is invalid",
-                "data": "foo",
-                "valid": false
-            },
-            {
-                "description": "ignores non-strings",
-                "data": 100,
-                "valid": true
-            },
-            {
-                "description": "two supplementary Unicode code points is long enough",
-                "data": "\uD83D\uDCA9\uD83D\uDCA9",
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft4/maxProperties.json b/json/tests/draft4/maxProperties.json
deleted file mode 100644
index aa7209f..0000000
--- a/json/tests/draft4/maxProperties.json
+++ /dev/null
@@ -1,54 +0,0 @@
-[
-    {
-        "description": "maxProperties validation",
-        "schema": {"maxProperties": 2},
-        "tests": [
-            {
-                "description": "shorter is valid",
-                "data": {"foo": 1},
-                "valid": true
-            },
-            {
-                "description": "exact length is valid",
-                "data": {"foo": 1, "bar": 2},
-                "valid": true
-            },
-            {
-                "description": "too long is invalid",
-                "data": {"foo": 1, "bar": 2, "baz": 3},
-                "valid": false
-            },
-            {
-                "description": "ignores arrays",
-                "data": [1, 2, 3],
-                "valid": true
-            },
-            {
-                "description": "ignores strings",
-                "data": "foobar",
-                "valid": true
-            },
-            {
-                "description": "ignores other non-objects",
-                "data": 12,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "maxProperties = 0 means the object is empty",
-        "schema": { "maxProperties": 0 },
-        "tests": [
-            {
-                "description": "no properties is valid",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "one property is invalid",
-                "data": { "foo": 1 },
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft4/maximum.json b/json/tests/draft4/maximum.json
deleted file mode 100644
index ccb79c6..0000000
--- a/json/tests/draft4/maximum.json
+++ /dev/null
@@ -1,99 +0,0 @@
-[
-    {
-        "description": "maximum validation",
-        "schema": {"maximum": 3.0},
-        "tests": [
-            {
-                "description": "below the maximum is valid",
-                "data": 2.6,
-                "valid": true
-            },
-            {
-                "description": "boundary point is valid",
-                "data": 3.0,
-                "valid": true
-            },
-            {
-                "description": "above the maximum is invalid",
-                "data": 3.5,
-                "valid": false
-            },
-            {
-                "description": "ignores non-numbers",
-                "data": "x",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "maximum validation with unsigned integer",
-        "schema": {"maximum": 300},
-        "tests":  [
-            {
-                "description": "below the maximum is invalid",
-                "data": 299.97,
-                "valid": true
-            },
-            {
-                "description": "boundary point integer is valid",
-                "data": 300,
-                "valid": true
-            },
-            {
-                "description": "boundary point float is valid",
-                "data": 300.00,
-                "valid": true
-            },
-            {
-                "description": "above the maximum is invalid",
-                "data": 300.5,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "maximum validation (explicit false exclusivity)",
-        "schema": {"maximum": 3.0, "exclusiveMaximum": false},
-        "tests": [
-            {
-                "description": "below the maximum is valid",
-                "data": 2.6,
-                "valid": true
-            },
-            {
-                "description": "boundary point is valid",
-                "data": 3.0,
-                "valid": true
-            },
-            {
-                "description": "above the maximum is invalid",
-                "data": 3.5,
-                "valid": false
-            },
-            {
-                "description": "ignores non-numbers",
-                "data": "x",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "exclusiveMaximum validation",
-        "schema": {
-            "maximum": 3.0,
-            "exclusiveMaximum": true
-        },
-        "tests": [
-            {
-                "description": "below the maximum is still valid",
-                "data": 2.2,
-                "valid": true
-            },
-            {
-                "description": "boundary point is invalid",
-                "data": 3.0,
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft4/minItems.json b/json/tests/draft4/minItems.json
deleted file mode 100644
index ed51188..0000000
--- a/json/tests/draft4/minItems.json
+++ /dev/null
@@ -1,28 +0,0 @@
-[
-    {
-        "description": "minItems validation",
-        "schema": {"minItems": 1},
-        "tests": [
-            {
-                "description": "longer is valid",
-                "data": [1, 2],
-                "valid": true
-            },
-            {
-                "description": "exact length is valid",
-                "data": [1],
-                "valid": true
-            },
-            {
-                "description": "too short is invalid",
-                "data": [],
-                "valid": false
-            },
-            {
-                "description": "ignores non-arrays",
-                "data": "",
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft4/minLength.json b/json/tests/draft4/minLength.json
deleted file mode 100644
index 3f09158..0000000
--- a/json/tests/draft4/minLength.json
+++ /dev/null
@@ -1,33 +0,0 @@
-[
-    {
-        "description": "minLength validation",
-        "schema": {"minLength": 2},
-        "tests": [
-            {
-                "description": "longer is valid",
-                "data": "foo",
-                "valid": true
-            },
-            {
-                "description": "exact length is valid",
-                "data": "fo",
-                "valid": true
-            },
-            {
-                "description": "too short is invalid",
-                "data": "f",
-                "valid": false
-            },
-            {
-                "description": "ignores non-strings",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "one supplementary Unicode code point is not long enough",
-                "data": "\uD83D\uDCA9",
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft4/minProperties.json b/json/tests/draft4/minProperties.json
deleted file mode 100644
index 49a0726..0000000
--- a/json/tests/draft4/minProperties.json
+++ /dev/null
@@ -1,38 +0,0 @@
-[
-    {
-        "description": "minProperties validation",
-        "schema": {"minProperties": 1},
-        "tests": [
-            {
-                "description": "longer is valid",
-                "data": {"foo": 1, "bar": 2},
-                "valid": true
-            },
-            {
-                "description": "exact length is valid",
-                "data": {"foo": 1},
-                "valid": true
-            },
-            {
-                "description": "too short is invalid",
-                "data": {},
-                "valid": false
-            },
-            {
-                "description": "ignores arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "ignores strings",
-                "data": "",
-                "valid": true
-            },
-            {
-                "description": "ignores other non-objects",
-                "data": 12,
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft4/minimum.json b/json/tests/draft4/minimum.json
deleted file mode 100644
index 22d310e..0000000
--- a/json/tests/draft4/minimum.json
+++ /dev/null
@@ -1,114 +0,0 @@
-[
-    {
-        "description": "minimum validation",
-        "schema": {"minimum": 1.1},
-        "tests": [
-            {
-                "description": "above the minimum is valid",
-                "data": 2.6,
-                "valid": true
-            },
-            {
-                "description": "boundary point is valid",
-                "data": 1.1,
-                "valid": true
-            },
-            {
-                "description": "below the minimum is invalid",
-                "data": 0.6,
-                "valid": false
-            },
-            {
-                "description": "ignores non-numbers",
-                "data": "x",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "minimum validation (explicit false exclusivity)",
-        "schema": {"minimum": 1.1, "exclusiveMinimum": false},
-        "tests": [
-            {
-                "description": "above the minimum is valid",
-                "data": 2.6,
-                "valid": true
-            },
-            {
-                "description": "boundary point is valid",
-                "data": 1.1,
-                "valid": true
-            },
-            {
-                "description": "below the minimum is invalid",
-                "data": 0.6,
-                "valid": false
-            },
-            {
-                "description": "ignores non-numbers",
-                "data": "x",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "exclusiveMinimum validation",
-        "schema": {
-            "minimum": 1.1,
-            "exclusiveMinimum": true
-        },
-        "tests": [
-            {
-                "description": "above the minimum is still valid",
-                "data": 1.2,
-                "valid": true
-            },
-            {
-                "description": "boundary point is invalid",
-                "data": 1.1,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "minimum validation with signed integer",
-        "schema": {"minimum": -2},
-        "tests": [
-            {
-                "description": "negative above the minimum is valid",
-                "data": -1,
-                "valid": true
-            },
-            {
-                "description": "positive above the minimum is valid",
-                "data": 0,
-                "valid": true
-            },
-            {
-                "description": "boundary point is valid",
-                "data": -2,
-                "valid": true
-            },
-            {
-                "description": "boundary point with float is valid",
-                "data": -2.0,
-                "valid": true
-            },
-            {
-                "description": "float below the minimum is invalid",
-                "data": -2.0001,
-                "valid": false
-            },
-            {
-                "description": "int below the minimum is invalid",
-                "data": -3,
-                "valid": false
-            },
-            {
-                "description": "ignores non-numbers",
-                "data": "x",
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft4/multipleOf.json b/json/tests/draft4/multipleOf.json
deleted file mode 100644
index 9abeb97..0000000
--- a/json/tests/draft4/multipleOf.json
+++ /dev/null
@@ -1,71 +0,0 @@
-[
-    {
-        "description": "by int",
-        "schema": {"multipleOf": 2},
-        "tests": [
-            {
-                "description": "int by int",
-                "data": 10,
-                "valid": true
-            },
-            {
-                "description": "int by int fail",
-                "data": 7,
-                "valid": false
-            },
-            {
-                "description": "ignores non-numbers",
-                "data": "foo",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "by number",
-        "schema": {"multipleOf": 1.5},
-        "tests": [
-            {
-                "description": "zero is multiple of anything",
-                "data": 0,
-                "valid": true
-            },
-            {
-                "description": "4.5 is multiple of 1.5",
-                "data": 4.5,
-                "valid": true
-            },
-            {
-                "description": "35 is not multiple of 1.5",
-                "data": 35,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "by small number",
-        "schema": {"multipleOf": 0.0001},
-        "tests": [
-            {
-                "description": "0.0075 is multiple of 0.0001",
-                "data": 0.0075,
-                "valid": true
-            },
-            {
-                "description": "0.00751 is not multiple of 0.0001",
-                "data": 0.00751,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "float division = inf",
-        "schema": {"type": "integer", "multipleOf": 0.123456789},
-        "tests": [
-            {
-                "description": "invalid, but naive implementations may raise an overflow error",
-                "data": 1e308,
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft4/not.json b/json/tests/draft4/not.json
deleted file mode 100644
index cbb7f46..0000000
--- a/json/tests/draft4/not.json
+++ /dev/null
@@ -1,96 +0,0 @@
-[
-    {
-        "description": "not",
-        "schema": {
-            "not": {"type": "integer"}
-        },
-        "tests": [
-            {
-                "description": "allowed",
-                "data": "foo",
-                "valid": true
-            },
-            {
-                "description": "disallowed",
-                "data": 1,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "not multiple types",
-        "schema": {
-            "not": {"type": ["integer", "boolean"]}
-        },
-        "tests": [
-            {
-                "description": "valid",
-                "data": "foo",
-                "valid": true
-            },
-            {
-                "description": "mismatch",
-                "data": 1,
-                "valid": false
-            },
-            {
-                "description": "other mismatch",
-                "data": true,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "not more complex schema",
-        "schema": {
-            "not": {
-                "type": "object",
-                "properties": {
-                    "foo": {
-                        "type": "string"
-                    }
-                }
-             }
-        },
-        "tests": [
-            {
-                "description": "match",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "other match",
-                "data": {"foo": 1},
-                "valid": true
-            },
-            {
-                "description": "mismatch",
-                "data": {"foo": "bar"},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "forbidden property",
-        "schema": {
-            "properties": {
-                "foo": { 
-                    "not": {}
-                }
-            }
-        },
-        "tests": [
-            {
-                "description": "property present",
-                "data": {"foo": 1, "bar": 2},
-                "valid": false
-            },
-            {
-                "description": "property absent",
-                "data": {"bar": 1, "baz": 2},
-                "valid": true
-            }
-        ]
-    }
-
-]
diff --git a/json/tests/draft4/oneOf.json b/json/tests/draft4/oneOf.json
deleted file mode 100644
index fb63b08..0000000
--- a/json/tests/draft4/oneOf.json
+++ /dev/null
@@ -1,230 +0,0 @@
-[
-    {
-        "description": "oneOf",
-        "schema": {
-            "oneOf": [
-                {
-                    "type": "integer"
-                },
-                {
-                    "minimum": 2
-                }
-            ]
-        },
-        "tests": [
-            {
-                "description": "first oneOf valid",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "second oneOf valid",
-                "data": 2.5,
-                "valid": true
-            },
-            {
-                "description": "both oneOf valid",
-                "data": 3,
-                "valid": false
-            },
-            {
-                "description": "neither oneOf valid",
-                "data": 1.5,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "oneOf with base schema",
-        "schema": {
-            "type": "string",
-            "oneOf" : [
-                {
-                    "minLength": 2
-                },
-                {
-                    "maxLength": 4
-                }
-            ]
-        },
-        "tests": [
-            {
-                "description": "mismatch base schema",
-                "data": 3,
-                "valid": false
-            },
-            {
-                "description": "one oneOf valid",
-                "data": "foobar",
-                "valid": true
-            },
-            {
-                "description": "both oneOf valid",
-                "data": "foo",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "oneOf complex types",
-        "schema": {
-            "oneOf": [
-                {
-                    "properties": {
-                        "bar": {"type": "integer"}
-                    },
-                    "required": ["bar"]
-                },
-                {
-                    "properties": {
-                        "foo": {"type": "string"}
-                    },
-                    "required": ["foo"]
-                }
-            ]
-        },
-        "tests": [
-            {
-                "description": "first oneOf valid (complex)",
-                "data": {"bar": 2},
-                "valid": true
-            },
-            {
-                "description": "second oneOf valid (complex)",
-                "data": {"foo": "baz"},
-                "valid": true
-            },
-            {
-                "description": "both oneOf valid (complex)",
-                "data": {"foo": "baz", "bar": 2},
-                "valid": false
-            },
-            {
-                "description": "neither oneOf valid (complex)",
-                "data": {"foo": 2, "bar": "quux"},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "oneOf with empty schema",
-        "schema": {
-            "oneOf": [
-                { "type": "number" },
-                {}
-            ]
-        },
-        "tests": [
-            {
-                "description": "one valid - valid",
-                "data": "foo",
-                "valid": true
-            },
-            {
-                "description": "both valid - invalid",
-                "data": 123,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "oneOf with required",
-        "schema": {
-            "type": "object",
-            "oneOf": [
-                { "required": ["foo", "bar"] },
-                { "required": ["foo", "baz"] }
-            ]
-        },
-        "tests": [
-            {
-                "description": "both invalid - invalid",
-                "data": {"bar": 2},
-                "valid": false
-            },
-            {
-                "description": "first valid - valid",
-                "data": {"foo": 1, "bar": 2},
-                "valid": true
-            },
-            {
-                "description": "second valid - valid",
-                "data": {"foo": 1, "baz": 3},
-                "valid": true
-            },
-            {
-                "description": "both valid - invalid",
-                "data": {"foo": 1, "bar": 2, "baz" : 3},
-                "valid": false
-            }
-        ]
-    },
-	{
-        "description": "oneOf with missing optional property",
-        "schema": {
-            "oneOf": [
-                {
-                    "properties": {
-                        "bar": {},
-                        "baz": {}
-                    },
-                    "required": ["bar"]
-                },
-                {
-                    "properties": {
-                        "foo": {}
-                    },
-                    "required": ["foo"]
-                }
-            ]
-        },
-        "tests": [
-            {
-                "description": "first oneOf valid",
-                "data": {"bar": 8},
-                "valid": true
-            },
-            {
-                "description": "second oneOf valid",
-                "data": {"foo": "foo"},
-                "valid": true
-            },
-            {
-                "description": "both oneOf valid",
-                "data": {"foo": "foo", "bar": 8},
-                "valid": false
-            },
-            {
-                "description": "neither oneOf valid",
-                "data": {"baz": "quux"},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "nested oneOf, to check validation semantics",
-        "schema": {
-            "oneOf": [
-                {
-                    "oneOf": [
-                        {
-                            "type": "null"
-                        }
-                    ]
-                }
-            ]
-        },
-        "tests": [
-            {
-                "description": "null is valid",
-                "data": null,
-                "valid": true
-            },
-            {
-                "description": "anything non-null is invalid",
-                "data": 123,
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft4/optional/bignum.json b/json/tests/draft4/optional/bignum.json
deleted file mode 100644
index 1bc8eb2..0000000
--- a/json/tests/draft4/optional/bignum.json
+++ /dev/null
@@ -1,95 +0,0 @@
-[
-    {
-        "description": "integer",
-        "schema": { "type": "integer" },
-        "tests": [
-            {
-                "description": "a bignum is an integer",
-                "data": 12345678910111213141516171819202122232425262728293031,
-                "valid": true
-            },
-            {
-                "description": "a negative bignum is an integer",
-                "data": -12345678910111213141516171819202122232425262728293031,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "number",
-        "schema": { "type": "number" },
-        "tests": [
-            {
-                "description": "a bignum is a number",
-                "data": 98249283749234923498293171823948729348710298301928331,
-                "valid": true
-            },
-            {
-                "description": "a negative bignum is a number",
-                "data": -98249283749234923498293171823948729348710298301928331,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "string",
-        "schema": { "type": "string" },
-        "tests": [
-            {
-                "description": "a bignum is not a string",
-                "data": 98249283749234923498293171823948729348710298301928331,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "maximum integer comparison",
-        "schema": { "maximum": 18446744073709551615 },
-        "tests": [
-            {
-                "description": "comparison works for high numbers",
-                "data": 18446744073709551600,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "float comparison with high precision",
-        "schema": {
-            "maximum": 972783798187987123879878123.18878137,
-            "exclusiveMaximum": true
-        },
-        "tests": [
-            {
-                "description": "comparison works for high numbers",
-                "data": 972783798187987123879878123.188781371,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "minimum integer comparison",
-        "schema": { "minimum": -18446744073709551615 },
-        "tests": [
-            {
-                "description": "comparison works for very negative numbers",
-                "data": -18446744073709551600,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "float comparison with high precision on negative numbers",
-        "schema": {
-            "minimum": -972783798187987123879878123.18878137,
-            "exclusiveMinimum": true
-        },
-        "tests": [
-            {
-                "description": "comparison works for very negative numbers",
-                "data": -972783798187987123879878123.188781371,
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft4/optional/ecmascript-regex.json b/json/tests/draft4/optional/ecmascript-regex.json
deleted file mode 100644
index c431bac..0000000
--- a/json/tests/draft4/optional/ecmascript-regex.json
+++ /dev/null
@@ -1,552 +0,0 @@
-[
-    {
-        "description": "ECMA 262 regex $ does not match trailing newline",
-        "schema": {
-            "type": "string",
-            "pattern": "^abc$"
-        },
-        "tests": [
-            {
-                "description": "matches in Python, but not in ECMA 262",
-                "data": "abc\\n",
-                "valid": false
-            },
-            {
-                "description": "matches",
-                "data": "abc",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "ECMA 262 regex converts \\t to horizontal tab",
-        "schema": {
-            "type": "string",
-            "pattern": "^\\t$"
-        },
-        "tests": [
-            {
-                "description": "does not match",
-                "data": "\\t",
-                "valid": false
-            },
-            {
-                "description": "matches",
-                "data": "\u0009",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "ECMA 262 regex escapes control codes with \\c and upper letter",
-        "schema": {
-            "type": "string",
-            "pattern": "^\\cC$"
-        },
-        "tests": [
-            {
-                "description": "does not match",
-                "data": "\\cC",
-                "valid": false
-            },
-            {
-                "description": "matches",
-                "data": "\u0003",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "ECMA 262 regex escapes control codes with \\c and lower letter",
-        "schema": {
-            "type": "string",
-            "pattern": "^\\cc$"
-        },
-        "tests": [
-            {
-                "description": "does not match",
-                "data": "\\cc",
-                "valid": false
-            },
-            {
-                "description": "matches",
-                "data": "\u0003",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "ECMA 262 \\d matches ascii digits only",
-        "schema": {
-            "type": "string",
-            "pattern": "^\\d$"
-        },
-        "tests": [
-            {
-                "description": "ASCII zero matches",
-                "data": "0",
-                "valid": true
-            },
-            {
-                "description": "NKO DIGIT ZERO does not match (unlike e.g. Python)",
-                "data": "߀",
-                "valid": false
-            },
-            {
-                "description": "NKO DIGIT ZERO (as \\u escape) does not match",
-                "data": "\u07c0",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "ECMA 262 \\D matches everything but ascii digits",
-        "schema": {
-            "type": "string",
-            "pattern": "^\\D$"
-        },
-        "tests": [
-            {
-                "description": "ASCII zero does not match",
-                "data": "0",
-                "valid": false
-            },
-            {
-                "description": "NKO DIGIT ZERO matches (unlike e.g. Python)",
-                "data": "߀",
-                "valid": true
-            },
-            {
-                "description": "NKO DIGIT ZERO (as \\u escape) matches",
-                "data": "\u07c0",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "ECMA 262 \\w matches ascii letters only",
-        "schema": {
-            "type": "string",
-            "pattern": "^\\w$"
-        },
-        "tests": [
-            {
-                "description": "ASCII 'a' matches",
-                "data": "a",
-                "valid": true
-            },
-            {
-                "description": "latin-1 e-acute does not match (unlike e.g. Python)",
-                "data": "é",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "ECMA 262 \\W matches everything but ascii letters",
-        "schema": {
-            "type": "string",
-            "pattern": "^\\W$"
-        },
-        "tests": [
-            {
-                "description": "ASCII 'a' does not match",
-                "data": "a",
-                "valid": false
-            },
-            {
-                "description": "latin-1 e-acute matches (unlike e.g. Python)",
-                "data": "é",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "ECMA 262 \\s matches whitespace",
-        "schema": {
-            "type": "string",
-            "pattern": "^\\s$"
-        },
-        "tests": [
-            {
-                "description": "ASCII space matches",
-                "data": " ",
-                "valid": true
-            },
-            {
-                "description": "Character tabulation matches",
-                "data": "\t",
-                "valid": true
-            },
-            {
-                "description": "Line tabulation matches",
-                "data": "\u000b",
-                "valid": true
-            },
-            {
-                "description": "Form feed matches",
-                "data": "\u000c",
-                "valid": true
-            },
-            {
-                "description": "latin-1 non-breaking-space matches",
-                "data": "\u00a0",
-                "valid": true
-            },
-            {
-                "description": "zero-width whitespace matches",
-                "data": "\ufeff",
-                "valid": true
-            },
-            {
-                "description": "line feed matches (line terminator)",
-                "data": "\u000a",
-                "valid": true
-            },
-            {
-                "description": "paragraph separator matches (line terminator)",
-                "data": "\u2029",
-                "valid": true
-            },
-            {
-                "description": "EM SPACE matches (Space_Separator)",
-                "data": "\u2003",
-                "valid": true
-            },
-            {
-                "description": "Non-whitespace control does not match",
-                "data": "\u0001",
-                "valid": false
-            },
-            {
-                "description": "Non-whitespace does not match",
-                "data": "\u2013",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "ECMA 262 \\S matches everything but whitespace",
-        "schema": {
-            "type": "string",
-            "pattern": "^\\S$"
-        },
-        "tests": [
-            {
-                "description": "ASCII space does not match",
-                "data": " ",
-                "valid": false
-            },
-            {
-                "description": "Character tabulation does not match",
-                "data": "\t",
-                "valid": false
-            },
-            {
-                "description": "Line tabulation does not match",
-                "data": "\u000b",
-                "valid": false
-            },
-            {
-                "description": "Form feed does not match",
-                "data": "\u000c",
-                "valid": false
-            },
-            {
-                "description": "latin-1 non-breaking-space does not match",
-                "data": "\u00a0",
-                "valid": false
-            },
-            {
-                "description": "zero-width whitespace does not match",
-                "data": "\ufeff",
-                "valid": false
-            },
-            {
-                "description": "line feed does not match (line terminator)",
-                "data": "\u000a",
-                "valid": false
-            },
-            {
-                "description": "paragraph separator does not match (line terminator)",
-                "data": "\u2029",
-                "valid": false
-            },
-            {
-                "description": "EM SPACE does not match (Space_Separator)",
-                "data": "\u2003",
-                "valid": false
-            },
-            {
-                "description": "Non-whitespace control matches",
-                "data": "\u0001",
-                "valid": true
-            },
-            {
-                "description": "Non-whitespace matches",
-                "data": "\u2013",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "patterns always use unicode semantics with pattern",
-        "schema": { "pattern": "\\p{Letter}cole" },
-        "tests": [
-            {
-                "description": "ascii character in json string",
-                "data": "Les hivers de mon enfance etaient des saisons longues, longues. Nous vivions en trois lieux: l'ecole, l'eglise et la patinoire; mais la vraie vie etait sur la patinoire.",
-                "valid": true
-            },
-            {
-                "description": "literal unicode character in json string",
-                "data": "Les hivers de mon enfance étaient des saisons longues, longues. Nous vivions en trois lieux: l'école, l'église et la patinoire; mais la vraie vie était sur la patinoire.",
-                "valid": true
-            },
-            {
-                "description": "unicode character in hex format in string",
-                "data": "Les hivers de mon enfance étaient des saisons longues, longues. Nous vivions en trois lieux: l'\u00e9cole, l'église et la patinoire; mais la vraie vie était sur la patinoire.",
-                "valid": true
-            },
-            {
-                "description": "unicode matching is case-sensitive",
-                "data": "LES HIVERS DE MON ENFANCE ÉTAIENT DES SAISONS LONGUES, LONGUES. NOUS VIVIONS EN TROIS LIEUX: L'ÉCOLE, L'ÉGLISE ET LA PATINOIRE; MAIS LA VRAIE VIE ÉTAIT SUR LA PATINOIRE.",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "\\w in patterns matches [A-Za-z0-9_], not unicode letters",
-        "schema": { "pattern": "\\wcole" },
-        "tests": [
-            {
-                "description": "ascii character in json string",
-                "data": "Les hivers de mon enfance etaient des saisons longues, longues. Nous vivions en trois lieux: l'ecole, l'eglise et la patinoire; mais la vraie vie etait sur la patinoire.",
-                "valid": true
-            },
-            {
-                "description": "literal unicode character in json string",
-                "data": "Les hivers de mon enfance étaient des saisons longues, longues. Nous vivions en trois lieux: l'école, l'église et la patinoire; mais la vraie vie était sur la patinoire.",
-                "valid": false
-            },
-            {
-                "description": "unicode character in hex format in string",
-                "data": "Les hivers de mon enfance étaient des saisons longues, longues. Nous vivions en trois lieux: l'\u00e9cole, l'église et la patinoire; mais la vraie vie était sur la patinoire.",
-                "valid": false
-            },
-            {
-                "description": "unicode matching is case-sensitive",
-                "data": "LES HIVERS DE MON ENFANCE ÉTAIENT DES SAISONS LONGUES, LONGUES. NOUS VIVIONS EN TROIS LIEUX: L'ÉCOLE, L'ÉGLISE ET LA PATINOIRE; MAIS LA VRAIE VIE ÉTAIT SUR LA PATINOIRE.",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "pattern with ASCII ranges",
-        "schema": { "pattern": "[a-z]cole" },
-        "tests": [
-            {
-                "description": "literal unicode character in json string",
-                "data": "Les hivers de mon enfance étaient des saisons longues, longues. Nous vivions en trois lieux: l'école, l'église et la patinoire; mais la vraie vie était sur la patinoire.",
-                "valid": false
-            },
-            {
-                "description": "unicode character in hex format in string",
-                "data": "Les hivers de mon enfance étaient des saisons longues, longues. Nous vivions en trois lieux: l'\u00e9cole, l'église et la patinoire; mais la vraie vie était sur la patinoire.",
-                "valid": false
-            },
-            {
-                "description": "ascii characters match",
-                "data": "Les hivers de mon enfance etaient des saisons longues, longues. Nous vivions en trois lieux: l'ecole, l'eglise et la patinoire; mais la vraie vie etait sur la patinoire.",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "\\d in pattern matches [0-9], not unicode digits",
-        "schema": { "pattern": "^\\d+$" },
-        "tests": [
-            {
-                "description": "ascii digits",
-                "data": "42",
-                "valid": true
-            },
-            {
-                "description": "ascii non-digits",
-                "data": "-%#",
-                "valid": false
-            },
-            {
-                "description": "non-ascii digits (BENGALI DIGIT FOUR, BENGALI DIGIT TWO)",
-                "data": "৪২",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "pattern with non-ASCII digits",
-        "schema": { "pattern": "^\\p{digit}+$" },
-        "tests": [
-            {
-                "description": "ascii digits",
-                "data": "42",
-                "valid": true
-            },
-            {
-                "description": "ascii non-digits",
-                "data": "-%#",
-                "valid": false
-            },
-            {
-                "description": "non-ascii digits (BENGALI DIGIT FOUR, BENGALI DIGIT TWO)",
-                "data": "৪২",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "patterns always use unicode semantics with patternProperties",
-        "schema": {
-            "type": "object",
-            "patternProperties": {
-                "\\p{Letter}cole": {}
-            },
-            "additionalProperties": false
-        },
-        "tests": [
-            {
-                "description": "ascii character in json string",
-                "data": { "l'ecole": "pas de vraie vie" },
-                "valid": true
-            },
-            {
-                "description": "literal unicode character in json string",
-                "data": { "l'école": "pas de vraie vie" },
-                "valid": true
-            },
-            {
-                "description": "unicode character in hex format in string",
-                "data": { "l'\u00e9cole": "pas de vraie vie" },
-                "valid": true
-            },
-            {
-                "description": "unicode matching is case-sensitive",
-                "data": { "L'ÉCOLE": "PAS DE VRAIE VIE" },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "\\w in patternProperties matches [A-Za-z0-9_], not unicode letters",
-        "schema": {
-            "type": "object",
-            "patternProperties": {
-                "\\wcole": {}
-            },
-            "additionalProperties": false
-        },
-        "tests": [
-            {
-                "description": "ascii character in json string",
-                "data": { "l'ecole": "pas de vraie vie" },
-                "valid": true
-            },
-            {
-                "description": "literal unicode character in json string",
-                "data": { "l'école": "pas de vraie vie" },
-                "valid": false
-            },
-            {
-                "description": "unicode character in hex format in string",
-                "data": { "l'\u00e9cole": "pas de vraie vie" },
-                "valid": false
-            },
-            {
-                "description": "unicode matching is case-sensitive",
-                "data": { "L'ÉCOLE": "PAS DE VRAIE VIE" },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "patternProperties with ASCII ranges",
-        "schema": {
-            "type": "object",
-            "patternProperties": {
-                "[a-z]cole": {}
-            },
-            "additionalProperties": false
-        },
-        "tests": [
-            {
-                "description": "literal unicode character in json string",
-                "data": { "l'école": "pas de vraie vie" },
-                "valid": false
-            },
-            {
-                "description": "unicode character in hex format in string",
-                "data": { "l'\u00e9cole": "pas de vraie vie" },
-                "valid": false
-            },
-            {
-                "description": "ascii characters match",
-                "data": { "l'ecole": "pas de vraie vie" },
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "\\d in patternProperties matches [0-9], not unicode digits",
-        "schema": {
-            "type": "object",
-            "patternProperties": {
-                "^\\d+$": {}
-            },
-            "additionalProperties": false
-        },
-        "tests": [
-            {
-                "description": "ascii digits",
-                "data": { "42": "life, the universe, and everything" },
-                "valid": true
-            },
-            {
-                "description": "ascii non-digits",
-                "data": { "-%#": "spending the year dead for tax reasons" },
-                "valid": false
-            },
-            {
-                "description": "non-ascii digits (BENGALI DIGIT FOUR, BENGALI DIGIT TWO)",
-                "data": { "৪২": "khajit has wares if you have coin" },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "patternProperties with non-ASCII digits",
-        "schema": {
-            "type": "object",
-            "patternProperties": {
-                "^\\p{digit}+$": {}
-            },
-            "additionalProperties": false
-        },
-        "tests": [
-            {
-                "description": "ascii digits",
-                "data": { "42": "life, the universe, and everything" },
-                "valid": true
-            },
-            {
-                "description": "ascii non-digits",
-                "data": { "-%#": "spending the year dead for tax reasons" },
-                "valid": false
-            },
-            {
-                "description": "non-ascii digits (BENGALI DIGIT FOUR, BENGALI DIGIT TWO)",
-                "data": { "৪২": "khajit has wares if you have coin" },
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft4/optional/float-overflow.json b/json/tests/draft4/optional/float-overflow.json
deleted file mode 100644
index 47fd5ba..0000000
--- a/json/tests/draft4/optional/float-overflow.json
+++ /dev/null
@@ -1,13 +0,0 @@
-[
-    {
-        "description": "all integers are multiples of 0.5, if overflow is handled",
-        "schema": {"type": "number", "multipleOf": 0.5},
-        "tests": [
-            {
-                "description": "valid if optional overflow handling is implemented",
-                "data": 1e308,
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft4/optional/format/date-time.json b/json/tests/draft4/optional/format/date-time.json
deleted file mode 100644
index 0911273..0000000
--- a/json/tests/draft4/optional/format/date-time.json
+++ /dev/null
@@ -1,133 +0,0 @@
-[
-    {
-        "description": "validation of date-time strings",
-        "schema": { "format": "date-time" },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            },
-            {
-                "description": "a valid date-time string",
-                "data": "1963-06-19T08:30:06.283185Z",
-                "valid": true
-            },
-            {
-                "description": "a valid date-time string without second fraction",
-                "data": "1963-06-19T08:30:06Z",
-                "valid": true
-            },
-            {
-                "description": "a valid date-time string with plus offset",
-                "data": "1937-01-01T12:00:27.87+00:20",
-                "valid": true
-            },
-            {
-                "description": "a valid date-time string with minus offset",
-                "data": "1990-12-31T15:59:50.123-08:00",
-                "valid": true
-            },
-            {
-                "description": "a valid date-time with a leap second, UTC",
-                "data": "1998-12-31T23:59:60Z",
-                "valid": true
-            },
-            {
-                "description": "a valid date-time with a leap second, with minus offset",
-                "data": "1998-12-31T15:59:60.123-08:00",
-                "valid": true
-            },
-            {
-                "description": "an invalid date-time past leap second, UTC",
-                "data": "1998-12-31T23:59:61Z",
-                "valid": false
-            },
-            {
-                "description": "an invalid date-time with leap second on a wrong minute, UTC",
-                "data": "1998-12-31T23:58:60Z",
-                "valid": false
-            },
-            {
-                "description": "an invalid date-time with leap second on a wrong hour, UTC",
-                "data": "1998-12-31T22:59:60Z",
-                "valid": false
-            },
-            {
-                "description": "an invalid day in date-time string",
-                "data": "1990-02-31T15:59:59.123-08:00",
-                "valid": false
-            },
-            {
-                "description": "an invalid offset in date-time string",
-                "data": "1990-12-31T15:59:59-24:00",
-                "valid": false
-            },
-            {
-                "description": "an invalid closing Z after time-zone offset",
-                "data": "1963-06-19T08:30:06.28123+01:00Z",
-                "valid": false
-            },
-            {
-                "description": "an invalid date-time string",
-                "data": "06/19/1963 08:30:06 PST",
-                "valid": false
-            },
-            {
-                "description": "case-insensitive T and Z",
-                "data": "1963-06-19t08:30:06.283185z",
-                "valid": true
-            },
-            {
-                "description": "only RFC3339 not all of ISO 8601 are valid",
-                "data": "2013-350T01:01:01",
-                "valid": false
-            },
-            {
-                "description": "invalid non-padded month dates",
-                "data": "1963-6-19T08:30:06.283185Z",
-                "valid": false
-            },
-            {
-                "description": "invalid non-padded day dates",
-                "data": "1963-06-1T08:30:06.283185Z",
-                "valid": false
-            },
-            {
-                "description": "invalid non-ASCII '৪' (a Bengali 4) in date portion",
-                "data": "1963-06-1৪T00:00:00Z",
-                "valid": false
-            },
-            {
-                "description": "invalid non-ASCII '৪' (a Bengali 4) in time portion",
-                "data": "1963-06-11T0৪:00:00Z",
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft4/optional/format/email.json b/json/tests/draft4/optional/format/email.json
deleted file mode 100644
index d6761a4..0000000
--- a/json/tests/draft4/optional/format/email.json
+++ /dev/null
@@ -1,83 +0,0 @@
-[
-    {
-        "description": "validation of e-mail addresses",
-        "schema": { "format": "email" },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            },
-            {
-                "description": "a valid e-mail address",
-                "data": "joe.bloggs@example.com",
-                "valid": true
-            },
-            {
-                "description": "an invalid e-mail address",
-                "data": "2962",
-                "valid": false
-            },
-            {
-                "description": "tilde in local part is valid",
-                "data": "te~st@example.com",
-                "valid": true
-            },
-            {
-                "description": "tilde before local part is valid",
-                "data": "~test@example.com",
-                "valid": true
-            },
-            {
-                "description": "tilde after local part is valid",
-                "data": "test~@example.com",
-                "valid": true
-            },
-            {
-                "description": "dot before local part is not valid",
-                "data": ".test@example.com",
-                "valid": false
-            },
-            {
-                "description": "dot after local part is not valid",
-                "data": "test.@example.com",
-                "valid": false
-            },
-            {
-                "description": "two separated dots inside local part are valid",
-                "data": "te.s.t@example.com",
-                "valid": true
-            },
-            {
-                "description": "two subsequent dots inside local part are not valid",
-                "data": "te..st@example.com",
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft4/optional/format/hostname.json b/json/tests/draft4/optional/format/hostname.json
deleted file mode 100644
index 8a67fda..0000000
--- a/json/tests/draft4/optional/format/hostname.json
+++ /dev/null
@@ -1,98 +0,0 @@
-[
-    {
-        "description": "validation of host names",
-        "schema": { "format": "hostname" },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            },
-            {
-                "description": "a valid host name",
-                "data": "www.example.com",
-                "valid": true
-            },
-            {
-                "description": "a valid punycoded IDN hostname",
-                "data": "xn--4gbwdl.xn--wgbh1c",
-                "valid": true
-            },
-            {
-                "description": "a host name starting with an illegal character",
-                "data": "-a-host-name-that-starts-with--",
-                "valid": false
-            },
-            {
-                "description": "a host name containing illegal characters",
-                "data": "not_a_valid_host_name",
-                "valid": false
-            },
-            {
-                "description": "a host name with a component too long",
-                "data": "a-vvvvvvvvvvvvvvvveeeeeeeeeeeeeeeerrrrrrrrrrrrrrrryyyyyyyyyyyyyyyy-long-host-name-component",
-                "valid": false
-            },
-            {
-                "description": "starts with hyphen",
-                "data": "-hostname",
-                "valid": false
-            },
-            {
-                "description": "ends with hyphen",
-                "data": "hostname-",
-                "valid": false
-            },
-            {
-                "description": "starts with underscore",
-                "data": "_hostname",
-                "valid": false
-            },
-            {
-                "description": "ends with underscore",
-                "data": "hostname_",
-                "valid": false
-            },
-            {
-                "description": "contains underscore",
-                "data": "host_name",
-                "valid": false
-            },
-            {
-                "description": "maximum label length",
-                "data": "abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijk.com",
-                "valid": true
-            },
-            {
-                "description": "exceeds maximum label length",
-                "data": "abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijkl.com",
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft4/optional/format/ipv4.json b/json/tests/draft4/optional/format/ipv4.json
deleted file mode 100644
index 4706581..0000000
--- a/json/tests/draft4/optional/format/ipv4.json
+++ /dev/null
@@ -1,84 +0,0 @@
-[
-    {
-        "description": "validation of IP addresses",
-        "schema": { "format": "ipv4" },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            },
-            {
-                "description": "a valid IP address",
-                "data": "192.168.0.1",
-                "valid": true
-            },
-            {
-                "description": "an IP address with too many components",
-                "data": "127.0.0.0.1",
-                "valid": false
-            },
-            {
-                "description": "an IP address with out-of-range values",
-                "data": "256.256.256.256",
-                "valid": false
-            },
-            {
-                "description": "an IP address without 4 components",
-                "data": "127.0",
-                "valid": false
-            },
-            {
-                "description": "an IP address as an integer",
-                "data": "0x7f000001",
-                "valid": false
-            },
-            {
-                "description": "an IP address as an integer (decimal)",
-                "data": "2130706433",
-                "valid": false
-            },
-            {
-                "description": "invalid leading zeroes, as they are treated as octals",
-                "comment": "see https://sick.codes/universal-netmask-npm-package-used-by-270000-projects-vulnerable-to-octal-input-data-server-side-request-forgery-remote-file-inclusion-local-file-inclusion-and-more-cve-2021-28918/",
-                "data": "087.10.0.1",
-                "valid": false
-            },
-            {
-                "description": "value without leading zero is valid",
-                "data": "87.10.0.1",
-                "valid": true
-            },
-            {
-                "description": "invalid non-ASCII '২' (a Bengali 2)",
-                "data": "1২7.0.0.1",
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft4/optional/format/ipv6.json b/json/tests/draft4/optional/format/ipv6.json
deleted file mode 100644
index 94368f2..0000000
--- a/json/tests/draft4/optional/format/ipv6.json
+++ /dev/null
@@ -1,208 +0,0 @@
-[
-    {
-        "description": "validation of IPv6 addresses",
-        "schema": { "format": "ipv6" },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            },
-            {
-                "description": "a valid IPv6 address",
-                "data": "::1",
-                "valid": true
-            },
-            {
-                "description": "an IPv6 address with out-of-range values",
-                "data": "12345::",
-                "valid": false
-            },
-            {
-                "description": "trailing 4 hex symbols is valid",
-                "data": "::abef",
-                "valid": true
-            },
-            {
-                "description": "trailing 5 hex symbols is invalid",
-                "data": "::abcef",
-                "valid": false
-            },
-            {
-                "description": "an IPv6 address with too many components",
-                "data": "1:1:1:1:1:1:1:1:1:1:1:1:1:1:1:1",
-                "valid": false
-            },
-            {
-                "description": "an IPv6 address containing illegal characters",
-                "data": "::laptop",
-                "valid": false
-            },
-            {
-                "description": "no digits is valid",
-                "data": "::",
-                "valid": true
-            },
-            {
-                "description": "leading colons is valid",
-                "data": "::42:ff:1",
-                "valid": true
-            },
-            {
-                "description": "trailing colons is valid",
-                "data": "d6::",
-                "valid": true
-            },
-            {
-                "description": "missing leading octet is invalid",
-                "data": ":2:3:4:5:6:7:8",
-                "valid": false
-            },
-            {
-                "description": "missing trailing octet is invalid",
-                "data": "1:2:3:4:5:6:7:",
-                "valid": false
-            },
-            {
-                "description": "missing leading octet with omitted octets later",
-                "data": ":2:3:4::8",
-                "valid": false
-            },
-            {
-                "description": "single set of double colons in the middle is valid",
-                "data": "1:d6::42",
-                "valid": true
-            },
-            {
-                "description": "two sets of double colons is invalid",
-                "data": "1::d6::42",
-                "valid": false
-            },
-            {
-                "description": "mixed format with the ipv4 section as decimal octets",
-                "data": "1::d6:192.168.0.1",
-                "valid": true
-            },
-            {
-                "description": "mixed format with double colons between the sections",
-                "data": "1:2::192.168.0.1",
-                "valid": true
-            },
-            {
-                "description": "mixed format with ipv4 section with octet out of range",
-                "data": "1::2:192.168.256.1",
-                "valid": false
-            },
-            {
-                "description": "mixed format with ipv4 section with a hex octet",
-                "data": "1::2:192.168.ff.1",
-                "valid": false
-            },
-            {
-                "description": "mixed format with leading double colons (ipv4-mapped ipv6 address)",
-                "data": "::ffff:192.168.0.1",
-                "valid": true
-            },
-            {
-                "description": "triple colons is invalid",
-                "data": "1:2:3:4:5:::8",
-                "valid": false
-            },
-            {
-                "description": "8 octets",
-                "data": "1:2:3:4:5:6:7:8",
-                "valid": true
-            },
-            {
-                "description": "insufficient octets without double colons",
-                "data": "1:2:3:4:5:6:7",
-                "valid": false
-            },
-            {
-                "description": "no colons is invalid",
-                "data": "1",
-                "valid": false
-            },
-            {
-                "description": "ipv4 is not ipv6",
-                "data": "127.0.0.1",
-                "valid": false
-            },
-            {
-                "description": "ipv4 segment must have 4 octets",
-                "data": "1:2:3:4:1.2.3",
-                "valid": false
-            },
-            {
-                "description": "leading whitespace is invalid",
-                "data": "  ::1",
-                "valid": false
-            },
-            {
-                "description": "trailing whitespace is invalid",
-                "data": "::1  ",
-                "valid": false
-            },
-            {
-                "description": "netmask is not a part of ipv6 address",
-                "data": "fe80::/64",
-                "valid": false
-            },
-            {
-                "description": "zone id is not a part of ipv6 address",
-                "data": "fe80::a%eth1",
-                "valid": false
-            },
-            {
-                "description": "a long valid ipv6",
-                "data": "1000:1000:1000:1000:1000:1000:255.255.255.255",
-                "valid": true
-            },
-            {
-                "description": "a long invalid ipv6, below length limit, first",
-                "data": "100:100:100:100:100:100:255.255.255.255.255",
-                "valid": false
-            },
-            {
-                "description": "a long invalid ipv6, below length limit, second",
-                "data": "100:100:100:100:100:100:100:255.255.255.255",
-                "valid": false
-            },
-            {
-                "description": "invalid non-ASCII '৪' (a Bengali 4)",
-                "data": "1:2:3:4:5:6:7:৪",
-                "valid": false
-            },
-            {
-                "description": "invalid non-ASCII '৪' (a Bengali 4) in the IPv4 portion",
-                "data": "1:2::192.16৪.0.1",
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft4/optional/format/unknown.json b/json/tests/draft4/optional/format/unknown.json
deleted file mode 100644
index 12339ae..0000000
--- a/json/tests/draft4/optional/format/unknown.json
+++ /dev/null
@@ -1,43 +0,0 @@
-[
-    {
-        "description": "unknown format",
-        "schema": { "format": "unknown" },
-        "tests": [
-            {
-                "description": "unknown formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "unknown formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "unknown formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "unknown formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "unknown formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "unknown formats ignore nulls",
-                "data": null,
-                "valid": true
-            },
-            {
-                "description": "unknown formats ignore strings",
-                "data": "string",
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft4/optional/format/uri.json b/json/tests/draft4/optional/format/uri.json
deleted file mode 100644
index 4b48d40..0000000
--- a/json/tests/draft4/optional/format/uri.json
+++ /dev/null
@@ -1,138 +0,0 @@
-[
-    {
-        "description": "validation of URIs",
-        "schema": { "format": "uri" },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            },
-            {
-                "description": "a valid URL with anchor tag",
-                "data": "http://foo.bar/?baz=qux#quux",
-                "valid": true
-            },
-            {
-                "description": "a valid URL with anchor tag and parentheses",
-                "data": "http://foo.com/blah_(wikipedia)_blah#cite-1",
-                "valid": true
-            },
-            {
-                "description": "a valid URL with URL-encoded stuff",
-                "data": "http://foo.bar/?q=Test%20URL-encoded%20stuff",
-                "valid": true
-            },
-            {
-                "description": "a valid puny-coded URL ",
-                "data": "http://xn--nw2a.xn--j6w193g/",
-                "valid": true
-            },
-            {
-                "description": "a valid URL with many special characters",
-                "data": "http://-.~_!$&'()*+,;=:%40:80%2f::::::@example.com",
-                "valid": true
-            },
-            {
-                "description": "a valid URL based on IPv4",
-                "data": "http://223.255.255.254",
-                "valid": true
-            },
-            {
-                "description": "a valid URL with ftp scheme",
-                "data": "ftp://ftp.is.co.za/rfc/rfc1808.txt",
-                "valid": true
-            },
-            {
-                "description": "a valid URL for a simple text file",
-                "data": "http://www.ietf.org/rfc/rfc2396.txt",
-                "valid": true
-            },
-            {
-                "description": "a valid URL ",
-                "data": "ldap://[2001:db8::7]/c=GB?objectClass?one",
-                "valid": true
-            },
-            {
-                "description": "a valid mailto URI",
-                "data": "mailto:John.Doe@example.com",
-                "valid": true
-            },
-            {
-                "description": "a valid newsgroup URI",
-                "data": "news:comp.infosystems.www.servers.unix",
-                "valid": true
-            },
-            {
-                "description": "a valid tel URI",
-                "data": "tel:+1-816-555-1212",
-                "valid": true
-            },
-            {
-                "description": "a valid URN",
-                "data": "urn:oasis:names:specification:docbook:dtd:xml:4.1.2",
-                "valid": true
-            },
-            {
-                "description": "an invalid protocol-relative URI Reference",
-                "data": "//foo.bar/?baz=qux#quux",
-                "valid": false
-            },
-            {
-                "description": "an invalid relative URI Reference",
-                "data": "/abc",
-                "valid": false
-            },
-            {
-                "description": "an invalid URI",
-                "data": "\\\\WINDOWS\\fileshare",
-                "valid": false
-            },
-            {
-                "description": "an invalid URI though valid URI reference",
-                "data": "abc",
-                "valid": false
-            },
-            {
-                "description": "an invalid URI with spaces",
-                "data": "http:// shouldfail.com",
-                "valid": false
-            },
-            {
-                "description": "an invalid URI with spaces and missing scheme",
-                "data": ":// should fail",
-                "valid": false
-            },
-            {
-                "description": "an invalid URI with comma in scheme",
-                "data": "bar,baz:foo",
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft4/optional/non-bmp-regex.json b/json/tests/draft4/optional/non-bmp-regex.json
deleted file mode 100644
index dd67af2..0000000
--- a/json/tests/draft4/optional/non-bmp-regex.json
+++ /dev/null
@@ -1,82 +0,0 @@
-[
-    {
-        "description": "Proper UTF-16 surrogate pair handling: pattern",
-        "comment": "Optional because .Net doesn't correctly handle 32-bit Unicode characters",
-        "schema": { "pattern": "^🐲*$" },
-        "tests": [
-            {
-                "description": "matches empty",
-                "data": "",
-                "valid": true
-            },
-            {
-                "description": "matches single",
-                "data": "🐲",
-                "valid": true
-            },
-            {
-                "description": "matches two",
-                "data": "🐲🐲",
-                "valid": true
-            },
-            {
-                "description": "doesn't match one",
-                "data": "🐉",
-                "valid": false
-            },
-            {
-                "description": "doesn't match two",
-                "data": "🐉🐉",
-                "valid": false
-            },
-            {
-                "description": "doesn't match one ASCII",
-                "data": "D",
-                "valid": false
-            },
-            {
-                "description": "doesn't match two ASCII",
-                "data": "DD",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "Proper UTF-16 surrogate pair handling: patternProperties",
-        "comment": "Optional because .Net doesn't correctly handle 32-bit Unicode characters",
-        "schema": {
-            "patternProperties": {
-                "^🐲*$": {
-                    "type": "integer"
-                }
-            }
-        },
-        "tests": [
-            {
-                "description": "matches empty",
-                "data": { "": 1 },
-                "valid": true
-            },
-            {
-                "description": "matches single",
-                "data": { "🐲": 1 },
-                "valid": true
-            },
-            {
-                "description": "matches two",
-                "data": { "🐲🐲": 1 },
-                "valid": true
-            },
-            {
-                "description": "doesn't match one",
-                "data": { "🐲": "hello" },
-                "valid": false
-            },
-            {
-                "description": "doesn't match two",
-                "data": { "🐲🐲": "hello" },
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft4/optional/zeroTerminatedFloats.json b/json/tests/draft4/optional/zeroTerminatedFloats.json
deleted file mode 100644
index 9b50ea2..0000000
--- a/json/tests/draft4/optional/zeroTerminatedFloats.json
+++ /dev/null
@@ -1,15 +0,0 @@
-[
-    {
-        "description": "some languages do not distinguish between different types of numeric value",
-        "schema": {
-            "type": "integer"
-        },
-        "tests": [
-            {
-                "description": "a float is not an integer even without fractional part",
-                "data": 1.0,
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft4/pattern.json b/json/tests/draft4/pattern.json
deleted file mode 100644
index 92db0f9..0000000
--- a/json/tests/draft4/pattern.json
+++ /dev/null
@@ -1,59 +0,0 @@
-[
-    {
-        "description": "pattern validation",
-        "schema": {"pattern": "^a*$"},
-        "tests": [
-            {
-                "description": "a matching pattern is valid",
-                "data": "aaa",
-                "valid": true
-            },
-            {
-                "description": "a non-matching pattern is invalid",
-                "data": "abc",
-                "valid": false
-            },
-            {
-                "description": "ignores booleans",
-                "data": true,
-                "valid": true
-            },
-            {
-                "description": "ignores integers",
-                "data": 123,
-                "valid": true
-            },
-            {
-                "description": "ignores floats",
-                "data": 1.0,
-                "valid": true
-            },
-            {
-                "description": "ignores objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "ignores arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "ignores null",
-                "data": null,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "pattern is not anchored",
-        "schema": {"pattern": "a+"},
-        "tests": [
-            {
-                "description": "matches a substring",
-                "data": "xxaayy",
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft4/patternProperties.json b/json/tests/draft4/patternProperties.json
deleted file mode 100644
index 51c8af3..0000000
--- a/json/tests/draft4/patternProperties.json
+++ /dev/null
@@ -1,135 +0,0 @@
-[
-    {
-        "description":
-            "patternProperties validates properties matching a regex",
-        "schema": {
-            "patternProperties": {
-                "f.*o": {"type": "integer"}
-            }
-        },
-        "tests": [
-            {
-                "description": "a single valid match is valid",
-                "data": {"foo": 1},
-                "valid": true
-            },
-            {
-                "description": "multiple valid matches is valid",
-                "data": {"foo": 1, "foooooo" : 2},
-                "valid": true
-            },
-            {
-                "description": "a single invalid match is invalid",
-                "data": {"foo": "bar", "fooooo": 2},
-                "valid": false
-            },
-            {
-                "description": "multiple invalid matches is invalid",
-                "data": {"foo": "bar", "foooooo" : "baz"},
-                "valid": false
-            },
-            {
-                "description": "ignores arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "ignores strings",
-                "data": "",
-                "valid": true
-            },
-            {
-                "description": "ignores other non-objects",
-                "data": 12,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "multiple simultaneous patternProperties are validated",
-        "schema": {
-            "patternProperties": {
-                "a*": {"type": "integer"},
-                "aaa*": {"maximum": 20}
-            }
-        },
-        "tests": [
-            {
-                "description": "a single valid match is valid",
-                "data": {"a": 21},
-                "valid": true
-            },
-            {
-                "description": "a simultaneous match is valid",
-                "data": {"aaaa": 18},
-                "valid": true
-            },
-            {
-                "description": "multiple matches is valid",
-                "data": {"a": 21, "aaaa": 18},
-                "valid": true
-            },
-            {
-                "description": "an invalid due to one is invalid",
-                "data": {"a": "bar"},
-                "valid": false
-            },
-            {
-                "description": "an invalid due to the other is invalid",
-                "data": {"aaaa": 31},
-                "valid": false
-            },
-            {
-                "description": "an invalid due to both is invalid",
-                "data": {"aaa": "foo", "aaaa": 31},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "regexes are not anchored by default and are case sensitive",
-        "schema": {
-            "patternProperties": {
-                "[0-9]{2,}": { "type": "boolean" },
-                "X_": { "type": "string" }
-            }
-        },
-        "tests": [
-            {
-                "description": "non recognized members are ignored",
-                "data": { "answer 1": "42" },
-                "valid": true
-            },
-            {
-                "description": "recognized members are accounted for",
-                "data": { "a31b": null },
-                "valid": false
-            },
-            {
-                "description": "regexes are case sensitive",
-                "data": { "a_x_3": 3 },
-                "valid": true
-            },
-            {
-                "description": "regexes are case sensitive, 2",
-                "data": { "a_X_3": 3 },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "patternProperties with null valued instance properties",
-        "schema": {
-            "patternProperties": {
-                "^.*bar$": {"type": "null"}
-            }
-        },
-        "tests": [
-            {
-                "description": "allows null values",
-                "data": {"foobar": null},
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft4/properties.json b/json/tests/draft4/properties.json
deleted file mode 100644
index 195159e..0000000
--- a/json/tests/draft4/properties.json
+++ /dev/null
@@ -1,205 +0,0 @@
-[
-    {
-        "description": "object properties validation",
-        "schema": {
-            "properties": {
-                "foo": {"type": "integer"},
-                "bar": {"type": "string"}
-            }
-        },
-        "tests": [
-            {
-                "description": "both properties present and valid is valid",
-                "data": {"foo": 1, "bar": "baz"},
-                "valid": true
-            },
-            {
-                "description": "one property invalid is invalid",
-                "data": {"foo": 1, "bar": {}},
-                "valid": false
-            },
-            {
-                "description": "both properties invalid is invalid",
-                "data": {"foo": [], "bar": {}},
-                "valid": false
-            },
-            {
-                "description": "doesn't invalidate other properties",
-                "data": {"quux": []},
-                "valid": true
-            },
-            {
-                "description": "ignores arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "ignores other non-objects",
-                "data": 12,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description":
-            "properties, patternProperties, additionalProperties interaction",
-        "schema": {
-            "properties": {
-                "foo": {"type": "array", "maxItems": 3},
-                "bar": {"type": "array"}
-            },
-            "patternProperties": {"f.o": {"minItems": 2}},
-            "additionalProperties": {"type": "integer"}
-        },
-        "tests": [
-            {
-                "description": "property validates property",
-                "data": {"foo": [1, 2]},
-                "valid": true
-            },
-            {
-                "description": "property invalidates property",
-                "data": {"foo": [1, 2, 3, 4]},
-                "valid": false
-            },
-            {
-                "description": "patternProperty invalidates property",
-                "data": {"foo": []},
-                "valid": false
-            },
-            {
-                "description": "patternProperty validates nonproperty",
-                "data": {"fxo": [1, 2]},
-                "valid": true
-            },
-            {
-                "description": "patternProperty invalidates nonproperty",
-                "data": {"fxo": []},
-                "valid": false
-            },
-            {
-                "description": "additionalProperty ignores property",
-                "data": {"bar": []},
-                "valid": true
-            },
-            {
-                "description": "additionalProperty validates others",
-                "data": {"quux": 3},
-                "valid": true
-            },
-            {
-                "description": "additionalProperty invalidates others",
-                "data": {"quux": "foo"},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "properties with escaped characters",
-        "schema": {
-            "properties": {
-                "foo\nbar": {"type": "number"},
-                "foo\"bar": {"type": "number"},
-                "foo\\bar": {"type": "number"},
-                "foo\rbar": {"type": "number"},
-                "foo\tbar": {"type": "number"},
-                "foo\fbar": {"type": "number"}
-            }
-        },
-        "tests": [
-            {
-                "description": "object with all numbers is valid",
-                "data": {
-                    "foo\nbar": 1,
-                    "foo\"bar": 1,
-                    "foo\\bar": 1,
-                    "foo\rbar": 1,
-                    "foo\tbar": 1,
-                    "foo\fbar": 1
-                },
-                "valid": true
-            },
-            {
-                "description": "object with strings is invalid",
-                "data": {
-                    "foo\nbar": "1",
-                    "foo\"bar": "1",
-                    "foo\\bar": "1",
-                    "foo\rbar": "1",
-                    "foo\tbar": "1",
-                    "foo\fbar": "1"
-                },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "properties with null valued instance properties",
-        "schema": {
-            "properties": {
-                "foo": {"type": "null"}
-            }
-        },
-        "tests": [
-            {
-                "description": "allows null values",
-                "data": {"foo": null},
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "properties whose names are Javascript object property names",
-        "comment": "Ensure JS implementations don't universally consider e.g. __proto__ to always be present in an object.",
-        "schema": {
-            "properties": {
-                "__proto__": {"type": "number"},
-                "toString": {
-                    "properties": { "length": { "type": "string" } }
-                },
-                "constructor": {"type": "number"}
-            }
-        },
-        "tests": [
-            {
-                "description": "ignores arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "ignores other non-objects",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "none of the properties mentioned",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "__proto__ not valid",
-                "data": { "__proto__": "foo" },
-                "valid": false
-            },
-            {
-                "description": "toString not valid",
-                "data": { "toString": { "length": 37 } },
-                "valid": false
-            },
-            {
-                "description": "constructor not valid",
-                "data": { "constructor": { "length": 37 } },
-                "valid": false
-            },
-            {
-                "description": "all present and valid",
-                "data": { 
-                    "__proto__": 12,
-                    "toString": { "length": "foo" },
-                    "constructor": 37
-                },
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft4/ref.json b/json/tests/draft4/ref.json
deleted file mode 100644
index b714fb0..0000000
--- a/json/tests/draft4/ref.json
+++ /dev/null
@@ -1,507 +0,0 @@
-[
-    {
-        "description": "root pointer ref",
-        "schema": {
-            "properties": {
-                "foo": {"$ref": "#"}
-            },
-            "additionalProperties": false
-        },
-        "tests": [
-            {
-                "description": "match",
-                "data": {"foo": false},
-                "valid": true
-            },
-            {
-                "description": "recursive match",
-                "data": {"foo": {"foo": false}},
-                "valid": true
-            },
-            {
-                "description": "mismatch",
-                "data": {"bar": false},
-                "valid": false
-            },
-            {
-                "description": "recursive mismatch",
-                "data": {"foo": {"bar": false}},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "relative pointer ref to object",
-        "schema": {
-            "properties": {
-                "foo": {"type": "integer"},
-                "bar": {"$ref": "#/properties/foo"}
-            }
-        },
-        "tests": [
-            {
-                "description": "match",
-                "data": {"bar": 3},
-                "valid": true
-            },
-            {
-                "description": "mismatch",
-                "data": {"bar": true},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "relative pointer ref to array",
-        "schema": {
-            "items": [
-                {"type": "integer"},
-                {"$ref": "#/items/0"}
-            ]
-        },
-        "tests": [
-            {
-                "description": "match array",
-                "data": [1, 2],
-                "valid": true
-            },
-            {
-                "description": "mismatch array",
-                "data": [1, "foo"],
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "escaped pointer ref",
-        "schema": {
-            "definitions": {
-                "tilde~field": {"type": "integer"},
-                "slash/field": {"type": "integer"},
-                "percent%field": {"type": "integer"}
-            },
-            "properties": {
-                "tilde": {"$ref": "#/definitions/tilde~0field"},
-                "slash": {"$ref": "#/definitions/slash~1field"},
-                "percent": {"$ref": "#/definitions/percent%25field"}
-            }
-        },
-        "tests": [
-            {
-                "description": "slash invalid",
-                "data": {"slash": "aoeu"},
-                "valid": false
-            },
-            {
-                "description": "tilde invalid",
-                "data": {"tilde": "aoeu"},
-                "valid": false
-            },
-            {
-                "description": "percent invalid",
-                "data": {"percent": "aoeu"},
-                "valid": false
-            },
-            {
-                "description": "slash valid",
-                "data": {"slash": 123},
-                "valid": true
-            },
-            {
-                "description": "tilde valid",
-                "data": {"tilde": 123},
-                "valid": true
-            },
-            {
-                "description": "percent valid",
-                "data": {"percent": 123},
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "nested refs",
-        "schema": {
-            "definitions": {
-                "a": {"type": "integer"},
-                "b": {"$ref": "#/definitions/a"},
-                "c": {"$ref": "#/definitions/b"}
-            },
-            "allOf": [{ "$ref": "#/definitions/c" }]
-        },
-        "tests": [
-            {
-                "description": "nested ref valid",
-                "data": 5,
-                "valid": true
-            },
-            {
-                "description": "nested ref invalid",
-                "data": "a",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "ref overrides any sibling keywords",
-        "schema": {
-            "definitions": {
-                "reffed": {
-                    "type": "array"
-                }
-            },
-            "properties": {
-                "foo": {
-                    "$ref": "#/definitions/reffed",
-                    "maxItems": 2
-                }
-            }
-        },
-        "tests": [
-            {
-                "description": "ref valid",
-                "data": { "foo": [] },
-                "valid": true
-            },
-            {
-                "description": "ref valid, maxItems ignored",
-                "data": { "foo": [ 1, 2, 3] },
-                "valid": true
-            },
-            {
-                "description": "ref invalid",
-                "data": { "foo": "string" },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "$ref prevents a sibling id from changing the base uri",
-        "schema": {
-            "id": "http://localhost:1234/sibling_id/base/",
-            "definitions": {
-                "foo": {
-                    "id": "http://localhost:1234/sibling_id/foo.json",
-                    "type": "string"
-                },
-                "base_foo": {
-                    "$comment": "this canonical uri is http://localhost:1234/sibling_id/base/foo.json",
-                    "id": "foo.json",
-                    "type": "number"
-                }
-            },
-            "allOf": [
-                {
-                    "$comment": "$ref resolves to http://localhost:1234/sibling_id/base/foo.json, not http://localhost:1234/sibling_id/foo.json",
-                    "id": "http://localhost:1234/sibling_id/",
-                    "$ref": "foo.json"
-                }
-            ]
-        },
-        "tests": [
-            {
-                "description": "$ref resolves to /definitions/base_foo, data does not validate",
-                "data": "a",
-                "valid": false
-            },
-            {
-                "description": "$ref resolves to /definitions/base_foo, data validates",
-                "data": 1,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "remote ref, containing refs itself",
-        "schema": {"$ref": "http://json-schema.org/draft-04/schema#"},
-        "tests": [
-            {
-                "description": "remote ref valid",
-                "data": {"minLength": 1},
-                "valid": true
-            },
-            {
-                "description": "remote ref invalid",
-                "data": {"minLength": -1},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "property named $ref that is not a reference",
-        "schema": {
-            "properties": {
-                "$ref": {"type": "string"}
-            }
-        },
-        "tests": [
-            {
-                "description": "property named $ref valid",
-                "data": {"$ref": "a"},
-                "valid": true
-            },
-            {
-                "description": "property named $ref invalid",
-                "data": {"$ref": 2},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "property named $ref, containing an actual $ref",
-        "schema": {
-            "properties": {
-                "$ref": {"$ref": "#/definitions/is-string"}
-            },
-            "definitions": {
-                "is-string": {
-                    "type": "string"
-                }
-            }
-        },
-        "tests": [
-            {
-                "description": "property named $ref valid",
-                "data": {"$ref": "a"},
-                "valid": true
-            },
-            {
-                "description": "property named $ref invalid",
-                "data": {"$ref": 2},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "Recursive references between schemas",
-        "schema": {
-            "id": "http://localhost:1234/tree",
-            "description": "tree of nodes",
-            "type": "object",
-            "properties": {
-                "meta": {"type": "string"},
-                "nodes": {
-                    "type": "array",
-                    "items": {"$ref": "node"}
-                }
-            },
-            "required": ["meta", "nodes"],
-            "definitions": {
-                "node": {
-                    "id": "http://localhost:1234/node",
-                    "description": "node",
-                    "type": "object",
-                    "properties": {
-                        "value": {"type": "number"},
-                        "subtree": {"$ref": "tree"}
-                    },
-                    "required": ["value"]
-                }
-            }
-        },
-        "tests": [
-            {
-                "description": "valid tree",
-                "data": { 
-                    "meta": "root",
-                    "nodes": [
-                        {
-                            "value": 1,
-                            "subtree": {
-                                "meta": "child",
-                                "nodes": [
-                                    {"value": 1.1},
-                                    {"value": 1.2}
-                                ]
-                            }
-                        },
-                        {
-                            "value": 2,
-                            "subtree": {
-                                "meta": "child",
-                                "nodes": [
-                                    {"value": 2.1},
-                                    {"value": 2.2}
-                                ]
-                            }
-                        }
-                    ]
-                },
-                "valid": true
-            },
-            {
-                "description": "invalid tree",
-                "data": { 
-                    "meta": "root",
-                    "nodes": [
-                        {
-                            "value": 1,
-                            "subtree": {
-                                "meta": "child",
-                                "nodes": [
-                                    {"value": "string is invalid"},
-                                    {"value": 1.2}
-                                ]
-                            }
-                        },
-                        {
-                            "value": 2,
-                            "subtree": {
-                                "meta": "child",
-                                "nodes": [
-                                    {"value": 2.1},
-                                    {"value": 2.2}
-                                ]
-                            }
-                        }
-                    ]
-                },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "refs with quote",
-        "schema": {
-            "properties": {
-                "foo\"bar": {"$ref": "#/definitions/foo%22bar"}
-            },
-            "definitions": {
-                "foo\"bar": {"type": "number"}
-            }
-        },
-        "tests": [
-            {
-                "description": "object with numbers is valid",
-                "data": {
-                    "foo\"bar": 1
-                },
-                "valid": true
-            },
-            {
-                "description": "object with strings is invalid",
-                "data": {
-                    "foo\"bar": "1"
-                },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "Location-independent identifier",
-        "schema": {
-            "allOf": [{
-                "$ref": "#foo"
-            }],
-            "definitions": {
-                "A": {
-                    "id": "#foo",
-                    "type": "integer"
-                }
-            }
-        },
-        "tests": [
-            {
-                "data": 1,
-                "description": "match",
-                "valid": true
-            },
-            {
-                "data": "a",
-                "description": "mismatch",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "Location-independent identifier with base URI change in subschema",
-        "schema": {
-            "id": "http://localhost:1234/root",
-            "allOf": [{
-                "$ref": "http://localhost:1234/nested.json#foo"
-            }],
-            "definitions": {
-                "A": {
-                    "id": "nested.json",
-                    "definitions": {
-                        "B": {
-                            "id": "#foo",
-                            "type": "integer"
-                        }
-                    }
-                }
-            }
-        },
-        "tests": [
-            {
-                "data": 1,
-                "description": "match",
-                "valid": true
-            },
-            {
-                "data": "a",
-                "description": "mismatch",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "naive replacement of $ref with its destination is not correct",
-        "schema": {
-            "definitions": {
-                "a_string": { "type": "string" }
-            },
-            "enum": [
-                { "$ref": "#/definitions/a_string" }
-            ]
-        },
-        "tests": [
-            {
-                "description": "do not evaluate the $ref inside the enum, matching any string",
-                "data": "this is a string",
-                "valid": false
-            },
-            {
-                "description": "match the enum exactly",
-                "data": { "$ref": "#/definitions/a_string" },
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "id must be resolved against nearest parent, not just immediate parent",
-        "schema": {
-            "id": "http://example.com/a.json",
-            "definitions": {
-                "x": {
-                    "id": "http://example.com/b/c.json",
-                    "not": {
-                        "definitions": {
-                            "y": {
-                                "id": "d.json",
-                                "type": "number"
-                            }
-                        }
-                    }
-                }
-            },
-            "allOf": [
-                {
-                    "$ref": "http://example.com/b/d.json"
-                }
-            ]
-        },
-        "tests": [
-            {
-                "description": "number is valid",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "non-number is invalid",
-                "data": "a",
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft4/refRemote.json b/json/tests/draft4/refRemote.json
deleted file mode 100644
index 412c9ff..0000000
--- a/json/tests/draft4/refRemote.json
+++ /dev/null
@@ -1,189 +0,0 @@
-[
-    {
-        "description": "remote ref",
-        "schema": {"$ref": "http://localhost:1234/integer.json"},
-        "tests": [
-            {
-                "description": "remote ref valid",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "remote ref invalid",
-                "data": "a",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "fragment within remote ref",
-        "schema": {"$ref": "http://localhost:1234/subSchemas.json#/integer"},
-        "tests": [
-            {
-                "description": "remote fragment valid",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "remote fragment invalid",
-                "data": "a",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "ref within remote ref",
-        "schema": {
-            "$ref": "http://localhost:1234/subSchemas.json#/refToInteger"
-        },
-        "tests": [
-            {
-                "description": "ref within ref valid",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "ref within ref invalid",
-                "data": "a",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "base URI change",
-        "schema": {
-            "id": "http://localhost:1234/",
-            "items": {
-                "id": "baseUriChange/",
-                "items": {"$ref": "folderInteger.json"}
-            }
-        },
-        "tests": [
-            {
-                "description": "base URI change ref valid",
-                "data": [[1]],
-                "valid": true
-            },
-            {
-                "description": "base URI change ref invalid",
-                "data": [["a"]],
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "base URI change - change folder",
-        "schema": {
-            "id": "http://localhost:1234/scope_change_defs1.json",
-            "type" : "object",
-            "properties": {
-                "list": {"$ref": "#/definitions/baz"}
-            },
-            "definitions": {
-                "baz": {
-                    "id": "baseUriChangeFolder/",
-                    "type": "array",
-                    "items": {"$ref": "folderInteger.json"}
-                }
-            }
-        },
-        "tests": [
-            {
-                "description": "number is valid",
-                "data": {"list": [1]},
-                "valid": true
-            },
-            {
-                "description": "string is invalid",
-                "data": {"list": ["a"]},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "base URI change - change folder in subschema",
-        "schema": {
-            "id": "http://localhost:1234/scope_change_defs2.json",
-            "type" : "object",
-            "properties": {
-                "list": {"$ref": "#/definitions/baz/definitions/bar"}
-            },
-            "definitions": {
-                "baz": {
-                    "id": "baseUriChangeFolderInSubschema/",
-                    "definitions": {
-                        "bar": {
-                            "type": "array",
-                            "items": {"$ref": "folderInteger.json"}
-                        }
-                    }
-                }
-            }
-        },
-        "tests": [
-            {
-                "description": "number is valid",
-                "data": {"list": [1]},
-                "valid": true
-            },
-            {
-                "description": "string is invalid",
-                "data": {"list": ["a"]},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "root ref in remote ref",
-        "schema": {
-            "id": "http://localhost:1234/object",
-            "type": "object",
-            "properties": {
-                "name": {"$ref": "name.json#/definitions/orNull"}
-            }
-        },
-        "tests": [
-            {
-                "description": "string is valid",
-                "data": {
-                    "name": "foo"
-                },
-                "valid": true
-            },
-            {
-                "description": "null is valid",
-                "data": {
-                    "name": null
-                },
-                "valid": true
-            },
-            {
-                "description": "object is invalid",
-                "data": {
-                    "name": {
-                        "name": null
-                    }
-                },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "Location-independent identifier in remote ref",
-        "schema": {
-            "$ref": "http://localhost:1234/locationIndependentIdentifierDraft4.json#/definitions/refToInteger"
-        },
-        "tests": [
-            {
-                "description": "integer is valid",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "string is invalid",
-                "data": "foo",
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft4/required.json b/json/tests/draft4/required.json
deleted file mode 100644
index 6ccfdc2..0000000
--- a/json/tests/draft4/required.json
+++ /dev/null
@@ -1,135 +0,0 @@
-[
-    {
-        "description": "required validation",
-        "schema": {
-            "properties": {
-                "foo": {},
-                "bar": {}
-            },
-            "required": ["foo"]
-        },
-        "tests": [
-            {
-                "description": "present required property is valid",
-                "data": {"foo": 1},
-                "valid": true
-            },
-            {
-                "description": "non-present required property is invalid",
-                "data": {"bar": 1},
-                "valid": false
-            },
-            {
-                "description": "ignores arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "ignores strings",
-                "data": "",
-                "valid": true
-            },
-            {
-                "description": "ignores other non-objects",
-                "data": 12,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "required default validation",
-        "schema": {
-            "properties": {
-                "foo": {}
-            }
-        },
-        "tests": [
-            {
-                "description": "not required by default",
-                "data": {},
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "required with escaped characters",
-        "schema": {
-            "required": [
-                "foo\nbar",
-                "foo\"bar",
-                "foo\\bar",
-                "foo\rbar",
-                "foo\tbar",
-                "foo\fbar"
-            ]
-        },
-        "tests": [
-            {
-                "description": "object with all properties present is valid",
-                "data": {
-                    "foo\nbar": 1,
-                    "foo\"bar": 1,
-                    "foo\\bar": 1,
-                    "foo\rbar": 1,
-                    "foo\tbar": 1,
-                    "foo\fbar": 1
-                },
-                "valid": true
-            },
-            {
-                "description": "object with some properties missing is invalid",
-                "data": {
-                    "foo\nbar": "1",
-                    "foo\"bar": "1"
-                },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "required properties whose names are Javascript object property names",
-        "comment": "Ensure JS implementations don't universally consider e.g. __proto__ to always be present in an object.",
-        "schema": { "required": ["__proto__", "toString", "constructor"] },
-        "tests": [
-            {
-                "description": "ignores arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "ignores other non-objects",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "none of the properties mentioned",
-                "data": {},
-                "valid": false
-            },
-            {
-                "description": "__proto__ present",
-                "data": { "__proto__": "foo" },
-                "valid": false
-            },
-            {
-                "description": "toString present",
-                "data": { "toString": { "length": 37 } },
-                "valid": false
-            },
-            {
-                "description": "constructor present",
-                "data": { "constructor": { "length": 37 } },
-                "valid": false
-            },
-            {
-                "description": "all present",
-                "data": { 
-                    "__proto__": 12,
-                    "toString": { "length": "foo" },
-                    "constructor": 37
-                },
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft4/type.json b/json/tests/draft4/type.json
deleted file mode 100644
index df46677..0000000
--- a/json/tests/draft4/type.json
+++ /dev/null
@@ -1,469 +0,0 @@
-[
-    {
-        "description": "integer type matches integers",
-        "schema": {"type": "integer"},
-        "tests": [
-            {
-                "description": "an integer is an integer",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "a float is not an integer",
-                "data": 1.1,
-                "valid": false
-            },
-            {
-                "description": "a string is not an integer",
-                "data": "foo",
-                "valid": false
-            },
-            {
-                "description": "a string is still not an integer, even if it looks like one",
-                "data": "1",
-                "valid": false
-            },
-            {
-                "description": "an object is not an integer",
-                "data": {},
-                "valid": false
-            },
-            {
-                "description": "an array is not an integer",
-                "data": [],
-                "valid": false
-            },
-            {
-                "description": "a boolean is not an integer",
-                "data": true,
-                "valid": false
-            },
-            {
-                "description": "null is not an integer",
-                "data": null,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "number type matches numbers",
-        "schema": {"type": "number"},
-        "tests": [
-            {
-                "description": "an integer is a number",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "a float with zero fractional part is a number",
-                "data": 1.0,
-                "valid": true
-            },
-            {
-                "description": "a float is a number",
-                "data": 1.1,
-                "valid": true
-            },
-            {
-                "description": "a string is not a number",
-                "data": "foo",
-                "valid": false
-            },
-            {
-                "description": "a string is still not a number, even if it looks like one",
-                "data": "1",
-                "valid": false
-            },
-            {
-                "description": "an object is not a number",
-                "data": {},
-                "valid": false
-            },
-            {
-                "description": "an array is not a number",
-                "data": [],
-                "valid": false
-            },
-            {
-                "description": "a boolean is not a number",
-                "data": true,
-                "valid": false
-            },
-            {
-                "description": "null is not a number",
-                "data": null,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "string type matches strings",
-        "schema": {"type": "string"},
-        "tests": [
-            {
-                "description": "1 is not a string",
-                "data": 1,
-                "valid": false
-            },
-            {
-                "description": "a float is not a string",
-                "data": 1.1,
-                "valid": false
-            },
-            {
-                "description": "a string is a string",
-                "data": "foo",
-                "valid": true
-            },
-            {
-                "description": "a string is still a string, even if it looks like a number",
-                "data": "1",
-                "valid": true
-            },
-            {
-                "description": "an empty string is still a string",
-                "data": "",
-                "valid": true
-            },
-            {
-                "description": "an object is not a string",
-                "data": {},
-                "valid": false
-            },
-            {
-                "description": "an array is not a string",
-                "data": [],
-                "valid": false
-            },
-            {
-                "description": "a boolean is not a string",
-                "data": true,
-                "valid": false
-            },
-            {
-                "description": "null is not a string",
-                "data": null,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "object type matches objects",
-        "schema": {"type": "object"},
-        "tests": [
-            {
-                "description": "an integer is not an object",
-                "data": 1,
-                "valid": false
-            },
-            {
-                "description": "a float is not an object",
-                "data": 1.1,
-                "valid": false
-            },
-            {
-                "description": "a string is not an object",
-                "data": "foo",
-                "valid": false
-            },
-            {
-                "description": "an object is an object",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "an array is not an object",
-                "data": [],
-                "valid": false
-            },
-            {
-                "description": "a boolean is not an object",
-                "data": true,
-                "valid": false
-            },
-            {
-                "description": "null is not an object",
-                "data": null,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "array type matches arrays",
-        "schema": {"type": "array"},
-        "tests": [
-            {
-                "description": "an integer is not an array",
-                "data": 1,
-                "valid": false
-            },
-            {
-                "description": "a float is not an array",
-                "data": 1.1,
-                "valid": false
-            },
-            {
-                "description": "a string is not an array",
-                "data": "foo",
-                "valid": false
-            },
-            {
-                "description": "an object is not an array",
-                "data": {},
-                "valid": false
-            },
-            {
-                "description": "an array is an array",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "a boolean is not an array",
-                "data": true,
-                "valid": false
-            },
-            {
-                "description": "null is not an array",
-                "data": null,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "boolean type matches booleans",
-        "schema": {"type": "boolean"},
-        "tests": [
-            {
-                "description": "an integer is not a boolean",
-                "data": 1,
-                "valid": false
-            },
-            {
-                "description": "zero is not a boolean",
-                "data": 0,
-                "valid": false
-            },
-            {
-                "description": "a float is not a boolean",
-                "data": 1.1,
-                "valid": false
-            },
-            {
-                "description": "a string is not a boolean",
-                "data": "foo",
-                "valid": false
-            },
-            {
-                "description": "an empty string is not a boolean",
-                "data": "",
-                "valid": false
-            },
-            {
-                "description": "an object is not a boolean",
-                "data": {},
-                "valid": false
-            },
-            {
-                "description": "an array is not a boolean",
-                "data": [],
-                "valid": false
-            },
-            {
-                "description": "true is a boolean",
-                "data": true,
-                "valid": true
-            },
-            {
-                "description": "false is a boolean",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "null is not a boolean",
-                "data": null,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "null type matches only the null object",
-        "schema": {"type": "null"},
-        "tests": [
-            {
-                "description": "an integer is not null",
-                "data": 1,
-                "valid": false
-            },
-            {
-                "description": "a float is not null",
-                "data": 1.1,
-                "valid": false
-            },
-            {
-                "description": "zero is not null",
-                "data": 0,
-                "valid": false
-            },
-            {
-                "description": "a string is not null",
-                "data": "foo",
-                "valid": false
-            },
-            {
-                "description": "an empty string is not null",
-                "data": "",
-                "valid": false
-            },
-            {
-                "description": "an object is not null",
-                "data": {},
-                "valid": false
-            },
-            {
-                "description": "an array is not null",
-                "data": [],
-                "valid": false
-            },
-            {
-                "description": "true is not null",
-                "data": true,
-                "valid": false
-            },
-            {
-                "description": "false is not null",
-                "data": false,
-                "valid": false
-            },
-            {
-                "description": "null is null",
-                "data": null,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "multiple types can be specified in an array",
-        "schema": {"type": ["integer", "string"]},
-        "tests": [
-            {
-                "description": "an integer is valid",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "a string is valid",
-                "data": "foo",
-                "valid": true
-            },
-            {
-                "description": "a float is invalid",
-                "data": 1.1,
-                "valid": false
-            },
-            {
-                "description": "an object is invalid",
-                "data": {},
-                "valid": false
-            },
-            {
-                "description": "an array is invalid",
-                "data": [],
-                "valid": false
-            },
-            {
-                "description": "a boolean is invalid",
-                "data": true,
-                "valid": false
-            },
-            {
-                "description": "null is invalid",
-                "data": null,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "type as array with one item",
-        "schema": {
-            "type": ["string"]
-        },
-        "tests": [
-            {
-                "description": "string is valid",
-                "data": "foo",
-                "valid": true
-            },
-            {
-                "description": "number is invalid",
-                "data": 123,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "type: array or object",
-        "schema": {
-            "type": ["array", "object"]
-        },
-        "tests": [
-            {
-                "description": "array is valid",
-                "data": [1,2,3],
-                "valid": true
-            },
-            {
-                "description": "object is valid",
-                "data": {"foo": 123},
-                "valid": true
-            },
-            {
-                "description": "number is invalid",
-                "data": 123,
-                "valid": false
-            },
-            {
-                "description": "string is invalid",
-                "data": "foo",
-                "valid": false
-            },
-            {
-                "description": "null is invalid",
-                "data": null,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "type: array, object or null",
-        "schema": {
-            "type": ["array", "object", "null"]
-        },
-        "tests": [
-            {
-                "description": "array is valid",
-                "data": [1,2,3],
-                "valid": true
-            },
-            {
-                "description": "object is valid",
-                "data": {"foo": 123},
-                "valid": true
-            },
-            {
-                "description": "null is valid",
-                "data": null,
-                "valid": true
-            },
-            {
-                "description": "number is invalid",
-                "data": 123,
-                "valid": false
-            },
-            {
-                "description": "string is invalid",
-                "data": "foo",
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft4/uniqueItems.json b/json/tests/draft4/uniqueItems.json
deleted file mode 100644
index 2ccf666..0000000
--- a/json/tests/draft4/uniqueItems.json
+++ /dev/null
@@ -1,404 +0,0 @@
-[
-    {
-        "description": "uniqueItems validation",
-        "schema": {"uniqueItems": true},
-        "tests": [
-            {
-                "description": "unique array of integers is valid",
-                "data": [1, 2],
-                "valid": true
-            },
-            {
-                "description": "non-unique array of integers is invalid",
-                "data": [1, 1],
-                "valid": false
-            },
-            {
-                "description": "non-unique array of more than two integers is invalid",
-                "data": [1, 2, 1],
-                "valid": false
-            },
-            {
-                "description": "numbers are unique if mathematically unequal",
-                "data": [1.0, 1.00, 1],
-                "valid": false
-            },
-            {
-                "description": "false is not equal to zero",
-                "data": [0, false],
-                "valid": true
-            },
-            {
-                "description": "true is not equal to one",
-                "data": [1, true],
-                "valid": true
-            },
-            {
-                "description": "unique array of strings is valid",
-                "data": ["foo", "bar", "baz"],
-                "valid": true
-            },
-            {
-                "description": "non-unique array of strings is invalid",
-                "data": ["foo", "bar", "foo"],
-                "valid": false
-            },
-            {
-                "description": "unique array of objects is valid",
-                "data": [{"foo": "bar"}, {"foo": "baz"}],
-                "valid": true
-            },
-            {
-                "description": "non-unique array of objects is invalid",
-                "data": [{"foo": "bar"}, {"foo": "bar"}],
-                "valid": false
-            },
-            {
-                "description": "unique array of nested objects is valid",
-                "data": [
-                    {"foo": {"bar" : {"baz" : true}}},
-                    {"foo": {"bar" : {"baz" : false}}}
-                ],
-                "valid": true
-            },
-            {
-                "description": "non-unique array of nested objects is invalid",
-                "data": [
-                    {"foo": {"bar" : {"baz" : true}}},
-                    {"foo": {"bar" : {"baz" : true}}}
-                ],
-                "valid": false
-            },
-            {
-                "description": "unique array of arrays is valid",
-                "data": [["foo"], ["bar"]],
-                "valid": true
-            },
-            {
-                "description": "non-unique array of arrays is invalid",
-                "data": [["foo"], ["foo"]],
-                "valid": false
-            },
-            {
-                "description": "non-unique array of more than two arrays is invalid",
-                "data": [["foo"], ["bar"], ["foo"]],
-                "valid": false
-            },
-            {
-                "description": "1 and true are unique",
-                "data": [1, true],
-                "valid": true
-            },
-            {
-                "description": "0 and false are unique",
-                "data": [0, false],
-                "valid": true
-            },
-            {
-                "description": "[1] and [true] are unique",
-                "data": [[1], [true]],
-                "valid": true
-            },
-            {
-                "description": "[0] and [false] are unique",
-                "data": [[0], [false]],
-                "valid": true
-            },
-            {
-                "description": "nested [1] and [true] are unique",
-                "data": [[[1], "foo"], [[true], "foo"]],
-                "valid": true
-            },
-            {
-                "description": "nested [0] and [false] are unique",
-                "data": [[[0], "foo"], [[false], "foo"]],
-                "valid": true
-            },
-            {
-                "description": "unique heterogeneous types are valid",
-                "data": [{}, [1], true, null, 1, "{}"],
-                "valid": true
-            },
-            {
-                "description": "non-unique heterogeneous types are invalid",
-                "data": [{}, [1], true, null, {}, 1],
-                "valid": false
-            },
-            {
-                "description": "different objects are unique",
-                "data": [{"a": 1, "b": 2}, {"a": 2, "b": 1}],
-                "valid": true
-            },
-            {
-                "description": "objects are non-unique despite key order",
-                "data": [{"a": 1, "b": 2}, {"b": 2, "a": 1}],
-                "valid": false
-            },
-            {
-                "description": "{\"a\": false} and {\"a\": 0} are unique",
-                "data": [{"a": false}, {"a": 0}],
-                "valid": true
-            },
-            {
-                "description": "{\"a\": true} and {\"a\": 1} are unique",
-                "data": [{"a": true}, {"a": 1}],
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "uniqueItems with an array of items",
-        "schema": {
-            "items": [{"type": "boolean"}, {"type": "boolean"}],
-            "uniqueItems": true
-        },
-        "tests": [
-            {
-                "description": "[false, true] from items array is valid",
-                "data": [false, true],
-                "valid": true
-            },
-            {
-                "description": "[true, false] from items array is valid",
-                "data": [true, false],
-                "valid": true
-            },
-            {
-                "description": "[false, false] from items array is not valid",
-                "data": [false, false],
-                "valid": false
-            },
-            {
-                "description": "[true, true] from items array is not valid",
-                "data": [true, true],
-                "valid": false
-            },
-            {
-                "description": "unique array extended from [false, true] is valid",
-                "data": [false, true, "foo", "bar"],
-                "valid": true
-            },
-            {
-                "description": "unique array extended from [true, false] is valid",
-                "data": [true, false, "foo", "bar"],
-                "valid": true
-            },
-            {
-                "description": "non-unique array extended from [false, true] is not valid",
-                "data": [false, true, "foo", "foo"],
-                "valid": false
-            },
-            {
-                "description": "non-unique array extended from [true, false] is not valid",
-                "data": [true, false, "foo", "foo"],
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "uniqueItems with an array of items and additionalItems=false",
-        "schema": {
-            "items": [{"type": "boolean"}, {"type": "boolean"}],
-            "uniqueItems": true,
-            "additionalItems": false
-        },
-        "tests": [
-            {
-                "description": "[false, true] from items array is valid",
-                "data": [false, true],
-                "valid": true
-            },
-            {
-                "description": "[true, false] from items array is valid",
-                "data": [true, false],
-                "valid": true
-            },
-            {
-                "description": "[false, false] from items array is not valid",
-                "data": [false, false],
-                "valid": false
-            },
-            {
-                "description": "[true, true] from items array is not valid",
-                "data": [true, true],
-                "valid": false
-            },
-            {
-                "description": "extra items are invalid even if unique",
-                "data": [false, true, null],
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "uniqueItems=false validation",
-        "schema": { "uniqueItems": false },
-        "tests": [
-            {
-                "description": "unique array of integers is valid",
-                "data": [1, 2],
-                "valid": true
-            },
-            {
-                "description": "non-unique array of integers is valid",
-                "data": [1, 1],
-                "valid": true
-            },
-            {
-                "description": "numbers are unique if mathematically unequal",
-                "data": [1.0, 1.00, 1],
-                "valid": true
-            },
-            {
-                "description": "false is not equal to zero",
-                "data": [0, false],
-                "valid": true
-            },
-            {
-                "description": "true is not equal to one",
-                "data": [1, true],
-                "valid": true
-            },
-            {
-                "description": "unique array of objects is valid",
-                "data": [{"foo": "bar"}, {"foo": "baz"}],
-                "valid": true
-            },
-            {
-                "description": "non-unique array of objects is valid",
-                "data": [{"foo": "bar"}, {"foo": "bar"}],
-                "valid": true
-            },
-            {
-                "description": "unique array of nested objects is valid",
-                "data": [
-                    {"foo": {"bar" : {"baz" : true}}},
-                    {"foo": {"bar" : {"baz" : false}}}
-                ],
-                "valid": true
-            },
-            {
-                "description": "non-unique array of nested objects is valid",
-                "data": [
-                    {"foo": {"bar" : {"baz" : true}}},
-                    {"foo": {"bar" : {"baz" : true}}}
-                ],
-                "valid": true
-            },
-            {
-                "description": "unique array of arrays is valid",
-                "data": [["foo"], ["bar"]],
-                "valid": true
-            },
-            {
-                "description": "non-unique array of arrays is valid",
-                "data": [["foo"], ["foo"]],
-                "valid": true
-            },
-            {
-                "description": "1 and true are unique",
-                "data": [1, true],
-                "valid": true
-            },
-            {
-                "description": "0 and false are unique",
-                "data": [0, false],
-                "valid": true
-            },
-            {
-                "description": "unique heterogeneous types are valid",
-                "data": [{}, [1], true, null, 1],
-                "valid": true
-            },
-            {
-                "description": "non-unique heterogeneous types are valid",
-                "data": [{}, [1], true, null, {}, 1],
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "uniqueItems=false with an array of items",
-        "schema": {
-            "items": [{"type": "boolean"}, {"type": "boolean"}],
-            "uniqueItems": false
-        },
-        "tests": [
-            {
-                "description": "[false, true] from items array is valid",
-                "data": [false, true],
-                "valid": true
-            },
-            {
-                "description": "[true, false] from items array is valid",
-                "data": [true, false],
-                "valid": true
-            },
-            {
-                "description": "[false, false] from items array is valid",
-                "data": [false, false],
-                "valid": true
-            },
-            {
-                "description": "[true, true] from items array is valid",
-                "data": [true, true],
-                "valid": true
-            },
-            {
-                "description": "unique array extended from [false, true] is valid",
-                "data": [false, true, "foo", "bar"],
-                "valid": true
-            },
-            {
-                "description": "unique array extended from [true, false] is valid",
-                "data": [true, false, "foo", "bar"],
-                "valid": true
-            },
-            {
-                "description": "non-unique array extended from [false, true] is valid",
-                "data": [false, true, "foo", "foo"],
-                "valid": true
-            },
-            {
-                "description": "non-unique array extended from [true, false] is valid",
-                "data": [true, false, "foo", "foo"],
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "uniqueItems=false with an array of items and additionalItems=false",
-        "schema": {
-            "items": [{"type": "boolean"}, {"type": "boolean"}],
-            "uniqueItems": false,
-            "additionalItems": false
-        },
-        "tests": [
-            {
-                "description": "[false, true] from items array is valid",
-                "data": [false, true],
-                "valid": true
-            },
-            {
-                "description": "[true, false] from items array is valid",
-                "data": [true, false],
-                "valid": true
-            },
-            {
-                "description": "[false, false] from items array is valid",
-                "data": [false, false],
-                "valid": true
-            },
-            {
-                "description": "[true, true] from items array is valid",
-                "data": [true, true],
-                "valid": true
-            },
-            {
-                "description": "extra items are invalid even if unique",
-                "data": [false, true, null],
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft6/additionalItems.json b/json/tests/draft6/additionalItems.json
deleted file mode 100644
index deb44fd..0000000
--- a/json/tests/draft6/additionalItems.json
+++ /dev/null
@@ -1,164 +0,0 @@
-[
-    {
-        "description": "additionalItems as schema",
-        "schema": {
-            "items": [{}],
-            "additionalItems": {"type": "integer"}
-        },
-        "tests": [
-            {
-                "description": "additional items match schema",
-                "data": [ null, 2, 3, 4 ],
-                "valid": true
-            },
-            {
-                "description": "additional items do not match schema",
-                "data": [ null, 2, 3, "foo" ],
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "when items is schema, additionalItems does nothing",
-        "schema": {
-            "items": {},
-            "additionalItems": false
-        },
-        "tests": [
-            {
-                "description": "all items match schema",
-                "data": [ 1, 2, 3, 4, 5 ],
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "array of items with no additionalItems permitted",
-        "schema": {
-            "items": [{}, {}, {}],
-            "additionalItems": false
-        },
-        "tests": [
-            {
-                "description": "empty array",
-                "data": [ ],
-                "valid": true
-            },
-            {
-                "description": "fewer number of items present (1)",
-                "data": [ 1 ],
-                "valid": true
-            },
-            {
-                "description": "fewer number of items present (2)",
-                "data": [ 1, 2 ],
-                "valid": true
-            },
-            {
-                "description": "equal number of items present",
-                "data": [ 1, 2, 3 ],
-                "valid": true
-            },
-            {
-                "description": "additional items are not permitted",
-                "data": [ 1, 2, 3, 4 ],
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "additionalItems as false without items",
-        "schema": {"additionalItems": false},
-        "tests": [
-            {
-                "description":
-                    "items defaults to empty schema so everything is valid",
-                "data": [ 1, 2, 3, 4, 5 ],
-                "valid": true
-            },
-            {
-                "description": "ignores non-arrays",
-                "data": {"foo" : "bar"},
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "additionalItems are allowed by default",
-        "schema": {"items": [{"type": "integer"}]},
-        "tests": [
-            {
-                "description": "only the first item is validated",
-                "data": [1, "foo", false],
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "additionalItems does not look in applicators, valid case",
-        "schema": {
-            "allOf": [
-                { "items": [ { "type": "integer" } ] }
-            ],
-            "additionalItems": { "type": "boolean" }
-        },
-        "tests": [
-            {
-                "description": "items defined in allOf are not examined",
-                "data": [ 1, null ],
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "additionalItems does not look in applicators, invalid case",
-        "schema": {
-            "allOf": [
-                { "items": [ { "type": "integer" }, { "type": "string" } ] }
-            ],
-            "items": [ {"type": "integer" } ],
-            "additionalItems": { "type": "boolean" }
-        },
-        "tests": [
-            {
-                "description": "items defined in allOf are not examined",
-                "data": [ 1, "hello" ],
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "items validation adjusts the starting index for additionalItems",
-        "schema": {
-            "items": [ { "type": "string" } ],
-            "additionalItems": { "type": "integer" }
-        },
-        "tests": [
-            {
-                "description": "valid items",
-                "data": [ "x", 2, 3 ],
-                "valid": true
-            },
-            {
-                "description": "wrong type of second item",
-                "data": [ "x", "y" ],
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "additionalItems with null instance elements",
-        "schema": {
-            "additionalItems": {
-                "type": "null"
-            }
-        },
-        "tests": [
-            {
-                "description": "allows null elements",
-                "data": [ null ],
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft6/additionalProperties.json b/json/tests/draft6/additionalProperties.json
deleted file mode 100644
index 0f8e162..0000000
--- a/json/tests/draft6/additionalProperties.json
+++ /dev/null
@@ -1,147 +0,0 @@
-[
-    {
-        "description":
-            "additionalProperties being false does not allow other properties",
-        "schema": {
-            "properties": {"foo": {}, "bar": {}},
-            "patternProperties": { "^v": {} },
-            "additionalProperties": false
-        },
-        "tests": [
-            {
-                "description": "no additional properties is valid",
-                "data": {"foo": 1},
-                "valid": true
-            },
-            {
-                "description": "an additional property is invalid",
-                "data": {"foo" : 1, "bar" : 2, "quux" : "boom"},
-                "valid": false
-            },
-            {
-                "description": "ignores arrays",
-                "data": [1, 2, 3],
-                "valid": true
-            },
-            {
-                "description": "ignores strings",
-                "data": "foobarbaz",
-                "valid": true
-            },
-            {
-                "description": "ignores other non-objects",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "patternProperties are not additional properties",
-                "data": {"foo":1, "vroom": 2},
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "non-ASCII pattern with additionalProperties",
-        "schema": {
-            "patternProperties": {"^á": {}},
-            "additionalProperties": false
-        },
-        "tests": [
-            {
-                "description": "matching the pattern is valid",
-                "data": {"ármányos": 2},
-                "valid": true
-            },
-            {
-                "description": "not matching the pattern is invalid",
-                "data": {"élmény": 2},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "additionalProperties with schema",
-        "schema": {
-            "properties": {"foo": {}, "bar": {}},
-            "additionalProperties": {"type": "boolean"}
-        },
-        "tests": [
-            {
-                "description": "no additional properties is valid",
-                "data": {"foo": 1},
-                "valid": true
-            },
-            {
-                "description": "an additional valid property is valid",
-                "data": {"foo" : 1, "bar" : 2, "quux" : true},
-                "valid": true
-            },
-            {
-                "description": "an additional invalid property is invalid",
-                "data": {"foo" : 1, "bar" : 2, "quux" : 12},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description":
-            "additionalProperties can exist by itself",
-        "schema": {
-            "additionalProperties": {"type": "boolean"}
-        },
-        "tests": [
-            {
-                "description": "an additional valid property is valid",
-                "data": {"foo" : true},
-                "valid": true
-            },
-            {
-                "description": "an additional invalid property is invalid",
-                "data": {"foo" : 1},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "additionalProperties are allowed by default",
-        "schema": {"properties": {"foo": {}, "bar": {}}},
-        "tests": [
-            {
-                "description": "additional properties are allowed",
-                "data": {"foo": 1, "bar": 2, "quux": true},
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "additionalProperties does not look in applicators",
-        "schema": {
-            "allOf": [
-                {"properties": {"foo": {}}}
-            ],
-            "additionalProperties": {"type": "boolean"}
-        },
-        "tests": [
-            {
-                "description": "properties defined in allOf are not examined",
-                "data": {"foo": 1, "bar": true},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "additionalProperties with null valued instance properties",
-        "schema": {
-            "additionalProperties": {
-                "type": "null"
-            }
-        },
-        "tests": [
-            {
-                "description": "allows null values",
-                "data": {"foo": null},
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft6/allOf.json b/json/tests/draft6/allOf.json
deleted file mode 100644
index ec9319e..0000000
--- a/json/tests/draft6/allOf.json
+++ /dev/null
@@ -1,294 +0,0 @@
-[
-    {
-        "description": "allOf",
-        "schema": {
-            "allOf": [
-                {
-                    "properties": {
-                        "bar": {"type": "integer"}
-                    },
-                    "required": ["bar"]
-                },
-                {
-                    "properties": {
-                        "foo": {"type": "string"}
-                    },
-                    "required": ["foo"]
-                }
-            ]
-        },
-        "tests": [
-            {
-                "description": "allOf",
-                "data": {"foo": "baz", "bar": 2},
-                "valid": true
-            },
-            {
-                "description": "mismatch second",
-                "data": {"foo": "baz"},
-                "valid": false
-            },
-            {
-                "description": "mismatch first",
-                "data": {"bar": 2},
-                "valid": false
-            },
-            {
-                "description": "wrong type",
-                "data": {"foo": "baz", "bar": "quux"},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "allOf with base schema",
-        "schema": {
-            "properties": {"bar": {"type": "integer"}},
-            "required": ["bar"],
-            "allOf" : [
-                {
-                    "properties": {
-                        "foo": {"type": "string"}
-                    },
-                    "required": ["foo"]
-                },
-                {
-                    "properties": {
-                        "baz": {"type": "null"}
-                    },
-                    "required": ["baz"]
-                }
-            ]
-        },
-        "tests": [
-            {
-                "description": "valid",
-                "data": {"foo": "quux", "bar": 2, "baz": null},
-                "valid": true
-            },
-            {
-                "description": "mismatch base schema",
-                "data": {"foo": "quux", "baz": null},
-                "valid": false
-            },
-            {
-                "description": "mismatch first allOf",
-                "data": {"bar": 2, "baz": null},
-                "valid": false
-            },
-            {
-                "description": "mismatch second allOf",
-                "data": {"foo": "quux", "bar": 2},
-                "valid": false
-            },
-            {
-                "description": "mismatch both",
-                "data": {"bar": 2},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "allOf simple types",
-        "schema": {
-            "allOf": [
-                {"maximum": 30},
-                {"minimum": 20}
-            ]
-        },
-        "tests": [
-            {
-                "description": "valid",
-                "data": 25,
-                "valid": true
-            },
-            {
-                "description": "mismatch one",
-                "data": 35,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "allOf with boolean schemas, all true",
-        "schema": {"allOf": [true, true]},
-        "tests": [
-            {
-                "description": "any value is valid",
-                "data": "foo",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "allOf with boolean schemas, some false",
-        "schema": {"allOf": [true, false]},
-        "tests": [
-            {
-                "description": "any value is invalid",
-                "data": "foo",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "allOf with boolean schemas, all false",
-        "schema": {"allOf": [false, false]},
-        "tests": [
-            {
-                "description": "any value is invalid",
-                "data": "foo",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "allOf with one empty schema",
-        "schema": {
-            "allOf": [
-                {}
-            ]
-        },
-        "tests": [
-            {
-                "description": "any data is valid",
-                "data": 1,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "allOf with two empty schemas",
-        "schema": {
-            "allOf": [
-                {},
-                {}
-            ]
-        },
-        "tests": [
-            {
-                "description": "any data is valid",
-                "data": 1,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "allOf with the first empty schema",
-        "schema": {
-            "allOf": [
-                {},
-                { "type": "number" }
-            ]
-        },
-        "tests": [
-            {
-                "description": "number is valid",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "string is invalid",
-                "data": "foo",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "allOf with the last empty schema",
-        "schema": {
-            "allOf": [
-                { "type": "number" },
-                {}
-            ]
-        },
-        "tests": [
-            {
-                "description": "number is valid",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "string is invalid",
-                "data": "foo",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "nested allOf, to check validation semantics",
-        "schema": {
-            "allOf": [
-                {
-                    "allOf": [
-                        {
-                            "type": "null"
-                        }
-                    ]
-                }
-            ]
-        },
-        "tests": [
-            {
-                "description": "null is valid",
-                "data": null,
-                "valid": true
-            },
-            {
-                "description": "anything non-null is invalid",
-                "data": 123,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "allOf combined with anyOf, oneOf",
-        "schema": {
-            "allOf": [ { "multipleOf": 2 } ],
-            "anyOf": [ { "multipleOf": 3 } ],
-            "oneOf": [ { "multipleOf": 5 } ]
-        },
-        "tests": [
-            {
-                "description": "allOf: false, anyOf: false, oneOf: false",
-                "data": 1,
-                "valid": false
-            },
-            {
-                "description": "allOf: false, anyOf: false, oneOf: true",
-                "data": 5,
-                "valid": false
-            },
-            {
-                "description": "allOf: false, anyOf: true, oneOf: false",
-                "data": 3,
-                "valid": false
-            },
-            {
-                "description": "allOf: false, anyOf: true, oneOf: true",
-                "data": 15,
-                "valid": false
-            },
-            {
-                "description": "allOf: true, anyOf: false, oneOf: false",
-                "data": 2,
-                "valid": false
-            },
-            {
-                "description": "allOf: true, anyOf: false, oneOf: true",
-                "data": 10,
-                "valid": false
-            },
-            {
-                "description": "allOf: true, anyOf: true, oneOf: false",
-                "data": 6,
-                "valid": false
-            },
-            {
-                "description": "allOf: true, anyOf: true, oneOf: true",
-                "data": 30,
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft6/anyOf.json b/json/tests/draft6/anyOf.json
deleted file mode 100644
index ab5eb38..0000000
--- a/json/tests/draft6/anyOf.json
+++ /dev/null
@@ -1,189 +0,0 @@
-[
-    {
-        "description": "anyOf",
-        "schema": {
-            "anyOf": [
-                {
-                    "type": "integer"
-                },
-                {
-                    "minimum": 2
-                }
-            ]
-        },
-        "tests": [
-            {
-                "description": "first anyOf valid",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "second anyOf valid",
-                "data": 2.5,
-                "valid": true
-            },
-            {
-                "description": "both anyOf valid",
-                "data": 3,
-                "valid": true
-            },
-            {
-                "description": "neither anyOf valid",
-                "data": 1.5,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "anyOf with base schema",
-        "schema": {
-            "type": "string",
-            "anyOf" : [
-                {
-                    "maxLength": 2
-                },
-                {
-                    "minLength": 4
-                }
-            ]
-        },
-        "tests": [
-            {
-                "description": "mismatch base schema",
-                "data": 3,
-                "valid": false
-            },
-            {
-                "description": "one anyOf valid",
-                "data": "foobar",
-                "valid": true
-            },
-            {
-                "description": "both anyOf invalid",
-                "data": "foo",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "anyOf with boolean schemas, all true",
-        "schema": {"anyOf": [true, true]},
-        "tests": [
-            {
-                "description": "any value is valid",
-                "data": "foo",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "anyOf with boolean schemas, some true",
-        "schema": {"anyOf": [true, false]},
-        "tests": [
-            {
-                "description": "any value is valid",
-                "data": "foo",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "anyOf with boolean schemas, all false",
-        "schema": {"anyOf": [false, false]},
-        "tests": [
-            {
-                "description": "any value is invalid",
-                "data": "foo",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "anyOf complex types",
-        "schema": {
-            "anyOf": [
-                {
-                    "properties": {
-                        "bar": {"type": "integer"}
-                    },
-                    "required": ["bar"]
-                },
-                {
-                    "properties": {
-                        "foo": {"type": "string"}
-                    },
-                    "required": ["foo"]
-                }
-            ]
-        },
-        "tests": [
-            {
-                "description": "first anyOf valid (complex)",
-                "data": {"bar": 2},
-                "valid": true
-            },
-            {
-                "description": "second anyOf valid (complex)",
-                "data": {"foo": "baz"},
-                "valid": true
-            },
-            {
-                "description": "both anyOf valid (complex)",
-                "data": {"foo": "baz", "bar": 2},
-                "valid": true
-            },
-            {
-                "description": "neither anyOf valid (complex)",
-                "data": {"foo": 2, "bar": "quux"},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "anyOf with one empty schema",
-        "schema": {
-            "anyOf": [
-                { "type": "number" },
-                {}
-            ]
-        },
-        "tests": [
-            {
-                "description": "string is valid",
-                "data": "foo",
-                "valid": true
-            },
-            {
-                "description": "number is valid",
-                "data": 123,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "nested anyOf, to check validation semantics",
-        "schema": {
-            "anyOf": [
-                {
-                    "anyOf": [
-                        {
-                            "type": "null"
-                        }
-                    ]
-                }
-            ]
-        },
-        "tests": [
-            {
-                "description": "null is valid",
-                "data": null,
-                "valid": true
-            },
-            {
-                "description": "anything non-null is invalid",
-                "data": 123,
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft6/boolean_schema.json b/json/tests/draft6/boolean_schema.json
deleted file mode 100644
index 6d40f23..0000000
--- a/json/tests/draft6/boolean_schema.json
+++ /dev/null
@@ -1,104 +0,0 @@
-[
-    {
-        "description": "boolean schema 'true'",
-        "schema": true,
-        "tests": [
-            {
-                "description": "number is valid",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "string is valid",
-                "data": "foo",
-                "valid": true
-            },
-            {
-                "description": "boolean true is valid",
-                "data": true,
-                "valid": true
-            },
-            {
-                "description": "boolean false is valid",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "null is valid",
-                "data": null,
-                "valid": true
-            },
-            {
-                "description": "object is valid",
-                "data": {"foo": "bar"},
-                "valid": true
-            },
-            {
-                "description": "empty object is valid",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "array is valid",
-                "data": ["foo"],
-                "valid": true
-            },
-            {
-                "description": "empty array is valid",
-                "data": [],
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "boolean schema 'false'",
-        "schema": false,
-        "tests": [
-            {
-                "description": "number is invalid",
-                "data": 1,
-                "valid": false
-            },
-            {
-                "description": "string is invalid",
-                "data": "foo",
-                "valid": false
-            },
-            {
-                "description": "boolean true is invalid",
-                "data": true,
-                "valid": false
-            },
-            {
-                "description": "boolean false is invalid",
-                "data": false,
-                "valid": false
-            },
-            {
-                "description": "null is invalid",
-                "data": null,
-                "valid": false
-            },
-            {
-                "description": "object is invalid",
-                "data": {"foo": "bar"},
-                "valid": false
-            },
-            {
-                "description": "empty object is invalid",
-                "data": {},
-                "valid": false
-            },
-            {
-                "description": "array is invalid",
-                "data": ["foo"],
-                "valid": false
-            },
-            {
-                "description": "empty array is invalid",
-                "data": [],
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft6/const.json b/json/tests/draft6/const.json
deleted file mode 100644
index 1c2cafc..0000000
--- a/json/tests/draft6/const.json
+++ /dev/null
@@ -1,342 +0,0 @@
-[
-    {
-        "description": "const validation",
-        "schema": {"const": 2},
-        "tests": [
-            {
-                "description": "same value is valid",
-                "data": 2,
-                "valid": true
-            },
-            {
-                "description": "another value is invalid",
-                "data": 5,
-                "valid": false
-            },
-            {
-                "description": "another type is invalid",
-                "data": "a",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "const with object",
-        "schema": {"const": {"foo": "bar", "baz": "bax"}},
-        "tests": [
-            {
-                "description": "same object is valid",
-                "data": {"foo": "bar", "baz": "bax"},
-                "valid": true
-            },
-            {
-                "description": "same object with different property order is valid",
-                "data": {"baz": "bax", "foo": "bar"},
-                "valid": true
-            },
-            {
-                "description": "another object is invalid",
-                "data": {"foo": "bar"},
-                "valid": false
-            },
-            {
-                "description": "another type is invalid",
-                "data": [1, 2],
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "const with array",
-        "schema": {"const": [{ "foo": "bar" }]},
-        "tests": [
-            {
-                "description": "same array is valid",
-                "data": [{"foo": "bar"}],
-                "valid": true
-            },
-            {
-                "description": "another array item is invalid",
-                "data": [2],
-                "valid": false
-            },
-            {
-                "description": "array with additional items is invalid",
-                "data": [1, 2, 3],
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "const with null",
-        "schema": {"const": null},
-        "tests": [
-            {
-                "description": "null is valid",
-                "data": null,
-                "valid": true
-            },
-            {
-                "description": "not null is invalid",
-                "data": 0,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "const with false does not match 0",
-        "schema": {"const": false},
-        "tests": [
-            {
-                "description": "false is valid",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "integer zero is invalid",
-                "data": 0,
-                "valid": false
-            },
-            {
-                "description": "float zero is invalid",
-                "data": 0.0,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "const with true does not match 1",
-        "schema": {"const": true},
-        "tests": [
-            {
-                "description": "true is valid",
-                "data": true,
-                "valid": true
-            },
-            {
-                "description": "integer one is invalid",
-                "data": 1,
-                "valid": false
-            },
-            {
-                "description": "float one is invalid",
-                "data": 1.0,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "const with [false] does not match [0]",
-        "schema": {"const": [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": "const with [true] does not match [1]",
-        "schema": {"const": [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": "const with {\"a\": false} does not match {\"a\": 0}",
-        "schema": {"const": {"a": false}},
-        "tests": [
-            {
-                "description": "{\"a\": false} is valid",
-                "data": {"a": false},
-                "valid": true
-            },
-            {
-                "description": "{\"a\": 0} is invalid",
-                "data": {"a": 0},
-                "valid": false
-            },
-            {
-                "description": "{\"a\": 0.0} is invalid",
-                "data": {"a": 0.0},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "const with {\"a\": true} does not match {\"a\": 1}",
-        "schema": {"const": {"a": true}},
-        "tests": [
-            {
-                "description": "{\"a\": true} is valid",
-                "data": {"a": true},
-                "valid": true
-            },
-            {
-                "description": "{\"a\": 1} is invalid",
-                "data": {"a": 1},
-                "valid": false
-            },
-            {
-                "description": "{\"a\": 1.0} is invalid",
-                "data": {"a": 1.0},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "const with 0 does not match other zero-like types",
-        "schema": {"const": 0},
-        "tests": [
-            {
-                "description": "false is invalid",
-                "data": false,
-                "valid": false
-            },
-            {
-                "description": "integer zero is valid",
-                "data": 0,
-                "valid": true
-            },
-            {
-                "description": "float zero is valid",
-                "data": 0.0,
-                "valid": true
-            },
-            {
-                "description": "empty object is invalid",
-                "data": {},
-                "valid": false
-            },
-            {
-                "description": "empty array is invalid",
-                "data": [],
-                "valid": false
-            },
-            {
-                "description": "empty string is invalid",
-                "data": "",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "const with 1 does not match true",
-        "schema": {"const": 1},
-        "tests": [
-            {
-                "description": "true is invalid",
-                "data": true,
-                "valid": false
-            },
-            {
-                "description": "integer one is valid",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "float one is valid",
-                "data": 1.0,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "const with -2.0 matches integer and float types",
-        "schema": {"const": -2.0},
-        "tests": [
-            {
-                "description": "integer -2 is valid",
-                "data": -2,
-                "valid": true
-            },
-            {
-                "description": "integer 2 is invalid",
-                "data": 2,
-                "valid": false
-            },
-            {
-                "description": "float -2.0 is valid",
-                "data": -2.0,
-                "valid": true
-            },
-            {
-                "description": "float 2.0 is invalid",
-                "data": 2.0,
-                "valid": false
-            },
-            {
-                "description": "float -2.00001 is invalid",
-                "data": -2.00001,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "float and integers are equal up to 64-bit representation limits",
-        "schema": {"const": 9007199254740992},
-        "tests": [
-            {
-                "description": "integer is valid",
-                "data": 9007199254740992,
-                "valid": true
-            },
-            {
-                "description": "integer minus one is invalid",
-                "data": 9007199254740991,
-                "valid": false
-            },
-            {
-                "description": "float is valid",
-                "data": 9007199254740992.0,
-                "valid": true
-            },
-            {
-                "description": "float minus one is invalid",
-                "data": 9007199254740991.0,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "nul characters in strings",
-        "schema": { "const": "hello\u0000there" },
-        "tests": [
-            {
-                "description": "match string with nul",
-                "data": "hello\u0000there",
-                "valid": true
-            },
-            {
-                "description": "do not match string lacking nul",
-                "data": "hellothere",
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft6/contains.json b/json/tests/draft6/contains.json
deleted file mode 100644
index bd93654..0000000
--- a/json/tests/draft6/contains.json
+++ /dev/null
@@ -1,144 +0,0 @@
-[
-    {
-        "description": "contains keyword validation",
-        "schema": {
-            "contains": {"minimum": 5}
-        },
-        "tests": [
-            {
-                "description": "array with item matching schema (5) is valid",
-                "data": [3, 4, 5],
-                "valid": true
-            },
-            {
-                "description": "array with item matching schema (6) is valid",
-                "data": [3, 4, 6],
-                "valid": true
-            },
-            {
-                "description": "array with two items matching schema (5, 6) is valid",
-                "data": [3, 4, 5, 6],
-                "valid": true
-            },
-            {
-                "description": "array without items matching schema is invalid",
-                "data": [2, 3, 4],
-                "valid": false
-            },
-            {
-                "description": "empty array is invalid",
-                "data": [],
-                "valid": false
-            },
-            {
-                "description": "not array is valid",
-                "data": {},
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "contains keyword with const keyword",
-        "schema": {
-            "contains": { "const": 5 }
-        },
-        "tests": [
-            {
-                "description": "array with item 5 is valid",
-                "data": [3, 4, 5],
-                "valid": true
-            },
-            {
-                "description": "array with two items 5 is valid",
-                "data": [3, 4, 5, 5],
-                "valid": true
-            },
-            {
-                "description": "array without item 5 is invalid",
-                "data": [1, 2, 3, 4],
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "contains keyword with boolean schema true",
-        "schema": {"contains": true},
-        "tests": [
-            {
-                "description": "any non-empty array is valid",
-                "data": ["foo"],
-                "valid": true
-            },
-            {
-                "description": "empty array is invalid",
-                "data": [],
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "contains keyword with boolean schema false",
-        "schema": {"contains": false},
-        "tests": [
-            {
-                "description": "any non-empty array is invalid",
-                "data": ["foo"],
-                "valid": false
-            },
-            {
-                "description": "empty array is invalid",
-                "data": [],
-                "valid": false
-            },
-            {
-                "description": "non-arrays are valid",
-                "data": "contains does not apply to strings",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "items + contains",
-        "schema": {
-            "items": { "multipleOf": 2 },
-            "contains": { "multipleOf": 3 }
-        },
-        "tests": [
-            {
-                "description": "matches items, does not match contains",
-                "data": [ 2, 4, 8 ],
-                "valid": false
-            },
-            {
-                "description": "does not match items, matches contains",
-                "data": [ 3, 6, 9 ],
-                "valid": false
-            },
-            {
-                "description": "matches both items and contains",
-                "data": [ 6, 12 ],
-                "valid": true
-            },
-            {
-                "description": "matches neither items nor contains",
-                "data": [ 1, 5 ],
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "contains with null instance elements",
-        "schema": {
-            "contains": {
-                "type": "null"
-            }
-        },
-        "tests": [
-            {
-                "description": "allows null items",
-                "data": [ null ],
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft6/default.json b/json/tests/draft6/default.json
deleted file mode 100644
index 289a9b6..0000000
--- a/json/tests/draft6/default.json
+++ /dev/null
@@ -1,79 +0,0 @@
-[
-    {
-        "description": "invalid type for default",
-        "schema": {
-            "properties": {
-                "foo": {
-                    "type": "integer",
-                    "default": []
-                }
-            }
-        },
-        "tests": [
-            {
-                "description": "valid when property is specified",
-                "data": {"foo": 13},
-                "valid": true
-            },
-            {
-                "description": "still valid when the invalid default is used",
-                "data": {},
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "invalid string value for default",
-        "schema": {
-            "properties": {
-                "bar": {
-                    "type": "string",
-                    "minLength": 4,
-                    "default": "bad"
-                }
-            }
-        },
-        "tests": [
-            {
-                "description": "valid when property is specified",
-                "data": {"bar": "good"},
-                "valid": true
-            },
-            {
-                "description": "still valid when the invalid default is used",
-                "data": {},
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "the default keyword does not do anything if the property is missing",
-        "schema": {
-            "type": "object",
-            "properties": {
-                "alpha": {
-                    "type": "number",
-                    "maximum": 3,
-                    "default": 5
-                }
-            }
-        },
-        "tests": [
-            {
-                "description": "an explicit property value is checked against maximum (passing)",
-                "data": { "alpha": 1 },
-                "valid": true
-            },
-            {
-                "description": "an explicit property value is checked against maximum (failing)",
-                "data": { "alpha": 5 },
-                "valid": false
-            },
-            {
-                "description": "missing properties are not filled in with the default",
-                "data": {},
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft6/definitions.json b/json/tests/draft6/definitions.json
deleted file mode 100644
index d772fde..0000000
--- a/json/tests/draft6/definitions.json
+++ /dev/null
@@ -1,26 +0,0 @@
-[
-    {
-        "description": "validate definition against metaschema",
-        "schema": {"$ref": "http://json-schema.org/draft-06/schema#"},
-        "tests": [
-            {
-                "description": "valid definition schema",
-                "data": {
-                    "definitions": {
-                        "foo": {"type": "integer"}
-                    }
-                },
-                "valid": true
-            },
-            {
-                "description": "invalid definition schema",
-                "data": {
-                    "definitions": {
-                        "foo": {"type": 1}
-                    }
-                },
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft6/dependencies.json b/json/tests/draft6/dependencies.json
deleted file mode 100644
index a5e5428..0000000
--- a/json/tests/draft6/dependencies.json
+++ /dev/null
@@ -1,248 +0,0 @@
-[
-    {
-        "description": "dependencies",
-        "schema": {
-            "dependencies": {"bar": ["foo"]}
-        },
-        "tests": [
-            {
-                "description": "neither",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "nondependant",
-                "data": {"foo": 1},
-                "valid": true
-            },
-            {
-                "description": "with dependency",
-                "data": {"foo": 1, "bar": 2},
-                "valid": true
-            },
-            {
-                "description": "missing dependency",
-                "data": {"bar": 2},
-                "valid": false
-            },
-            {
-                "description": "ignores arrays",
-                "data": ["bar"],
-                "valid": true
-            },
-            {
-                "description": "ignores strings",
-                "data": "foobar",
-                "valid": true
-            },
-            {
-                "description": "ignores other non-objects",
-                "data": 12,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "dependencies with empty array",
-        "schema": {
-            "dependencies": {"bar": []}
-        },
-        "tests": [
-            {
-                "description": "empty object",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "object with one property",
-                "data": {"bar": 2},
-                "valid": true
-            },
-            {
-                "description": "non-object is valid",
-                "data": 1,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "multiple dependencies",
-        "schema": {
-            "dependencies": {"quux": ["foo", "bar"]}
-        },
-        "tests": [
-            {
-                "description": "neither",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "nondependants",
-                "data": {"foo": 1, "bar": 2},
-                "valid": true
-            },
-            {
-                "description": "with dependencies",
-                "data": {"foo": 1, "bar": 2, "quux": 3},
-                "valid": true
-            },
-            {
-                "description": "missing dependency",
-                "data": {"foo": 1, "quux": 2},
-                "valid": false
-            },
-            {
-                "description": "missing other dependency",
-                "data": {"bar": 1, "quux": 2},
-                "valid": false
-            },
-            {
-                "description": "missing both dependencies",
-                "data": {"quux": 1},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "multiple dependencies subschema",
-        "schema": {
-            "dependencies": {
-                "bar": {
-                    "properties": {
-                        "foo": {"type": "integer"},
-                        "bar": {"type": "integer"}
-                    }
-                }
-            }
-        },
-        "tests": [
-            {
-                "description": "valid",
-                "data": {"foo": 1, "bar": 2},
-                "valid": true
-            },
-            {
-                "description": "no dependency",
-                "data": {"foo": "quux"},
-                "valid": true
-            },
-            {
-                "description": "wrong type",
-                "data": {"foo": "quux", "bar": 2},
-                "valid": false
-            },
-            {
-                "description": "wrong type other",
-                "data": {"foo": 2, "bar": "quux"},
-                "valid": false
-            },
-            {
-                "description": "wrong type both",
-                "data": {"foo": "quux", "bar": "quux"},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "dependencies with boolean subschemas",
-        "schema": {
-            "dependencies": {
-                "foo": true,
-                "bar": false
-            }
-        },
-        "tests": [
-            {
-                "description": "object with property having schema true is valid",
-                "data": {"foo": 1},
-                "valid": true
-            },
-            {
-                "description": "object with property having schema false is invalid",
-                "data": {"bar": 2},
-                "valid": false
-            },
-            {
-                "description": "object with both properties is invalid",
-                "data": {"foo": 1, "bar": 2},
-                "valid": false
-            },
-            {
-                "description": "empty object is valid",
-                "data": {},
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "dependencies with escaped characters",
-        "schema": {
-            "dependencies": {
-                "foo\nbar": ["foo\rbar"],
-                "foo\tbar": {
-                    "minProperties": 4
-                },
-                "foo'bar": {"required": ["foo\"bar"]},
-                "foo\"bar": ["foo'bar"]
-            }
-        },
-        "tests": [
-            {
-                "description": "valid object 1",
-                "data": {
-                    "foo\nbar": 1,
-                    "foo\rbar": 2
-                },
-                "valid": true
-            },
-            {
-                "description": "valid object 2",
-                "data": {
-                    "foo\tbar": 1,
-                    "a": 2,
-                    "b": 3,
-                    "c": 4
-                },
-                "valid": true
-            },
-            {
-                "description": "valid object 3",
-                "data": {
-                    "foo'bar": 1,
-                    "foo\"bar": 2
-                },
-                "valid": true
-            },
-            {
-                "description": "invalid object 1",
-                "data": {
-                    "foo\nbar": 1,
-                    "foo": 2
-                },
-                "valid": false
-            },
-            {
-                "description": "invalid object 2",
-                "data": {
-                    "foo\tbar": 1,
-                    "a": 2
-                },
-                "valid": false
-            },
-            {
-                "description": "invalid object 3",
-                "data": {
-                    "foo'bar": 1
-                },
-                "valid": false
-            },
-            {
-                "description": "invalid object 4",
-                "data": {
-                    "foo\"bar": 2
-                },
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft6/enum.json b/json/tests/draft6/enum.json
deleted file mode 100644
index f085097..0000000
--- a/json/tests/draft6/enum.json
+++ /dev/null
@@ -1,236 +0,0 @@
-[
-    {
-        "description": "simple enum validation",
-        "schema": {"enum": [1, 2, 3]},
-        "tests": [
-            {
-                "description": "one of the enum is valid",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "something else is invalid",
-                "data": 4,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "heterogeneous enum validation",
-        "schema": {"enum": [6, "foo", [], true, {"foo": 12}]},
-        "tests": [
-            {
-                "description": "one of the enum is valid",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "something else is invalid",
-                "data": null,
-                "valid": false
-            },
-            {
-                "description": "objects are deep compared",
-                "data": {"foo": false},
-                "valid": false
-            },
-            {
-                "description": "valid object matches",
-                "data": {"foo": 12},
-                "valid": true
-            },
-            {
-                "description": "extra properties in object is invalid",
-                "data": {"foo": 12, "boo": 42},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "heterogeneous enum-with-null validation",
-        "schema": { "enum": [6, null] },
-        "tests": [
-            {
-                "description": "null is valid",
-                "data": null,
-                "valid": true
-            },
-            {
-                "description": "number is valid",
-                "data": 6,
-                "valid": true
-            },
-            {
-                "description": "something else is invalid",
-                "data": "test",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "enums in properties",
-        "schema": {
-            "type":"object",
-            "properties": {
-                "foo": {"enum":["foo"]},
-                "bar": {"enum":["bar"]}
-            },
-            "required": ["bar"]
-        },
-        "tests": [
-            {
-                "description": "both properties are valid",
-                "data": {"foo":"foo", "bar":"bar"},
-                "valid": true
-            },
-            {
-                "description": "wrong foo value",
-                "data": {"foo":"foot", "bar":"bar"},
-                "valid": false
-            },
-            {
-                "description": "wrong bar value",
-                "data": {"foo":"foo", "bar":"bart"},
-                "valid": false
-            },
-            {
-                "description": "missing optional property is valid",
-                "data": {"bar":"bar"},
-                "valid": true
-            },
-            {
-                "description": "missing required property is invalid",
-                "data": {"foo":"foo"},
-                "valid": false
-            },
-            {
-                "description": "missing all properties is invalid",
-                "data": {},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "enum with escaped characters",
-        "schema": {
-            "enum": ["foo\nbar", "foo\rbar"]
-        },
-        "tests": [
-            {
-                "description": "member 1 is valid",
-                "data": "foo\nbar",
-                "valid": true
-            },
-            {
-                "description": "member 2 is valid",
-                "data": "foo\rbar",
-                "valid": true
-            },
-            {
-                "description": "another string is invalid",
-                "data": "abc",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "enum with false does not match 0",
-        "schema": {"enum": [false]},
-        "tests": [
-            {
-                "description": "false is valid",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "integer zero is invalid",
-                "data": 0,
-                "valid": false
-            },
-            {
-                "description": "float zero is invalid",
-                "data": 0.0,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "enum with true does not match 1",
-        "schema": {"enum": [true]},
-        "tests": [
-            {
-                "description": "true is valid",
-                "data": true,
-                "valid": true
-            },
-            {
-                "description": "integer one is invalid",
-                "data": 1,
-                "valid": false
-            },
-            {
-                "description": "float one is invalid",
-                "data": 1.0,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "enum with 0 does not match false",
-        "schema": {"enum": [0]},
-        "tests": [
-            {
-                "description": "false is invalid",
-                "data": false,
-                "valid": false
-            },
-            {
-                "description": "integer zero is valid",
-                "data": 0,
-                "valid": true
-            },
-            {
-                "description": "float zero is valid",
-                "data": 0.0,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "enum with 1 does not match true",
-        "schema": {"enum": [1]},
-        "tests": [
-            {
-                "description": "true is invalid",
-                "data": true,
-                "valid": false
-            },
-            {
-                "description": "integer one is valid",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "float one is valid",
-                "data": 1.0,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "nul characters in strings",
-        "schema": { "enum": [ "hello\u0000there" ] },
-        "tests": [
-            {
-                "description": "match string with nul",
-                "data": "hello\u0000there",
-                "valid": true
-            },
-            {
-                "description": "do not match string lacking nul",
-                "data": "hellothere",
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft6/exclusiveMaximum.json b/json/tests/draft6/exclusiveMaximum.json
deleted file mode 100644
index dc3cd70..0000000
--- a/json/tests/draft6/exclusiveMaximum.json
+++ /dev/null
@@ -1,30 +0,0 @@
-[
-    {
-        "description": "exclusiveMaximum validation",
-        "schema": {
-            "exclusiveMaximum": 3.0
-        },
-        "tests": [
-            {
-                "description": "below the exclusiveMaximum is valid",
-                "data": 2.2,
-                "valid": true
-            },
-            {
-                "description": "boundary point is invalid",
-                "data": 3.0,
-                "valid": false
-            },
-            {
-                "description": "above the exclusiveMaximum is invalid",
-                "data": 3.5,
-                "valid": false
-            },
-            {
-                "description": "ignores non-numbers",
-                "data": "x",
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft6/exclusiveMinimum.json b/json/tests/draft6/exclusiveMinimum.json
deleted file mode 100644
index b38d7ec..0000000
--- a/json/tests/draft6/exclusiveMinimum.json
+++ /dev/null
@@ -1,30 +0,0 @@
-[
-    {
-        "description": "exclusiveMinimum validation",
-        "schema": {
-            "exclusiveMinimum": 1.1
-        },
-        "tests": [
-            {
-                "description": "above the exclusiveMinimum is valid",
-                "data": 1.2,
-                "valid": true
-            },
-            {
-                "description": "boundary point is invalid",
-                "data": 1.1,
-                "valid": false
-            },
-            {
-                "description": "below the exclusiveMinimum is invalid",
-                "data": 0.6,
-                "valid": false
-            },
-            {
-                "description": "ignores non-numbers",
-                "data": "x",
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft6/format.json b/json/tests/draft6/format.json
deleted file mode 100644
index 2df2a9f..0000000
--- a/json/tests/draft6/format.json
+++ /dev/null
@@ -1,326 +0,0 @@
-[
-    {
-        "description": "email format",
-        "schema": { "format": "email" },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "ipv4 format",
-        "schema": { "format": "ipv4" },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "ipv6 format",
-        "schema": { "format": "ipv6" },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "hostname format",
-        "schema": { "format": "hostname" },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "date-time format",
-        "schema": { "format": "date-time" },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "json-pointer format",
-        "schema": { "format": "json-pointer" },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "uri format",
-        "schema": { "format": "uri" },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "uri-reference format",
-        "schema": { "format": "uri-reference" },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "uri-template format",
-        "schema": { "format": "uri-template" },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft6/id.json b/json/tests/draft6/id.json
deleted file mode 100644
index 03d30fc..0000000
--- a/json/tests/draft6/id.json
+++ /dev/null
@@ -1,134 +0,0 @@
-[
-    {
-        "description": "id inside an enum is not a real identifier",
-        "comment": "the implementation must not be confused by an id buried in the enum",
-        "schema": {
-            "definitions": {
-                "id_in_enum": {
-                    "enum": [
-                        {
-                          "$id": "https://localhost:1234/id/my_identifier.json",
-                          "type": "null"
-                        }
-                    ]
-                },
-                "real_id_in_schema": {
-                    "$id": "https://localhost:1234/id/my_identifier.json",
-                    "type": "string"
-                },
-                "zzz_id_in_const": {
-                    "const": {
-                        "$id": "https://localhost:1234/id/my_identifier.json",
-                        "type": "null"
-                    }
-                }
-            },
-            "anyOf": [
-                { "$ref": "#/definitions/id_in_enum" },
-                { "$ref": "https://localhost:1234/id/my_identifier.json" }
-            ]
-        },
-        "tests": [
-            {
-                "description": "exact match to enum, and type matches",
-                "data": {
-                    "$id": "https://localhost:1234/id/my_identifier.json",
-                    "type": "null"
-                },
-                "valid": true
-            },
-            {
-                "description": "match $ref to id",
-                "data": "a string to match #/definitions/id_in_enum",
-                "valid": true
-            },
-            {
-                "description": "no match on enum or $ref to id",
-                "data": 1,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "non-schema object containing a plain-name $id property",
-        "schema": {
-            "definitions": {
-                "const_not_anchor": {
-                    "const": {
-                        "$id": "#not_a_real_anchor"
-                    }
-                }
-            },
-            "oneOf": [
-                {
-                    "const": "skip not_a_real_anchor"
-                },
-                {
-                    "allOf": [
-                        {
-                            "not": {
-                                "const": "skip not_a_real_anchor"
-                            }
-                        },
-                        {
-                            "$ref": "#/definitions/const_not_anchor"
-                        }
-                    ]
-                }
-            ]
-        },
-        "tests": [
-            {
-                "description": "skip traversing definition for a valid result",
-                "data": "skip not_a_real_anchor",
-                "valid": true
-            },
-            {
-                "description": "const at const_not_anchor does not match",
-                "data": 1,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "non-schema object containing an $id property",
-        "schema": {
-            "definitions": {
-                "const_not_id": {
-                    "const": {
-                        "$id": "not_a_real_id"
-                    }
-                }
-            },
-            "oneOf": [
-                {
-                    "const":"skip not_a_real_id"
-                },
-                {
-                    "allOf": [
-                        {
-                            "not": {
-                                "const": "skip not_a_real_id"
-                            }
-                        },
-                        {
-                            "$ref": "#/definitions/const_not_id"
-                        }
-                    ]
-                }
-            ]
-        },
-        "tests": [
-            {
-                "description": "skip traversing definition for a valid result",
-                "data": "skip not_a_real_id",
-                "valid": true
-            },
-            {
-                "description": "const at const_not_id does not match",
-                "data": 1,
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft6/infinite-loop-detection.json b/json/tests/draft6/infinite-loop-detection.json
deleted file mode 100644
index f98c74f..0000000
--- a/json/tests/draft6/infinite-loop-detection.json
+++ /dev/null
@@ -1,36 +0,0 @@
-[
-    {
-        "description": "evaluating the same schema location against the same data location twice is not a sign of an infinite loop",
-        "schema": {
-            "definitions": {
-                "int": { "type": "integer" }
-            },
-            "allOf": [
-                {
-                    "properties": {
-                        "foo": {
-                            "$ref": "#/definitions/int"
-                        }
-                    }
-                },
-                {
-                    "additionalProperties": {
-                        "$ref": "#/definitions/int"
-                    }
-                }
-            ]
-        },
-        "tests": [
-            {
-                "description": "passing case",
-                "data": { "foo": 1 },
-                "valid": true
-            },
-            {
-                "description": "failing case",
-                "data": { "foo": "a string" },
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft6/items.json b/json/tests/draft6/items.json
deleted file mode 100644
index 7ed6781..0000000
--- a/json/tests/draft6/items.json
+++ /dev/null
@@ -1,282 +0,0 @@
-[
-    {
-        "description": "a schema given for items",
-        "schema": {
-            "items": {"type": "integer"}
-        },
-        "tests": [
-            {
-                "description": "valid items",
-                "data": [ 1, 2, 3 ],
-                "valid": true
-            },
-            {
-                "description": "wrong type of items",
-                "data": [1, "x"],
-                "valid": false
-            },
-            {
-                "description": "ignores non-arrays",
-                "data": {"foo" : "bar"},
-                "valid": true
-            },
-            {
-                "description": "JavaScript pseudo-array is valid",
-                "data": {
-                    "0": "invalid",
-                    "length": 1
-                },
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "an array of schemas for items",
-        "schema": {
-            "items": [
-                {"type": "integer"},
-                {"type": "string"}
-            ]
-        },
-        "tests": [
-            {
-                "description": "correct types",
-                "data": [ 1, "foo" ],
-                "valid": true
-            },
-            {
-                "description": "wrong types",
-                "data": [ "foo", 1 ],
-                "valid": false
-            },
-            {
-                "description": "incomplete array of items",
-                "data": [ 1 ],
-                "valid": true
-            },
-            {
-                "description": "array with additional items",
-                "data": [ 1, "foo", true ],
-                "valid": true
-            },
-            {
-                "description": "empty array",
-                "data": [ ],
-                "valid": true
-            },
-            {
-                "description": "JavaScript pseudo-array is valid",
-                "data": {
-                    "0": "invalid",
-                    "1": "valid",
-                    "length": 2
-                },
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "items with boolean schema (true)",
-        "schema": {"items": true},
-        "tests": [
-            {
-                "description": "any array is valid",
-                "data": [ 1, "foo", true ],
-                "valid": true
-            },
-            {
-                "description": "empty array is valid",
-                "data": [],
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "items with boolean schema (false)",
-        "schema": {"items": false},
-        "tests": [
-            {
-                "description": "any non-empty array is invalid",
-                "data": [ 1, "foo", true ],
-                "valid": false
-            },
-            {
-                "description": "empty array is valid",
-                "data": [],
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "items with boolean schemas",
-        "schema": {
-            "items": [true, false]
-        },
-        "tests": [
-            {
-                "description": "array with one item is valid",
-                "data": [ 1 ],
-                "valid": true
-            },
-            {
-                "description": "array with two items is invalid",
-                "data": [ 1, "foo" ],
-                "valid": false
-            },
-            {
-                "description": "empty array is valid",
-                "data": [],
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "items and subitems",
-        "schema": {
-            "definitions": {
-                "item": {
-                    "type": "array",
-                    "additionalItems": false,
-                    "items": [
-                        { "$ref": "#/definitions/sub-item" },
-                        { "$ref": "#/definitions/sub-item" }
-                    ]
-                },
-                "sub-item": {
-                    "type": "object",
-                    "required": ["foo"]
-                }
-            },
-            "type": "array",
-            "additionalItems": false,
-            "items": [
-                { "$ref": "#/definitions/item" },
-                { "$ref": "#/definitions/item" },
-                { "$ref": "#/definitions/item" }
-            ]
-        },
-        "tests": [
-            {
-                "description": "valid items",
-                "data": [
-                    [ {"foo": null}, {"foo": null} ],
-                    [ {"foo": null}, {"foo": null} ],
-                    [ {"foo": null}, {"foo": null} ]
-                ],
-                "valid": true
-            },
-            {
-                "description": "too many items",
-                "data": [
-                    [ {"foo": null}, {"foo": null} ],
-                    [ {"foo": null}, {"foo": null} ],
-                    [ {"foo": null}, {"foo": null} ],
-                    [ {"foo": null}, {"foo": null} ]
-                ],
-                "valid": false
-            },
-            {
-                "description": "too many sub-items",
-                "data": [
-                    [ {"foo": null}, {"foo": null}, {"foo": null} ],
-                    [ {"foo": null}, {"foo": null} ],
-                    [ {"foo": null}, {"foo": null} ]
-                ],
-                "valid": false
-            },
-            {
-                "description": "wrong item",
-                "data": [
-                    {"foo": null},
-                    [ {"foo": null}, {"foo": null} ],
-                    [ {"foo": null}, {"foo": null} ]
-                ],
-                "valid": false
-            },
-            {
-                "description": "wrong sub-item",
-                "data": [
-                    [ {}, {"foo": null} ],
-                    [ {"foo": null}, {"foo": null} ],
-                    [ {"foo": null}, {"foo": null} ]
-                ],
-                "valid": false
-            },
-            {
-                "description": "fewer items is valid",
-                "data": [
-                    [ {"foo": null} ],
-                    [ {"foo": null} ]
-                ],
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "nested items",
-        "schema": {
-            "type": "array",
-            "items": {
-                "type": "array",
-                "items": {
-                    "type": "array",
-                    "items": {
-                        "type": "array",
-                        "items": {
-                            "type": "number"
-                        }
-                    }
-                }
-            }
-        },
-        "tests": [
-            {
-                "description": "valid nested array",
-                "data": [[[[1]], [[2],[3]]], [[[4], [5], [6]]]],
-                "valid": true
-            },
-            {
-                "description": "nested array with invalid type",
-                "data": [[[["1"]], [[2],[3]]], [[[4], [5], [6]]]],
-                "valid": false
-            },
-            {
-                "description": "not deep enough",
-                "data": [[[1], [2],[3]], [[4], [5], [6]]],
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "single-form items with null instance elements",
-        "schema": {
-            "items": {
-                "type": "null"
-            }
-        },
-        "tests": [
-            {
-                "description": "allows null elements",
-                "data": [ null ],
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "array-form items with null instance elements",
-        "schema": {
-            "items": [
-                {
-                    "type": "null"
-                }
-            ]
-        },
-        "tests": [
-            {
-                "description": "allows null elements",
-                "data": [ null ],
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft6/maxItems.json b/json/tests/draft6/maxItems.json
deleted file mode 100644
index f0c36ab..0000000
--- a/json/tests/draft6/maxItems.json
+++ /dev/null
@@ -1,44 +0,0 @@
-[
-    {
-        "description": "maxItems validation",
-        "schema": {"maxItems": 2},
-        "tests": [
-            {
-                "description": "shorter is valid",
-                "data": [1],
-                "valid": true
-            },
-            {
-                "description": "exact length is valid",
-                "data": [1, 2],
-                "valid": true
-            },
-            {
-                "description": "too long is invalid",
-                "data": [1, 2, 3],
-                "valid": false
-            },
-            {
-                "description": "ignores non-arrays",
-                "data": "foobar",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "maxItems validation with a decimal",
-        "schema": {"maxItems": 2.0},
-        "tests": [
-            {
-                "description": "shorter is valid",
-                "data": [1],
-                "valid": true
-            },
-            {
-                "description": "too long is invalid",
-                "data": [1, 2, 3],
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft6/maxLength.json b/json/tests/draft6/maxLength.json
deleted file mode 100644
index 748b4da..0000000
--- a/json/tests/draft6/maxLength.json
+++ /dev/null
@@ -1,49 +0,0 @@
-[
-    {
-        "description": "maxLength validation",
-        "schema": {"maxLength": 2},
-        "tests": [
-            {
-                "description": "shorter is valid",
-                "data": "f",
-                "valid": true
-            },
-            {
-                "description": "exact length is valid",
-                "data": "fo",
-                "valid": true
-            },
-            {
-                "description": "too long is invalid",
-                "data": "foo",
-                "valid": false
-            },
-            {
-                "description": "ignores non-strings",
-                "data": 100,
-                "valid": true
-            },
-            {
-                "description": "two supplementary Unicode code points is long enough",
-                "data": "\uD83D\uDCA9\uD83D\uDCA9",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "maxLength validation with a decimal",
-        "schema": {"maxLength": 2.0},
-        "tests": [
-            {
-                "description": "shorter is valid",
-                "data": "f",
-                "valid": true
-            },
-            {
-                "description": "too long is invalid",
-                "data": "foo",
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft6/maxProperties.json b/json/tests/draft6/maxProperties.json
deleted file mode 100644
index acec142..0000000
--- a/json/tests/draft6/maxProperties.json
+++ /dev/null
@@ -1,70 +0,0 @@
-[
-    {
-        "description": "maxProperties validation",
-        "schema": {"maxProperties": 2},
-        "tests": [
-            {
-                "description": "shorter is valid",
-                "data": {"foo": 1},
-                "valid": true
-            },
-            {
-                "description": "exact length is valid",
-                "data": {"foo": 1, "bar": 2},
-                "valid": true
-            },
-            {
-                "description": "too long is invalid",
-                "data": {"foo": 1, "bar": 2, "baz": 3},
-                "valid": false
-            },
-            {
-                "description": "ignores arrays",
-                "data": [1, 2, 3],
-                "valid": true
-            },
-            {
-                "description": "ignores strings",
-                "data": "foobar",
-                "valid": true
-            },
-            {
-                "description": "ignores other non-objects",
-                "data": 12,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "maxProperties validation with a decimal",
-        "schema": {"maxProperties": 2.0},
-        "tests": [
-            {
-                "description": "shorter is valid",
-                "data": {"foo": 1},
-                "valid": true
-            },
-            {
-                "description": "too long is invalid",
-                "data": {"foo": 1, "bar": 2, "baz": 3},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "maxProperties = 0 means the object is empty",
-        "schema": { "maxProperties": 0 },
-        "tests": [
-            {
-                "description": "no properties is valid",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "one property is invalid",
-                "data": { "foo": 1 },
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft6/maximum.json b/json/tests/draft6/maximum.json
deleted file mode 100644
index 6844a39..0000000
--- a/json/tests/draft6/maximum.json
+++ /dev/null
@@ -1,54 +0,0 @@
-[
-    {
-        "description": "maximum validation",
-        "schema": {"maximum": 3.0},
-        "tests": [
-            {
-                "description": "below the maximum is valid",
-                "data": 2.6,
-                "valid": true
-            },
-            {
-                "description": "boundary point is valid",
-                "data": 3.0,
-                "valid": true
-            },
-            {
-                "description": "above the maximum is invalid",
-                "data": 3.5,
-                "valid": false
-            },
-            {
-                "description": "ignores non-numbers",
-                "data": "x",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "maximum validation with unsigned integer",
-        "schema": {"maximum": 300},
-        "tests":  [
-            {
-                "description": "below the maximum is invalid",
-                "data": 299.97,
-                "valid": true
-            },
-            {
-                "description": "boundary point integer is valid",
-                "data": 300,
-                "valid": true
-            },
-            {
-                "description": "boundary point float is valid",
-                "data": 300.00,
-                "valid": true
-            },
-            {
-                "description": "above the maximum is invalid",
-                "data": 300.5,
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft6/minItems.json b/json/tests/draft6/minItems.json
deleted file mode 100644
index d3b1872..0000000
--- a/json/tests/draft6/minItems.json
+++ /dev/null
@@ -1,44 +0,0 @@
-[
-    {
-        "description": "minItems validation",
-        "schema": {"minItems": 1},
-        "tests": [
-            {
-                "description": "longer is valid",
-                "data": [1, 2],
-                "valid": true
-            },
-            {
-                "description": "exact length is valid",
-                "data": [1],
-                "valid": true
-            },
-            {
-                "description": "too short is invalid",
-                "data": [],
-                "valid": false
-            },
-            {
-                "description": "ignores non-arrays",
-                "data": "",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "minItems validation with a decimal",
-        "schema": {"minItems": 1.0},
-        "tests": [
-            {
-                "description": "longer is valid",
-                "data": [1, 2],
-                "valid": true
-            },
-            {
-                "description": "too short is invalid",
-                "data": [],
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft6/minLength.json b/json/tests/draft6/minLength.json
deleted file mode 100644
index 64db948..0000000
--- a/json/tests/draft6/minLength.json
+++ /dev/null
@@ -1,49 +0,0 @@
-[
-    {
-        "description": "minLength validation",
-        "schema": {"minLength": 2},
-        "tests": [
-            {
-                "description": "longer is valid",
-                "data": "foo",
-                "valid": true
-            },
-            {
-                "description": "exact length is valid",
-                "data": "fo",
-                "valid": true
-            },
-            {
-                "description": "too short is invalid",
-                "data": "f",
-                "valid": false
-            },
-            {
-                "description": "ignores non-strings",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "one supplementary Unicode code point is not long enough",
-                "data": "\uD83D\uDCA9",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "minLength validation with a decimal",
-        "schema": {"minLength": 2.0},
-        "tests": [
-            {
-                "description": "longer is valid",
-                "data": "foo",
-                "valid": true
-            },
-            {
-                "description": "too short is invalid",
-                "data": "f",
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft6/minProperties.json b/json/tests/draft6/minProperties.json
deleted file mode 100644
index 9f74f78..0000000
--- a/json/tests/draft6/minProperties.json
+++ /dev/null
@@ -1,54 +0,0 @@
-[
-    {
-        "description": "minProperties validation",
-        "schema": {"minProperties": 1},
-        "tests": [
-            {
-                "description": "longer is valid",
-                "data": {"foo": 1, "bar": 2},
-                "valid": true
-            },
-            {
-                "description": "exact length is valid",
-                "data": {"foo": 1},
-                "valid": true
-            },
-            {
-                "description": "too short is invalid",
-                "data": {},
-                "valid": false
-            },
-            {
-                "description": "ignores arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "ignores strings",
-                "data": "",
-                "valid": true
-            },
-            {
-                "description": "ignores other non-objects",
-                "data": 12,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "minProperties validation with a decimal",
-        "schema": {"minProperties": 1.0},
-        "tests": [
-            {
-                "description": "longer is valid",
-                "data": {"foo": 1, "bar": 2},
-                "valid": true
-            },
-            {
-                "description": "too short is invalid",
-                "data": {},
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft6/minimum.json b/json/tests/draft6/minimum.json
deleted file mode 100644
index 21ae50e..0000000
--- a/json/tests/draft6/minimum.json
+++ /dev/null
@@ -1,69 +0,0 @@
-[
-    {
-        "description": "minimum validation",
-        "schema": {"minimum": 1.1},
-        "tests": [
-            {
-                "description": "above the minimum is valid",
-                "data": 2.6,
-                "valid": true
-            },
-            {
-                "description": "boundary point is valid",
-                "data": 1.1,
-                "valid": true
-            },
-            {
-                "description": "below the minimum is invalid",
-                "data": 0.6,
-                "valid": false
-            },
-            {
-                "description": "ignores non-numbers",
-                "data": "x",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "minimum validation with signed integer",
-        "schema": {"minimum": -2},
-        "tests": [
-            {
-                "description": "negative above the minimum is valid",
-                "data": -1,
-                "valid": true
-            },
-            {
-                "description": "positive above the minimum is valid",
-                "data": 0,
-                "valid": true
-            },
-            {
-                "description": "boundary point is valid",
-                "data": -2,
-                "valid": true
-            },
-            {
-                "description": "boundary point with float is valid",
-                "data": -2.0,
-                "valid": true
-            },
-            {
-                "description": "float below the minimum is invalid",
-                "data": -2.0001,
-                "valid": false
-            },
-            {
-                "description": "int below the minimum is invalid",
-                "data": -3,
-                "valid": false
-            },
-            {
-                "description": "ignores non-numbers",
-                "data": "x",
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft6/multipleOf.json b/json/tests/draft6/multipleOf.json
deleted file mode 100644
index 25c25a9..0000000
--- a/json/tests/draft6/multipleOf.json
+++ /dev/null
@@ -1,71 +0,0 @@
-[
-    {
-        "description": "by int",
-        "schema": {"multipleOf": 2},
-        "tests": [
-            {
-                "description": "int by int",
-                "data": 10,
-                "valid": true
-            },
-            {
-                "description": "int by int fail",
-                "data": 7,
-                "valid": false
-            },
-            {
-                "description": "ignores non-numbers",
-                "data": "foo",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "by number",
-        "schema": {"multipleOf": 1.5},
-        "tests": [
-            {
-                "description": "zero is multiple of anything",
-                "data": 0,
-                "valid": true
-            },
-            {
-                "description": "4.5 is multiple of 1.5",
-                "data": 4.5,
-                "valid": true
-            },
-            {
-                "description": "35 is not multiple of 1.5",
-                "data": 35,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "by small number",
-        "schema": {"multipleOf": 0.0001},
-        "tests": [
-            {
-                "description": "0.0075 is multiple of 0.0001",
-                "data": 0.0075,
-                "valid": true
-            },
-            {
-                "description": "0.00751 is not multiple of 0.0001",
-                "data": 0.00751,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "float division = inf",
-        "schema": {"type": "integer", "multipleOf": 0.123456789},
-        "tests": [
-            {
-                "description": "always invalid, but naive implementations may raise an overflow error",
-                "data": 1e308,
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft6/not.json b/json/tests/draft6/not.json
deleted file mode 100644
index 98de0ed..0000000
--- a/json/tests/draft6/not.json
+++ /dev/null
@@ -1,117 +0,0 @@
-[
-    {
-        "description": "not",
-        "schema": {
-            "not": {"type": "integer"}
-        },
-        "tests": [
-            {
-                "description": "allowed",
-                "data": "foo",
-                "valid": true
-            },
-            {
-                "description": "disallowed",
-                "data": 1,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "not multiple types",
-        "schema": {
-            "not": {"type": ["integer", "boolean"]}
-        },
-        "tests": [
-            {
-                "description": "valid",
-                "data": "foo",
-                "valid": true
-            },
-            {
-                "description": "mismatch",
-                "data": 1,
-                "valid": false
-            },
-            {
-                "description": "other mismatch",
-                "data": true,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "not more complex schema",
-        "schema": {
-            "not": {
-                "type": "object",
-                "properties": {
-                    "foo": {
-                        "type": "string"
-                    }
-                }
-             }
-        },
-        "tests": [
-            {
-                "description": "match",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "other match",
-                "data": {"foo": 1},
-                "valid": true
-            },
-            {
-                "description": "mismatch",
-                "data": {"foo": "bar"},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "forbidden property",
-        "schema": {
-            "properties": {
-                "foo": { 
-                    "not": {}
-                }
-            }
-        },
-        "tests": [
-            {
-                "description": "property present",
-                "data": {"foo": 1, "bar": 2},
-                "valid": false
-            },
-            {
-                "description": "property absent",
-                "data": {"bar": 1, "baz": 2},
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "not with boolean schema true",
-        "schema": {"not": true},
-        "tests": [
-            {
-                "description": "any value is invalid",
-                "data": "foo",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "not with boolean schema false",
-        "schema": {"not": false},
-        "tests": [
-            {
-                "description": "any value is valid",
-                "data": "foo",
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft6/oneOf.json b/json/tests/draft6/oneOf.json
deleted file mode 100644
index eeb7ae8..0000000
--- a/json/tests/draft6/oneOf.json
+++ /dev/null
@@ -1,274 +0,0 @@
-[
-    {
-        "description": "oneOf",
-        "schema": {
-            "oneOf": [
-                {
-                    "type": "integer"
-                },
-                {
-                    "minimum": 2
-                }
-            ]
-        },
-        "tests": [
-            {
-                "description": "first oneOf valid",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "second oneOf valid",
-                "data": 2.5,
-                "valid": true
-            },
-            {
-                "description": "both oneOf valid",
-                "data": 3,
-                "valid": false
-            },
-            {
-                "description": "neither oneOf valid",
-                "data": 1.5,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "oneOf with base schema",
-        "schema": {
-            "type": "string",
-            "oneOf" : [
-                {
-                    "minLength": 2
-                },
-                {
-                    "maxLength": 4
-                }
-            ]
-        },
-        "tests": [
-            {
-                "description": "mismatch base schema",
-                "data": 3,
-                "valid": false
-            },
-            {
-                "description": "one oneOf valid",
-                "data": "foobar",
-                "valid": true
-            },
-            {
-                "description": "both oneOf valid",
-                "data": "foo",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "oneOf with boolean schemas, all true",
-        "schema": {"oneOf": [true, true, true]},
-        "tests": [
-            {
-                "description": "any value is invalid",
-                "data": "foo",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "oneOf with boolean schemas, one true",
-        "schema": {"oneOf": [true, false, false]},
-        "tests": [
-            {
-                "description": "any value is valid",
-                "data": "foo",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "oneOf with boolean schemas, more than one true",
-        "schema": {"oneOf": [true, true, false]},
-        "tests": [
-            {
-                "description": "any value is invalid",
-                "data": "foo",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "oneOf with boolean schemas, all false",
-        "schema": {"oneOf": [false, false, false]},
-        "tests": [
-            {
-                "description": "any value is invalid",
-                "data": "foo",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "oneOf complex types",
-        "schema": {
-            "oneOf": [
-                {
-                    "properties": {
-                        "bar": {"type": "integer"}
-                    },
-                    "required": ["bar"]
-                },
-                {
-                    "properties": {
-                        "foo": {"type": "string"}
-                    },
-                    "required": ["foo"]
-                }
-            ]
-        },
-        "tests": [
-            {
-                "description": "first oneOf valid (complex)",
-                "data": {"bar": 2},
-                "valid": true
-            },
-            {
-                "description": "second oneOf valid (complex)",
-                "data": {"foo": "baz"},
-                "valid": true
-            },
-            {
-                "description": "both oneOf valid (complex)",
-                "data": {"foo": "baz", "bar": 2},
-                "valid": false
-            },
-            {
-                "description": "neither oneOf valid (complex)",
-                "data": {"foo": 2, "bar": "quux"},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "oneOf with empty schema",
-        "schema": {
-            "oneOf": [
-                { "type": "number" },
-                {}
-            ]
-        },
-        "tests": [
-            {
-                "description": "one valid - valid",
-                "data": "foo",
-                "valid": true
-            },
-            {
-                "description": "both valid - invalid",
-                "data": 123,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "oneOf with required",
-        "schema": {
-            "type": "object",
-            "oneOf": [
-                { "required": ["foo", "bar"] },
-                { "required": ["foo", "baz"] }
-            ]
-        },
-        "tests": [
-            {
-                "description": "both invalid - invalid",
-                "data": {"bar": 2},
-                "valid": false
-            },
-            {
-                "description": "first valid - valid",
-                "data": {"foo": 1, "bar": 2},
-                "valid": true
-            },
-            {
-                "description": "second valid - valid",
-                "data": {"foo": 1, "baz": 3},
-                "valid": true
-            },
-            {
-                "description": "both valid - invalid",
-                "data": {"foo": 1, "bar": 2, "baz" : 3},
-                "valid": false
-            }
-        ]
-    },
-	{
-        "description": "oneOf with missing optional property",
-        "schema": {
-            "oneOf": [
-                {
-                    "properties": {
-                        "bar": true,
-                        "baz": true
-                    },
-                    "required": ["bar"]
-                },
-                {
-                    "properties": {
-                        "foo": true
-                    },
-                    "required": ["foo"]
-                }
-            ]
-        },
-        "tests": [
-            {
-                "description": "first oneOf valid",
-                "data": {"bar": 8},
-                "valid": true
-            },
-            {
-                "description": "second oneOf valid",
-                "data": {"foo": "foo"},
-                "valid": true
-            },
-            {
-                "description": "both oneOf valid",
-                "data": {"foo": "foo", "bar": 8},
-                "valid": false
-            },
-            {
-                "description": "neither oneOf valid",
-                "data": {"baz": "quux"},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "nested oneOf, to check validation semantics",
-        "schema": {
-            "oneOf": [
-                {
-                    "oneOf": [
-                        {
-                            "type": "null"
-                        }
-                    ]
-                }
-            ]
-        },
-        "tests": [
-            {
-                "description": "null is valid",
-                "data": null,
-                "valid": true
-            },
-            {
-                "description": "anything non-null is invalid",
-                "data": 123,
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft6/optional/bignum.json b/json/tests/draft6/optional/bignum.json
deleted file mode 100644
index 94b4a4e..0000000
--- a/json/tests/draft6/optional/bignum.json
+++ /dev/null
@@ -1,93 +0,0 @@
-[
-    {
-        "description": "integer",
-        "schema": { "type": "integer" },
-        "tests": [
-            {
-                "description": "a bignum is an integer",
-                "data": 12345678910111213141516171819202122232425262728293031,
-                "valid": true
-            },
-            {
-                "description": "a negative bignum is an integer",
-                "data": -12345678910111213141516171819202122232425262728293031,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "number",
-        "schema": { "type": "number" },
-        "tests": [
-            {
-                "description": "a bignum is a number",
-                "data": 98249283749234923498293171823948729348710298301928331,
-                "valid": true
-            },
-            {
-                "description": "a negative bignum is a number",
-                "data": -98249283749234923498293171823948729348710298301928331,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "string",
-        "schema": { "type": "string" },
-        "tests": [
-            {
-                "description": "a bignum is not a string",
-                "data": 98249283749234923498293171823948729348710298301928331,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "maximum integer comparison",
-        "schema": { "maximum": 18446744073709551615 },
-        "tests": [
-            {
-                "description": "comparison works for high numbers",
-                "data": 18446744073709551600,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "float comparison with high precision",
-        "schema": {
-            "exclusiveMaximum": 972783798187987123879878123.18878137
-        },
-        "tests": [
-            {
-                "description": "comparison works for high numbers",
-                "data": 972783798187987123879878123.188781371,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "minimum integer comparison",
-        "schema": { "minimum": -18446744073709551615 },
-        "tests": [
-            {
-                "description": "comparison works for very negative numbers",
-                "data": -18446744073709551600,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "float comparison with high precision on negative numbers",
-        "schema": {
-            "exclusiveMinimum": -972783798187987123879878123.18878137
-        },
-        "tests": [
-            {
-                "description": "comparison works for very negative numbers",
-                "data": -972783798187987123879878123.188781371,
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft6/optional/ecmascript-regex.json b/json/tests/draft6/optional/ecmascript-regex.json
deleted file mode 100644
index c4886aa..0000000
--- a/json/tests/draft6/optional/ecmascript-regex.json
+++ /dev/null
@@ -1,552 +0,0 @@
-[
-    {
-        "description": "ECMA 262 regex $ does not match trailing newline",
-        "schema": {
-            "type": "string",
-            "pattern": "^abc$"
-        },
-        "tests": [
-            {
-                "description": "matches in Python, but not in ECMA 262",
-                "data": "abc\\n",
-                "valid": false
-            },
-            {
-                "description": "matches",
-                "data": "abc",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "ECMA 262 regex converts \\t to horizontal tab",
-        "schema": {
-            "type": "string",
-            "pattern": "^\\t$"
-        },
-        "tests": [
-            {
-                "description": "does not match",
-                "data": "\\t",
-                "valid": false
-            },
-            {
-                "description": "matches",
-                "data": "\u0009",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "ECMA 262 regex escapes control codes with \\c and upper letter",
-        "schema": {
-            "type": "string",
-            "pattern": "^\\cC$"
-        },
-        "tests": [
-            {
-                "description": "does not match",
-                "data": "\\cC",
-                "valid": false
-            },
-            {
-                "description": "matches",
-                "data": "\u0003",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "ECMA 262 regex escapes control codes with \\c and lower letter",
-        "schema": {
-            "type": "string",
-            "pattern": "^\\cc$"
-        },
-        "tests": [
-            {
-                "description": "does not match",
-                "data": "\\cc",
-                "valid": false
-            },
-            {
-                "description": "matches",
-                "data": "\u0003",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "ECMA 262 \\d matches ascii digits only",
-        "schema": {
-            "type": "string",
-            "pattern": "^\\d$"
-        },
-        "tests": [
-            {
-                "description": "ASCII zero matches",
-                "data": "0",
-                "valid": true
-            },
-            {
-                "description": "NKO DIGIT ZERO does not match (unlike e.g. Python)",
-                "data": "߀",
-                "valid": false
-            },
-            {
-                "description": "NKO DIGIT ZERO (as \\u escape) does not match",
-                "data": "\u07c0",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "ECMA 262 \\D matches everything but ascii digits",
-        "schema": {
-            "type": "string",
-            "pattern": "^\\D$"
-        },
-        "tests": [
-            {
-                "description": "ASCII zero does not match",
-                "data": "0",
-                "valid": false
-            },
-            {
-                "description": "NKO DIGIT ZERO matches (unlike e.g. Python)",
-                "data": "߀",
-                "valid": true
-            },
-            {
-                "description": "NKO DIGIT ZERO (as \\u escape) matches",
-                "data": "\u07c0",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "ECMA 262 \\w matches ascii letters only",
-        "schema": {
-            "type": "string",
-            "pattern": "^\\w$"
-        },
-        "tests": [
-            {
-                "description": "ASCII 'a' matches",
-                "data": "a",
-                "valid": true
-            },
-            {
-                "description": "latin-1 e-acute does not match (unlike e.g. Python)",
-                "data": "é",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "ECMA 262 \\W matches everything but ascii letters",
-        "schema": {
-            "type": "string",
-            "pattern": "^\\W$"
-        },
-        "tests": [
-            {
-                "description": "ASCII 'a' does not match",
-                "data": "a",
-                "valid": false
-            },
-            {
-                "description": "latin-1 e-acute matches (unlike e.g. Python)",
-                "data": "é",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "ECMA 262 \\s matches whitespace",
-        "schema": {
-            "type": "string",
-            "pattern": "^\\s$"
-        },
-        "tests": [
-            {
-                "description": "ASCII space matches",
-                "data": " ",
-                "valid": true
-            },
-            {
-                "description": "Character tabulation matches",
-                "data": "\t",
-                "valid": true
-            },
-            {
-                "description": "Line tabulation matches",
-                "data": "\u000b",
-                "valid": true
-            },
-            {
-                "description": "Form feed matches",
-                "data": "\u000c",
-                "valid": true
-            },
-            {
-                "description": "latin-1 non-breaking-space matches",
-                "data": "\u00a0",
-                "valid": true
-            },
-            {
-                "description": "zero-width whitespace matches",
-                "data": "\ufeff",
-                "valid": true
-            },
-            {
-                "description": "line feed matches (line terminator)",
-                "data": "\u000a",
-                "valid": true
-            },
-            {
-                "description": "paragraph separator matches (line terminator)",
-                "data": "\u2029",
-                "valid": true
-            },
-            {
-                "description": "EM SPACE matches (Space_Separator)",
-                "data": "\u2003",
-                "valid": true
-            },
-            {
-                "description": "Non-whitespace control does not match",
-                "data": "\u0001",
-                "valid": false
-            },
-            {
-                "description": "Non-whitespace does not match",
-                "data": "\u2013",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "ECMA 262 \\S matches everything but whitespace",
-        "schema": {
-            "type": "string",
-            "pattern": "^\\S$"
-        },
-        "tests": [
-            {
-                "description": "ASCII space does not match",
-                "data": " ",
-                "valid": false
-            },
-            {
-                "description": "Character tabulation does not match",
-                "data": "\t",
-                "valid": false
-            },
-            {
-                "description": "Line tabulation does not match",
-                "data": "\u000b",
-                "valid": false
-            },
-            {
-                "description": "Form feed does not match",
-                "data": "\u000c",
-                "valid": false
-            },
-            {
-                "description": "latin-1 non-breaking-space does not match",
-                "data": "\u00a0",
-                "valid": false
-            },
-            {
-                "description": "zero-width whitespace does not match",
-                "data": "\ufeff",
-                "valid": false
-            },
-            {
-                "description": "line feed does not match (line terminator)",
-                "data": "\u000a",
-                "valid": false
-            },
-            {
-                "description": "paragraph separator does not match (line terminator)",
-                "data": "\u2029",
-                "valid": false
-            },
-            {
-                "description": "EM SPACE does not match (Space_Separator)",
-                "data": "\u2003",
-                "valid": false
-            },
-            {
-                "description": "Non-whitespace control matches",
-                "data": "\u0001",
-                "valid": true
-            },
-            {
-                "description": "Non-whitespace matches",
-                "data": "\u2013",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "patterns always use unicode semantics with pattern",
-        "schema": { "pattern": "\\p{Letter}cole" },
-        "tests": [
-            {
-                "description": "ascii character in json string",
-                "data": "Les hivers de mon enfance etaient des saisons longues, longues. Nous vivions en trois lieux: l'ecole, l'eglise et la patinoire; mais la vraie vie etait sur la patinoire.",
-                "valid": true
-            },
-            {
-                "description": "literal unicode character in json string",
-                "data": "Les hivers de mon enfance étaient des saisons longues, longues. Nous vivions en trois lieux: l'école, l'église et la patinoire; mais la vraie vie était sur la patinoire.",
-                "valid": true
-            },
-            {
-                "description": "unicode character in hex format in string",
-                "data": "Les hivers de mon enfance étaient des saisons longues, longues. Nous vivions en trois lieux: l'\u00e9cole, l'église et la patinoire; mais la vraie vie était sur la patinoire.",
-                "valid": true
-            },
-            {
-                "description": "unicode matching is case-sensitive",
-                "data": "LES HIVERS DE MON ENFANCE ÉTAIENT DES SAISONS LONGUES, LONGUES. NOUS VIVIONS EN TROIS LIEUX: L'ÉCOLE, L'ÉGLISE ET LA PATINOIRE; MAIS LA VRAIE VIE ÉTAIT SUR LA PATINOIRE.",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "\\w in patterns matches [A-Za-z0-9_], not unicode letters",
-        "schema": { "pattern": "\\wcole" },
-        "tests": [
-            {
-                "description": "ascii character in json string",
-                "data": "Les hivers de mon enfance etaient des saisons longues, longues. Nous vivions en trois lieux: l'ecole, l'eglise et la patinoire; mais la vraie vie etait sur la patinoire.",
-                "valid": true
-            },
-            {
-                "description": "literal unicode character in json string",
-                "data": "Les hivers de mon enfance étaient des saisons longues, longues. Nous vivions en trois lieux: l'école, l'église et la patinoire; mais la vraie vie était sur la patinoire.",
-                "valid": false
-            },
-            {
-                "description": "unicode character in hex format in string",
-                "data": "Les hivers de mon enfance étaient des saisons longues, longues. Nous vivions en trois lieux: l'\u00e9cole, l'église et la patinoire; mais la vraie vie était sur la patinoire.",
-                "valid": false
-            },
-            {
-                "description": "unicode matching is case-sensitive",
-                "data": "LES HIVERS DE MON ENFANCE ÉTAIENT DES SAISONS LONGUES, LONGUES. NOUS VIVIONS EN TROIS LIEUX: L'ÉCOLE, L'ÉGLISE ET LA PATINOIRE; MAIS LA VRAIE VIE ÉTAIT SUR LA PATINOIRE.",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "pattern with ASCII ranges",
-        "schema": { "pattern": "[a-z]cole" },
-        "tests": [
-            {
-                "description": "literal unicode character in json string",
-                "data": "Les hivers de mon enfance étaient des saisons longues, longues. Nous vivions en trois lieux: l'école, l'église et la patinoire; mais la vraie vie était sur la patinoire.",
-                "valid": false
-            },
-            {
-                "description": "unicode character in hex format in string",
-                "data": "Les hivers de mon enfance étaient des saisons longues, longues. Nous vivions en trois lieux: l'\u00e9cole, l'église et la patinoire; mais la vraie vie était sur la patinoire.",
-                "valid": false
-            },
-            {
-                "description": "ascii characters match",
-                "data": "Les hivers de mon enfance etaient des saisons longues, longues. Nous vivions en trois lieux: l'ecole, l'eglise et la patinoire; mais la vraie vie etait sur la patinoire.",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "\\d in pattern matches [0-9], not unicode digits",
-        "schema": { "pattern": "^\\d+$" },
-        "tests": [
-            {
-                "description": "ascii digits",
-                "data": "42",
-                "valid": true
-            },
-            {
-                "description": "ascii non-digits",
-                "data": "-%#",
-                "valid": false
-            },
-            {
-                "description": "non-ascii digits (BENGALI DIGIT FOUR, BENGALI DIGIT TWO)",
-                "data": "৪২",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "pattern with non-ASCII digits",
-        "schema": { "pattern": "^\\p{digit}+$" },
-        "tests": [
-            {
-                "description": "ascii digits",
-                "data": "42",
-                "valid": true
-            },
-            {
-                "description": "ascii non-digits",
-                "data": "-%#",
-                "valid": false
-            },
-            {
-                "description": "non-ascii digits (BENGALI DIGIT FOUR, BENGALI DIGIT TWO)",
-                "data": "৪২",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "patterns always use unicode semantics with patternProperties",
-        "schema": {
-            "type": "object",
-            "patternProperties": {
-                "\\p{Letter}cole": true
-            },
-            "additionalProperties": false
-        },
-        "tests": [
-            {
-                "description": "ascii character in json string",
-                "data": { "l'ecole": "pas de vraie vie" },
-                "valid": true
-            },
-            {
-                "description": "literal unicode character in json string",
-                "data": { "l'école": "pas de vraie vie" },
-                "valid": true
-            },
-            {
-                "description": "unicode character in hex format in string",
-                "data": { "l'\u00e9cole": "pas de vraie vie" },
-                "valid": true
-            },
-            {
-                "description": "unicode matching is case-sensitive",
-                "data": { "L'ÉCOLE": "PAS DE VRAIE VIE" },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "\\w in patternProperties matches [A-Za-z0-9_], not unicode letters",
-        "schema": {
-            "type": "object",
-            "patternProperties": {
-                "\\wcole": true
-            },
-            "additionalProperties": false
-        },
-        "tests": [
-            {
-                "description": "ascii character in json string",
-                "data": { "l'ecole": "pas de vraie vie" },
-                "valid": true
-            },
-            {
-                "description": "literal unicode character in json string",
-                "data": { "l'école": "pas de vraie vie" },
-                "valid": false
-            },
-            {
-                "description": "unicode character in hex format in string",
-                "data": { "l'\u00e9cole": "pas de vraie vie" },
-                "valid": false
-            },
-            {
-                "description": "unicode matching is case-sensitive",
-                "data": { "L'ÉCOLE": "PAS DE VRAIE VIE" },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "patternProperties with ASCII ranges",
-        "schema": {
-            "type": "object",
-            "patternProperties": {
-                "[a-z]cole": true
-            },
-            "additionalProperties": false
-        },
-        "tests": [
-            {
-                "description": "literal unicode character in json string",
-                "data": { "l'école": "pas de vraie vie" },
-                "valid": false
-            },
-            {
-                "description": "unicode character in hex format in string",
-                "data": { "l'\u00e9cole": "pas de vraie vie" },
-                "valid": false
-            },
-            {
-                "description": "ascii characters match",
-                "data": { "l'ecole": "pas de vraie vie" },
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "\\d in patternProperties matches [0-9], not unicode digits",
-        "schema": {
-            "type": "object",
-            "patternProperties": {
-                "^\\d+$": true
-            },
-            "additionalProperties": false
-        },
-        "tests": [
-            {
-                "description": "ascii digits",
-                "data": { "42": "life, the universe, and everything" },
-                "valid": true
-            },
-            {
-                "description": "ascii non-digits",
-                "data": { "-%#": "spending the year dead for tax reasons" },
-                "valid": false
-            },
-            {
-                "description": "non-ascii digits (BENGALI DIGIT FOUR, BENGALI DIGIT TWO)",
-                "data": { "৪২": "khajit has wares if you have coin" },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "patternProperties with non-ASCII digits",
-        "schema": {
-            "type": "object",
-            "patternProperties": {
-                "^\\p{digit}+$": true
-            },
-            "additionalProperties": false
-        },
-        "tests": [
-            {
-                "description": "ascii digits",
-                "data": { "42": "life, the universe, and everything" },
-                "valid": true
-            },
-            {
-                "description": "ascii non-digits",
-                "data": { "-%#": "spending the year dead for tax reasons" },
-                "valid": false
-            },
-            {
-                "description": "non-ascii digits (BENGALI DIGIT FOUR, BENGALI DIGIT TWO)",
-                "data": { "৪২": "khajit has wares if you have coin" },
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft6/optional/float-overflow.json b/json/tests/draft6/optional/float-overflow.json
deleted file mode 100644
index 52ff982..0000000
--- a/json/tests/draft6/optional/float-overflow.json
+++ /dev/null
@@ -1,13 +0,0 @@
-[
-    {
-        "description": "all integers are multiples of 0.5, if overflow is handled",
-        "schema": {"type": "integer", "multipleOf": 0.5},
-        "tests": [
-            {
-                "description": "valid if optional overflow handling is implemented",
-                "data": 1e308,
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft6/optional/format/date-time.json b/json/tests/draft6/optional/format/date-time.json
deleted file mode 100644
index 0911273..0000000
--- a/json/tests/draft6/optional/format/date-time.json
+++ /dev/null
@@ -1,133 +0,0 @@
-[
-    {
-        "description": "validation of date-time strings",
-        "schema": { "format": "date-time" },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            },
-            {
-                "description": "a valid date-time string",
-                "data": "1963-06-19T08:30:06.283185Z",
-                "valid": true
-            },
-            {
-                "description": "a valid date-time string without second fraction",
-                "data": "1963-06-19T08:30:06Z",
-                "valid": true
-            },
-            {
-                "description": "a valid date-time string with plus offset",
-                "data": "1937-01-01T12:00:27.87+00:20",
-                "valid": true
-            },
-            {
-                "description": "a valid date-time string with minus offset",
-                "data": "1990-12-31T15:59:50.123-08:00",
-                "valid": true
-            },
-            {
-                "description": "a valid date-time with a leap second, UTC",
-                "data": "1998-12-31T23:59:60Z",
-                "valid": true
-            },
-            {
-                "description": "a valid date-time with a leap second, with minus offset",
-                "data": "1998-12-31T15:59:60.123-08:00",
-                "valid": true
-            },
-            {
-                "description": "an invalid date-time past leap second, UTC",
-                "data": "1998-12-31T23:59:61Z",
-                "valid": false
-            },
-            {
-                "description": "an invalid date-time with leap second on a wrong minute, UTC",
-                "data": "1998-12-31T23:58:60Z",
-                "valid": false
-            },
-            {
-                "description": "an invalid date-time with leap second on a wrong hour, UTC",
-                "data": "1998-12-31T22:59:60Z",
-                "valid": false
-            },
-            {
-                "description": "an invalid day in date-time string",
-                "data": "1990-02-31T15:59:59.123-08:00",
-                "valid": false
-            },
-            {
-                "description": "an invalid offset in date-time string",
-                "data": "1990-12-31T15:59:59-24:00",
-                "valid": false
-            },
-            {
-                "description": "an invalid closing Z after time-zone offset",
-                "data": "1963-06-19T08:30:06.28123+01:00Z",
-                "valid": false
-            },
-            {
-                "description": "an invalid date-time string",
-                "data": "06/19/1963 08:30:06 PST",
-                "valid": false
-            },
-            {
-                "description": "case-insensitive T and Z",
-                "data": "1963-06-19t08:30:06.283185z",
-                "valid": true
-            },
-            {
-                "description": "only RFC3339 not all of ISO 8601 are valid",
-                "data": "2013-350T01:01:01",
-                "valid": false
-            },
-            {
-                "description": "invalid non-padded month dates",
-                "data": "1963-6-19T08:30:06.283185Z",
-                "valid": false
-            },
-            {
-                "description": "invalid non-padded day dates",
-                "data": "1963-06-1T08:30:06.283185Z",
-                "valid": false
-            },
-            {
-                "description": "invalid non-ASCII '৪' (a Bengali 4) in date portion",
-                "data": "1963-06-1৪T00:00:00Z",
-                "valid": false
-            },
-            {
-                "description": "invalid non-ASCII '৪' (a Bengali 4) in time portion",
-                "data": "1963-06-11T0৪:00:00Z",
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft6/optional/format/email.json b/json/tests/draft6/optional/format/email.json
deleted file mode 100644
index d6761a4..0000000
--- a/json/tests/draft6/optional/format/email.json
+++ /dev/null
@@ -1,83 +0,0 @@
-[
-    {
-        "description": "validation of e-mail addresses",
-        "schema": { "format": "email" },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            },
-            {
-                "description": "a valid e-mail address",
-                "data": "joe.bloggs@example.com",
-                "valid": true
-            },
-            {
-                "description": "an invalid e-mail address",
-                "data": "2962",
-                "valid": false
-            },
-            {
-                "description": "tilde in local part is valid",
-                "data": "te~st@example.com",
-                "valid": true
-            },
-            {
-                "description": "tilde before local part is valid",
-                "data": "~test@example.com",
-                "valid": true
-            },
-            {
-                "description": "tilde after local part is valid",
-                "data": "test~@example.com",
-                "valid": true
-            },
-            {
-                "description": "dot before local part is not valid",
-                "data": ".test@example.com",
-                "valid": false
-            },
-            {
-                "description": "dot after local part is not valid",
-                "data": "test.@example.com",
-                "valid": false
-            },
-            {
-                "description": "two separated dots inside local part are valid",
-                "data": "te.s.t@example.com",
-                "valid": true
-            },
-            {
-                "description": "two subsequent dots inside local part are not valid",
-                "data": "te..st@example.com",
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft6/optional/format/hostname.json b/json/tests/draft6/optional/format/hostname.json
deleted file mode 100644
index 8a67fda..0000000
--- a/json/tests/draft6/optional/format/hostname.json
+++ /dev/null
@@ -1,98 +0,0 @@
-[
-    {
-        "description": "validation of host names",
-        "schema": { "format": "hostname" },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            },
-            {
-                "description": "a valid host name",
-                "data": "www.example.com",
-                "valid": true
-            },
-            {
-                "description": "a valid punycoded IDN hostname",
-                "data": "xn--4gbwdl.xn--wgbh1c",
-                "valid": true
-            },
-            {
-                "description": "a host name starting with an illegal character",
-                "data": "-a-host-name-that-starts-with--",
-                "valid": false
-            },
-            {
-                "description": "a host name containing illegal characters",
-                "data": "not_a_valid_host_name",
-                "valid": false
-            },
-            {
-                "description": "a host name with a component too long",
-                "data": "a-vvvvvvvvvvvvvvvveeeeeeeeeeeeeeeerrrrrrrrrrrrrrrryyyyyyyyyyyyyyyy-long-host-name-component",
-                "valid": false
-            },
-            {
-                "description": "starts with hyphen",
-                "data": "-hostname",
-                "valid": false
-            },
-            {
-                "description": "ends with hyphen",
-                "data": "hostname-",
-                "valid": false
-            },
-            {
-                "description": "starts with underscore",
-                "data": "_hostname",
-                "valid": false
-            },
-            {
-                "description": "ends with underscore",
-                "data": "hostname_",
-                "valid": false
-            },
-            {
-                "description": "contains underscore",
-                "data": "host_name",
-                "valid": false
-            },
-            {
-                "description": "maximum label length",
-                "data": "abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijk.com",
-                "valid": true
-            },
-            {
-                "description": "exceeds maximum label length",
-                "data": "abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijkl.com",
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft6/optional/format/ipv4.json b/json/tests/draft6/optional/format/ipv4.json
deleted file mode 100644
index 4706581..0000000
--- a/json/tests/draft6/optional/format/ipv4.json
+++ /dev/null
@@ -1,84 +0,0 @@
-[
-    {
-        "description": "validation of IP addresses",
-        "schema": { "format": "ipv4" },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            },
-            {
-                "description": "a valid IP address",
-                "data": "192.168.0.1",
-                "valid": true
-            },
-            {
-                "description": "an IP address with too many components",
-                "data": "127.0.0.0.1",
-                "valid": false
-            },
-            {
-                "description": "an IP address with out-of-range values",
-                "data": "256.256.256.256",
-                "valid": false
-            },
-            {
-                "description": "an IP address without 4 components",
-                "data": "127.0",
-                "valid": false
-            },
-            {
-                "description": "an IP address as an integer",
-                "data": "0x7f000001",
-                "valid": false
-            },
-            {
-                "description": "an IP address as an integer (decimal)",
-                "data": "2130706433",
-                "valid": false
-            },
-            {
-                "description": "invalid leading zeroes, as they are treated as octals",
-                "comment": "see https://sick.codes/universal-netmask-npm-package-used-by-270000-projects-vulnerable-to-octal-input-data-server-side-request-forgery-remote-file-inclusion-local-file-inclusion-and-more-cve-2021-28918/",
-                "data": "087.10.0.1",
-                "valid": false
-            },
-            {
-                "description": "value without leading zero is valid",
-                "data": "87.10.0.1",
-                "valid": true
-            },
-            {
-                "description": "invalid non-ASCII '২' (a Bengali 2)",
-                "data": "1২7.0.0.1",
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft6/optional/format/ipv6.json b/json/tests/draft6/optional/format/ipv6.json
deleted file mode 100644
index 94368f2..0000000
--- a/json/tests/draft6/optional/format/ipv6.json
+++ /dev/null
@@ -1,208 +0,0 @@
-[
-    {
-        "description": "validation of IPv6 addresses",
-        "schema": { "format": "ipv6" },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            },
-            {
-                "description": "a valid IPv6 address",
-                "data": "::1",
-                "valid": true
-            },
-            {
-                "description": "an IPv6 address with out-of-range values",
-                "data": "12345::",
-                "valid": false
-            },
-            {
-                "description": "trailing 4 hex symbols is valid",
-                "data": "::abef",
-                "valid": true
-            },
-            {
-                "description": "trailing 5 hex symbols is invalid",
-                "data": "::abcef",
-                "valid": false
-            },
-            {
-                "description": "an IPv6 address with too many components",
-                "data": "1:1:1:1:1:1:1:1:1:1:1:1:1:1:1:1",
-                "valid": false
-            },
-            {
-                "description": "an IPv6 address containing illegal characters",
-                "data": "::laptop",
-                "valid": false
-            },
-            {
-                "description": "no digits is valid",
-                "data": "::",
-                "valid": true
-            },
-            {
-                "description": "leading colons is valid",
-                "data": "::42:ff:1",
-                "valid": true
-            },
-            {
-                "description": "trailing colons is valid",
-                "data": "d6::",
-                "valid": true
-            },
-            {
-                "description": "missing leading octet is invalid",
-                "data": ":2:3:4:5:6:7:8",
-                "valid": false
-            },
-            {
-                "description": "missing trailing octet is invalid",
-                "data": "1:2:3:4:5:6:7:",
-                "valid": false
-            },
-            {
-                "description": "missing leading octet with omitted octets later",
-                "data": ":2:3:4::8",
-                "valid": false
-            },
-            {
-                "description": "single set of double colons in the middle is valid",
-                "data": "1:d6::42",
-                "valid": true
-            },
-            {
-                "description": "two sets of double colons is invalid",
-                "data": "1::d6::42",
-                "valid": false
-            },
-            {
-                "description": "mixed format with the ipv4 section as decimal octets",
-                "data": "1::d6:192.168.0.1",
-                "valid": true
-            },
-            {
-                "description": "mixed format with double colons between the sections",
-                "data": "1:2::192.168.0.1",
-                "valid": true
-            },
-            {
-                "description": "mixed format with ipv4 section with octet out of range",
-                "data": "1::2:192.168.256.1",
-                "valid": false
-            },
-            {
-                "description": "mixed format with ipv4 section with a hex octet",
-                "data": "1::2:192.168.ff.1",
-                "valid": false
-            },
-            {
-                "description": "mixed format with leading double colons (ipv4-mapped ipv6 address)",
-                "data": "::ffff:192.168.0.1",
-                "valid": true
-            },
-            {
-                "description": "triple colons is invalid",
-                "data": "1:2:3:4:5:::8",
-                "valid": false
-            },
-            {
-                "description": "8 octets",
-                "data": "1:2:3:4:5:6:7:8",
-                "valid": true
-            },
-            {
-                "description": "insufficient octets without double colons",
-                "data": "1:2:3:4:5:6:7",
-                "valid": false
-            },
-            {
-                "description": "no colons is invalid",
-                "data": "1",
-                "valid": false
-            },
-            {
-                "description": "ipv4 is not ipv6",
-                "data": "127.0.0.1",
-                "valid": false
-            },
-            {
-                "description": "ipv4 segment must have 4 octets",
-                "data": "1:2:3:4:1.2.3",
-                "valid": false
-            },
-            {
-                "description": "leading whitespace is invalid",
-                "data": "  ::1",
-                "valid": false
-            },
-            {
-                "description": "trailing whitespace is invalid",
-                "data": "::1  ",
-                "valid": false
-            },
-            {
-                "description": "netmask is not a part of ipv6 address",
-                "data": "fe80::/64",
-                "valid": false
-            },
-            {
-                "description": "zone id is not a part of ipv6 address",
-                "data": "fe80::a%eth1",
-                "valid": false
-            },
-            {
-                "description": "a long valid ipv6",
-                "data": "1000:1000:1000:1000:1000:1000:255.255.255.255",
-                "valid": true
-            },
-            {
-                "description": "a long invalid ipv6, below length limit, first",
-                "data": "100:100:100:100:100:100:255.255.255.255.255",
-                "valid": false
-            },
-            {
-                "description": "a long invalid ipv6, below length limit, second",
-                "data": "100:100:100:100:100:100:100:255.255.255.255",
-                "valid": false
-            },
-            {
-                "description": "invalid non-ASCII '৪' (a Bengali 4)",
-                "data": "1:2:3:4:5:6:7:৪",
-                "valid": false
-            },
-            {
-                "description": "invalid non-ASCII '৪' (a Bengali 4) in the IPv4 portion",
-                "data": "1:2::192.16৪.0.1",
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft6/optional/format/json-pointer.json b/json/tests/draft6/optional/format/json-pointer.json
deleted file mode 100644
index a0346b5..0000000
--- a/json/tests/draft6/optional/format/json-pointer.json
+++ /dev/null
@@ -1,198 +0,0 @@
-[
-    {
-        "description": "validation of JSON-pointers (JSON String Representation)",
-        "schema": { "format": "json-pointer" },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            },
-            {
-                "description": "a valid JSON-pointer",
-                "data": "/foo/bar~0/baz~1/%a",
-                "valid": true
-            },
-            {
-                "description": "not a valid JSON-pointer (~ not escaped)",
-                "data": "/foo/bar~",
-                "valid": false
-            },
-            {
-                "description": "valid JSON-pointer with empty segment",
-                "data": "/foo//bar",
-                "valid": true
-            },
-            {
-                "description": "valid JSON-pointer with the last empty segment",
-                "data": "/foo/bar/",
-                "valid": true
-            },
-            {
-                "description": "valid JSON-pointer as stated in RFC 6901 #1",
-                "data": "",
-                "valid": true
-            },
-            {
-                "description": "valid JSON-pointer as stated in RFC 6901 #2",
-                "data": "/foo",
-                "valid": true
-            },
-            {
-                "description": "valid JSON-pointer as stated in RFC 6901 #3",
-                "data": "/foo/0",
-                "valid": true
-            },
-            {
-                "description": "valid JSON-pointer as stated in RFC 6901 #4",
-                "data": "/",
-                "valid": true
-            },
-            {
-                "description": "valid JSON-pointer as stated in RFC 6901 #5",
-                "data": "/a~1b",
-                "valid": true
-            },
-            {
-                "description": "valid JSON-pointer as stated in RFC 6901 #6",
-                "data": "/c%d",
-                "valid": true
-            },
-            {
-                "description": "valid JSON-pointer as stated in RFC 6901 #7",
-                "data": "/e^f",
-                "valid": true
-            },
-            {
-                "description": "valid JSON-pointer as stated in RFC 6901 #8",
-                "data": "/g|h",
-                "valid": true
-            },
-            {
-                "description": "valid JSON-pointer as stated in RFC 6901 #9",
-                "data": "/i\\j",
-                "valid": true
-            },
-            {
-                "description": "valid JSON-pointer as stated in RFC 6901 #10",
-                "data": "/k\"l",
-                "valid": true
-            },
-            {
-                "description": "valid JSON-pointer as stated in RFC 6901 #11",
-                "data": "/ ",
-                "valid": true
-            },
-            {
-                "description": "valid JSON-pointer as stated in RFC 6901 #12",
-                "data": "/m~0n",
-                "valid": true
-            },
-            {
-                "description": "valid JSON-pointer used adding to the last array position",
-                "data": "/foo/-",
-                "valid": true
-            },
-            {
-                "description": "valid JSON-pointer (- used as object member name)",
-                "data": "/foo/-/bar",
-                "valid": true
-            },
-            {
-                "description": "valid JSON-pointer (multiple escaped characters)",
-                "data": "/~1~0~0~1~1",
-                "valid": true
-            },
-            {
-                "description": "valid JSON-pointer (escaped with fraction part) #1",
-                "data": "/~1.1",
-                "valid": true
-            },
-            {
-                "description": "valid JSON-pointer (escaped with fraction part) #2",
-                "data": "/~0.1",
-                "valid": true
-            },
-            {
-                "description": "not a valid JSON-pointer (URI Fragment Identifier) #1",
-                "data": "#",
-                "valid": false
-            },
-            {
-                "description": "not a valid JSON-pointer (URI Fragment Identifier) #2",
-                "data": "#/",
-                "valid": false
-            },
-            {
-                "description": "not a valid JSON-pointer (URI Fragment Identifier) #3",
-                "data": "#a",
-                "valid": false
-            },
-            {
-                "description": "not a valid JSON-pointer (some escaped, but not all) #1",
-                "data": "/~0~",
-                "valid": false
-            },
-            {
-                "description": "not a valid JSON-pointer (some escaped, but not all) #2",
-                "data": "/~0/~",
-                "valid": false
-            },
-            {
-                "description": "not a valid JSON-pointer (wrong escape character) #1",
-                "data": "/~2",
-                "valid": false
-            },
-            {
-                "description": "not a valid JSON-pointer (wrong escape character) #2",
-                "data": "/~-1",
-                "valid": false
-            },
-            {
-                "description": "not a valid JSON-pointer (multiple characters not escaped)",
-                "data": "/~~",
-                "valid": false
-            },
-            {
-                "description": "not a valid JSON-pointer (isn't empty nor starts with /) #1",
-                "data": "a",
-                "valid": false
-            },
-            {
-                "description": "not a valid JSON-pointer (isn't empty nor starts with /) #2",
-                "data": "0",
-                "valid": false
-            },
-            {
-                "description": "not a valid JSON-pointer (isn't empty nor starts with /) #3",
-                "data": "a/a",
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft6/optional/format/unknown.json b/json/tests/draft6/optional/format/unknown.json
deleted file mode 100644
index 12339ae..0000000
--- a/json/tests/draft6/optional/format/unknown.json
+++ /dev/null
@@ -1,43 +0,0 @@
-[
-    {
-        "description": "unknown format",
-        "schema": { "format": "unknown" },
-        "tests": [
-            {
-                "description": "unknown formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "unknown formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "unknown formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "unknown formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "unknown formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "unknown formats ignore nulls",
-                "data": null,
-                "valid": true
-            },
-            {
-                "description": "unknown formats ignore strings",
-                "data": "string",
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft6/optional/format/uri-reference.json b/json/tests/draft6/optional/format/uri-reference.json
deleted file mode 100644
index 7cdf228..0000000
--- a/json/tests/draft6/optional/format/uri-reference.json
+++ /dev/null
@@ -1,73 +0,0 @@
-[
-    {
-        "description": "validation of URI References",
-        "schema": { "format": "uri-reference" },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            },
-            {
-                "description": "a valid URI",
-                "data": "http://foo.bar/?baz=qux#quux",
-                "valid": true
-            },
-            {
-                "description": "a valid protocol-relative URI Reference",
-                "data": "//foo.bar/?baz=qux#quux",
-                "valid": true
-            },
-            {
-                "description": "a valid relative URI Reference",
-                "data": "/abc",
-                "valid": true
-            },
-            {
-                "description": "an invalid URI Reference",
-                "data": "\\\\WINDOWS\\fileshare",
-                "valid": false
-            },
-            {
-                "description": "a valid URI Reference",
-                "data": "abc",
-                "valid": true
-            },
-            {
-                "description": "a valid URI fragment",
-                "data": "#fragment",
-                "valid": true
-            },
-            {
-                "description": "an invalid URI fragment",
-                "data": "#frag\\ment",
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft6/optional/format/uri-template.json b/json/tests/draft6/optional/format/uri-template.json
deleted file mode 100644
index df355c5..0000000
--- a/json/tests/draft6/optional/format/uri-template.json
+++ /dev/null
@@ -1,58 +0,0 @@
-[
-    {
-        "description": "format: uri-template",
-        "schema": { "format": "uri-template" },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            },
-            {
-                "description": "a valid uri-template",
-                "data": "http://example.com/dictionary/{term:1}/{term}",
-                "valid": true
-            },
-            {
-                "description": "an invalid uri-template",
-                "data": "http://example.com/dictionary/{term:1}/{term",
-                "valid": false
-            },
-            {
-                "description": "a valid uri-template without variables",
-                "data": "http://example.com/dictionary",
-                "valid": true
-            },
-            {
-                "description": "a valid relative uri-template",
-                "data": "dictionary/{term:1}/{term}",
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft6/optional/format/uri.json b/json/tests/draft6/optional/format/uri.json
deleted file mode 100644
index 4b48d40..0000000
--- a/json/tests/draft6/optional/format/uri.json
+++ /dev/null
@@ -1,138 +0,0 @@
-[
-    {
-        "description": "validation of URIs",
-        "schema": { "format": "uri" },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            },
-            {
-                "description": "a valid URL with anchor tag",
-                "data": "http://foo.bar/?baz=qux#quux",
-                "valid": true
-            },
-            {
-                "description": "a valid URL with anchor tag and parentheses",
-                "data": "http://foo.com/blah_(wikipedia)_blah#cite-1",
-                "valid": true
-            },
-            {
-                "description": "a valid URL with URL-encoded stuff",
-                "data": "http://foo.bar/?q=Test%20URL-encoded%20stuff",
-                "valid": true
-            },
-            {
-                "description": "a valid puny-coded URL ",
-                "data": "http://xn--nw2a.xn--j6w193g/",
-                "valid": true
-            },
-            {
-                "description": "a valid URL with many special characters",
-                "data": "http://-.~_!$&'()*+,;=:%40:80%2f::::::@example.com",
-                "valid": true
-            },
-            {
-                "description": "a valid URL based on IPv4",
-                "data": "http://223.255.255.254",
-                "valid": true
-            },
-            {
-                "description": "a valid URL with ftp scheme",
-                "data": "ftp://ftp.is.co.za/rfc/rfc1808.txt",
-                "valid": true
-            },
-            {
-                "description": "a valid URL for a simple text file",
-                "data": "http://www.ietf.org/rfc/rfc2396.txt",
-                "valid": true
-            },
-            {
-                "description": "a valid URL ",
-                "data": "ldap://[2001:db8::7]/c=GB?objectClass?one",
-                "valid": true
-            },
-            {
-                "description": "a valid mailto URI",
-                "data": "mailto:John.Doe@example.com",
-                "valid": true
-            },
-            {
-                "description": "a valid newsgroup URI",
-                "data": "news:comp.infosystems.www.servers.unix",
-                "valid": true
-            },
-            {
-                "description": "a valid tel URI",
-                "data": "tel:+1-816-555-1212",
-                "valid": true
-            },
-            {
-                "description": "a valid URN",
-                "data": "urn:oasis:names:specification:docbook:dtd:xml:4.1.2",
-                "valid": true
-            },
-            {
-                "description": "an invalid protocol-relative URI Reference",
-                "data": "//foo.bar/?baz=qux#quux",
-                "valid": false
-            },
-            {
-                "description": "an invalid relative URI Reference",
-                "data": "/abc",
-                "valid": false
-            },
-            {
-                "description": "an invalid URI",
-                "data": "\\\\WINDOWS\\fileshare",
-                "valid": false
-            },
-            {
-                "description": "an invalid URI though valid URI reference",
-                "data": "abc",
-                "valid": false
-            },
-            {
-                "description": "an invalid URI with spaces",
-                "data": "http:// shouldfail.com",
-                "valid": false
-            },
-            {
-                "description": "an invalid URI with spaces and missing scheme",
-                "data": ":// should fail",
-                "valid": false
-            },
-            {
-                "description": "an invalid URI with comma in scheme",
-                "data": "bar,baz:foo",
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft6/optional/non-bmp-regex.json b/json/tests/draft6/optional/non-bmp-regex.json
deleted file mode 100644
index dd67af2..0000000
--- a/json/tests/draft6/optional/non-bmp-regex.json
+++ /dev/null
@@ -1,82 +0,0 @@
-[
-    {
-        "description": "Proper UTF-16 surrogate pair handling: pattern",
-        "comment": "Optional because .Net doesn't correctly handle 32-bit Unicode characters",
-        "schema": { "pattern": "^🐲*$" },
-        "tests": [
-            {
-                "description": "matches empty",
-                "data": "",
-                "valid": true
-            },
-            {
-                "description": "matches single",
-                "data": "🐲",
-                "valid": true
-            },
-            {
-                "description": "matches two",
-                "data": "🐲🐲",
-                "valid": true
-            },
-            {
-                "description": "doesn't match one",
-                "data": "🐉",
-                "valid": false
-            },
-            {
-                "description": "doesn't match two",
-                "data": "🐉🐉",
-                "valid": false
-            },
-            {
-                "description": "doesn't match one ASCII",
-                "data": "D",
-                "valid": false
-            },
-            {
-                "description": "doesn't match two ASCII",
-                "data": "DD",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "Proper UTF-16 surrogate pair handling: patternProperties",
-        "comment": "Optional because .Net doesn't correctly handle 32-bit Unicode characters",
-        "schema": {
-            "patternProperties": {
-                "^🐲*$": {
-                    "type": "integer"
-                }
-            }
-        },
-        "tests": [
-            {
-                "description": "matches empty",
-                "data": { "": 1 },
-                "valid": true
-            },
-            {
-                "description": "matches single",
-                "data": { "🐲": 1 },
-                "valid": true
-            },
-            {
-                "description": "matches two",
-                "data": { "🐲🐲": 1 },
-                "valid": true
-            },
-            {
-                "description": "doesn't match one",
-                "data": { "🐲": "hello" },
-                "valid": false
-            },
-            {
-                "description": "doesn't match two",
-                "data": { "🐲🐲": "hello" },
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft6/pattern.json b/json/tests/draft6/pattern.json
deleted file mode 100644
index 92db0f9..0000000
--- a/json/tests/draft6/pattern.json
+++ /dev/null
@@ -1,59 +0,0 @@
-[
-    {
-        "description": "pattern validation",
-        "schema": {"pattern": "^a*$"},
-        "tests": [
-            {
-                "description": "a matching pattern is valid",
-                "data": "aaa",
-                "valid": true
-            },
-            {
-                "description": "a non-matching pattern is invalid",
-                "data": "abc",
-                "valid": false
-            },
-            {
-                "description": "ignores booleans",
-                "data": true,
-                "valid": true
-            },
-            {
-                "description": "ignores integers",
-                "data": 123,
-                "valid": true
-            },
-            {
-                "description": "ignores floats",
-                "data": 1.0,
-                "valid": true
-            },
-            {
-                "description": "ignores objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "ignores arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "ignores null",
-                "data": null,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "pattern is not anchored",
-        "schema": {"pattern": "a+"},
-        "tests": [
-            {
-                "description": "matches a substring",
-                "data": "xxaayy",
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft6/patternProperties.json b/json/tests/draft6/patternProperties.json
deleted file mode 100644
index c276e64..0000000
--- a/json/tests/draft6/patternProperties.json
+++ /dev/null
@@ -1,171 +0,0 @@
-[
-    {
-        "description":
-            "patternProperties validates properties matching a regex",
-        "schema": {
-            "patternProperties": {
-                "f.*o": {"type": "integer"}
-            }
-        },
-        "tests": [
-            {
-                "description": "a single valid match is valid",
-                "data": {"foo": 1},
-                "valid": true
-            },
-            {
-                "description": "multiple valid matches is valid",
-                "data": {"foo": 1, "foooooo" : 2},
-                "valid": true
-            },
-            {
-                "description": "a single invalid match is invalid",
-                "data": {"foo": "bar", "fooooo": 2},
-                "valid": false
-            },
-            {
-                "description": "multiple invalid matches is invalid",
-                "data": {"foo": "bar", "foooooo" : "baz"},
-                "valid": false
-            },
-            {
-                "description": "ignores arrays",
-                "data": ["foo"],
-                "valid": true
-            },
-            {
-                "description": "ignores strings",
-                "data": "foo",
-                "valid": true
-            },
-            {
-                "description": "ignores other non-objects",
-                "data": 12,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "multiple simultaneous patternProperties are validated",
-        "schema": {
-            "patternProperties": {
-                "a*": {"type": "integer"},
-                "aaa*": {"maximum": 20}
-            }
-        },
-        "tests": [
-            {
-                "description": "a single valid match is valid",
-                "data": {"a": 21},
-                "valid": true
-            },
-            {
-                "description": "a simultaneous match is valid",
-                "data": {"aaaa": 18},
-                "valid": true
-            },
-            {
-                "description": "multiple matches is valid",
-                "data": {"a": 21, "aaaa": 18},
-                "valid": true
-            },
-            {
-                "description": "an invalid due to one is invalid",
-                "data": {"a": "bar"},
-                "valid": false
-            },
-            {
-                "description": "an invalid due to the other is invalid",
-                "data": {"aaaa": 31},
-                "valid": false
-            },
-            {
-                "description": "an invalid due to both is invalid",
-                "data": {"aaa": "foo", "aaaa": 31},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "regexes are not anchored by default and are case sensitive",
-        "schema": {
-            "patternProperties": {
-                "[0-9]{2,}": { "type": "boolean" },
-                "X_": { "type": "string" }
-            }
-        },
-        "tests": [
-            {
-                "description": "non recognized members are ignored",
-                "data": { "answer 1": "42" },
-                "valid": true
-            },
-            {
-                "description": "recognized members are accounted for",
-                "data": { "a31b": null },
-                "valid": false
-            },
-            {
-                "description": "regexes are case sensitive",
-                "data": { "a_x_3": 3 },
-                "valid": true
-            },
-            {
-                "description": "regexes are case sensitive, 2",
-                "data": { "a_X_3": 3 },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "patternProperties with boolean schemas",
-        "schema": {
-            "patternProperties": {
-                "f.*": true,
-                "b.*": false
-            }
-        },
-        "tests": [
-            {
-                "description": "object with property matching schema true is valid",
-                "data": {"foo": 1},
-                "valid": true
-            },
-            {
-                "description": "object with property matching schema false is invalid",
-                "data": {"bar": 2},
-                "valid": false
-            },
-            {
-                "description": "object with both properties is invalid",
-                "data": {"foo": 1, "bar": 2},
-                "valid": false
-            },
-            {
-                "description": "object with a property matching both true and false is invalid",
-                "data": {"foobar":1},
-                "valid": false
-            },
-            {
-                "description": "empty object is valid",
-                "data": {},
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "patternProperties with null valued instance properties",
-        "schema": {
-            "patternProperties": {
-                "^.*bar$": {"type": "null"}
-            }
-        },
-        "tests": [
-            {
-                "description": "allows null values",
-                "data": {"foobar": null},
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft6/properties.json b/json/tests/draft6/properties.json
deleted file mode 100644
index 5b971ca..0000000
--- a/json/tests/draft6/properties.json
+++ /dev/null
@@ -1,236 +0,0 @@
-[
-    {
-        "description": "object properties validation",
-        "schema": {
-            "properties": {
-                "foo": {"type": "integer"},
-                "bar": {"type": "string"}
-            }
-        },
-        "tests": [
-            {
-                "description": "both properties present and valid is valid",
-                "data": {"foo": 1, "bar": "baz"},
-                "valid": true
-            },
-            {
-                "description": "one property invalid is invalid",
-                "data": {"foo": 1, "bar": {}},
-                "valid": false
-            },
-            {
-                "description": "both properties invalid is invalid",
-                "data": {"foo": [], "bar": {}},
-                "valid": false
-            },
-            {
-                "description": "doesn't invalidate other properties",
-                "data": {"quux": []},
-                "valid": true
-            },
-            {
-                "description": "ignores arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "ignores other non-objects",
-                "data": 12,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description":
-            "properties, patternProperties, additionalProperties interaction",
-        "schema": {
-            "properties": {
-                "foo": {"type": "array", "maxItems": 3},
-                "bar": {"type": "array"}
-            },
-            "patternProperties": {"f.o": {"minItems": 2}},
-            "additionalProperties": {"type": "integer"}
-        },
-        "tests": [
-            {
-                "description": "property validates property",
-                "data": {"foo": [1, 2]},
-                "valid": true
-            },
-            {
-                "description": "property invalidates property",
-                "data": {"foo": [1, 2, 3, 4]},
-                "valid": false
-            },
-            {
-                "description": "patternProperty invalidates property",
-                "data": {"foo": []},
-                "valid": false
-            },
-            {
-                "description": "patternProperty validates nonproperty",
-                "data": {"fxo": [1, 2]},
-                "valid": true
-            },
-            {
-                "description": "patternProperty invalidates nonproperty",
-                "data": {"fxo": []},
-                "valid": false
-            },
-            {
-                "description": "additionalProperty ignores property",
-                "data": {"bar": []},
-                "valid": true
-            },
-            {
-                "description": "additionalProperty validates others",
-                "data": {"quux": 3},
-                "valid": true
-            },
-            {
-                "description": "additionalProperty invalidates others",
-                "data": {"quux": "foo"},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "properties with boolean schema",
-        "schema": {
-            "properties": {
-                "foo": true,
-                "bar": false
-            }
-        },
-        "tests": [
-            {
-                "description": "no property present is valid",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "only 'true' property present is valid",
-                "data": {"foo": 1},
-                "valid": true
-            },
-            {
-                "description": "only 'false' property present is invalid",
-                "data": {"bar": 2},
-                "valid": false
-            },
-            {
-                "description": "both properties present is invalid",
-                "data": {"foo": 1, "bar": 2},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "properties with escaped characters",
-        "schema": {
-            "properties": {
-                "foo\nbar": {"type": "number"},
-                "foo\"bar": {"type": "number"},
-                "foo\\bar": {"type": "number"},
-                "foo\rbar": {"type": "number"},
-                "foo\tbar": {"type": "number"},
-                "foo\fbar": {"type": "number"}
-            }
-        },
-        "tests": [
-            {
-                "description": "object with all numbers is valid",
-                "data": {
-                    "foo\nbar": 1,
-                    "foo\"bar": 1,
-                    "foo\\bar": 1,
-                    "foo\rbar": 1,
-                    "foo\tbar": 1,
-                    "foo\fbar": 1
-                },
-                "valid": true
-            },
-            {
-                "description": "object with strings is invalid",
-                "data": {
-                    "foo\nbar": "1",
-                    "foo\"bar": "1",
-                    "foo\\bar": "1",
-                    "foo\rbar": "1",
-                    "foo\tbar": "1",
-                    "foo\fbar": "1"
-                },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "properties with null valued instance properties",
-        "schema": {
-            "properties": {
-                "foo": {"type": "null"}
-            }
-        },
-        "tests": [
-            {
-                "description": "allows null values",
-                "data": {"foo": null},
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "properties whose names are Javascript object property names",
-        "comment": "Ensure JS implementations don't universally consider e.g. __proto__ to always be present in an object.",
-        "schema": {
-            "properties": {
-                "__proto__": {"type": "number"},
-                "toString": {
-                    "properties": { "length": { "type": "string" } }
-                },
-                "constructor": {"type": "number"}
-            }
-        },
-        "tests": [
-            {
-                "description": "ignores arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "ignores other non-objects",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "none of the properties mentioned",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "__proto__ not valid",
-                "data": { "__proto__": "foo" },
-                "valid": false
-            },
-            {
-                "description": "toString not valid",
-                "data": { "toString": { "length": 37 } },
-                "valid": false
-            },
-            {
-                "description": "constructor not valid",
-                "data": { "constructor": { "length": 37 } },
-                "valid": false
-            },
-            {
-                "description": "all present and valid",
-                "data": { 
-                    "__proto__": 12,
-                    "toString": { "length": "foo" },
-                    "constructor": 37
-                },
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft6/propertyNames.json b/json/tests/draft6/propertyNames.json
deleted file mode 100644
index f0788e6..0000000
--- a/json/tests/draft6/propertyNames.json
+++ /dev/null
@@ -1,107 +0,0 @@
-[
-    {
-        "description": "propertyNames validation",
-        "schema": {
-            "propertyNames": {"maxLength": 3}
-        },
-        "tests": [
-            {
-                "description": "all property names valid",
-                "data": {
-                    "f": {},
-                    "foo": {}
-                },
-                "valid": true
-            },
-            {
-                "description": "some property names invalid",
-                "data": {
-                    "foo": {},
-                    "foobar": {}
-                },
-                "valid": false
-            },
-            {
-                "description": "object without properties is valid",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "ignores arrays",
-                "data": [1, 2, 3, 4],
-                "valid": true
-            },
-            {
-                "description": "ignores strings",
-                "data": "foobar",
-                "valid": true
-            },
-            {
-                "description": "ignores other non-objects",
-                "data": 12,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "propertyNames validation with pattern",
-        "schema": {
-            "propertyNames": { "pattern": "^a+$" }
-        },
-        "tests": [
-            {
-                "description": "matching property names valid",
-                "data": {
-                    "a": {},
-                    "aa": {},
-                    "aaa": {}
-                },
-                "valid": true
-            },
-            {
-                "description": "non-matching property name is invalid",
-                "data": {
-                    "aaA": {}
-                },
-                "valid": false
-            },
-            {
-                "description": "object without properties is valid",
-                "data": {},
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "propertyNames with boolean schema true",
-        "schema": {"propertyNames": true},
-        "tests": [
-            {
-                "description": "object with any properties is valid",
-                "data": {"foo": 1},
-                "valid": true
-            },
-            {
-                "description": "empty object is valid",
-                "data": {},
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "propertyNames with boolean schema false",
-        "schema": {"propertyNames": false},
-        "tests": [
-            {
-                "description": "object with any properties is invalid",
-                "data": {"foo": 1},
-                "valid": false
-            },
-            {
-                "description": "empty object is valid",
-                "data": {},
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft6/ref.json b/json/tests/draft6/ref.json
deleted file mode 100644
index 1724f81..0000000
--- a/json/tests/draft6/ref.json
+++ /dev/null
@@ -1,786 +0,0 @@
-[
-    {
-        "description": "root pointer ref",
-        "schema": {
-            "properties": {
-                "foo": {"$ref": "#"}
-            },
-            "additionalProperties": false
-        },
-        "tests": [
-            {
-                "description": "match",
-                "data": {"foo": false},
-                "valid": true
-            },
-            {
-                "description": "recursive match",
-                "data": {"foo": {"foo": false}},
-                "valid": true
-            },
-            {
-                "description": "mismatch",
-                "data": {"bar": false},
-                "valid": false
-            },
-            {
-                "description": "recursive mismatch",
-                "data": {"foo": {"bar": false}},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "relative pointer ref to object",
-        "schema": {
-            "properties": {
-                "foo": {"type": "integer"},
-                "bar": {"$ref": "#/properties/foo"}
-            }
-        },
-        "tests": [
-            {
-                "description": "match",
-                "data": {"bar": 3},
-                "valid": true
-            },
-            {
-                "description": "mismatch",
-                "data": {"bar": true},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "relative pointer ref to array",
-        "schema": {
-            "items": [
-                {"type": "integer"},
-                {"$ref": "#/items/0"}
-            ]
-        },
-        "tests": [
-            {
-                "description": "match array",
-                "data": [1, 2],
-                "valid": true
-            },
-            {
-                "description": "mismatch array",
-                "data": [1, "foo"],
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "escaped pointer ref",
-        "schema": {
-            "definitions": {
-                "tilde~field": {"type": "integer"},
-                "slash/field": {"type": "integer"},
-                "percent%field": {"type": "integer"}
-            },
-            "properties": {
-                "tilde": {"$ref": "#/definitions/tilde~0field"},
-                "slash": {"$ref": "#/definitions/slash~1field"},
-                "percent": {"$ref": "#/definitions/percent%25field"}
-            }
-        },
-        "tests": [
-            {
-                "description": "slash invalid",
-                "data": {"slash": "aoeu"},
-                "valid": false
-            },
-            {
-                "description": "tilde invalid",
-                "data": {"tilde": "aoeu"},
-                "valid": false
-            },
-            {
-                "description": "percent invalid",
-                "data": {"percent": "aoeu"},
-                "valid": false
-            },
-            {
-                "description": "slash valid",
-                "data": {"slash": 123},
-                "valid": true
-            },
-            {
-                "description": "tilde valid",
-                "data": {"tilde": 123},
-                "valid": true
-            },
-            {
-                "description": "percent valid",
-                "data": {"percent": 123},
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "nested refs",
-        "schema": {
-            "definitions": {
-                "a": {"type": "integer"},
-                "b": {"$ref": "#/definitions/a"},
-                "c": {"$ref": "#/definitions/b"}
-            },
-            "allOf": [{ "$ref": "#/definitions/c" }]
-        },
-        "tests": [
-            {
-                "description": "nested ref valid",
-                "data": 5,
-                "valid": true
-            },
-            {
-                "description": "nested ref invalid",
-                "data": "a",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "ref overrides any sibling keywords",
-        "schema": {
-            "definitions": {
-                "reffed": {
-                    "type": "array"
-                }
-            },
-            "properties": {
-                "foo": {
-                    "$ref": "#/definitions/reffed",
-                    "maxItems": 2
-                }
-            }
-        },
-        "tests": [
-            {
-                "description": "ref valid",
-                "data": { "foo": [] },
-                "valid": true
-            },
-            {
-                "description": "ref valid, maxItems ignored",
-                "data": { "foo": [ 1, 2, 3] },
-                "valid": true
-            },
-            {
-                "description": "ref invalid",
-                "data": { "foo": "string" },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "$ref prevents a sibling $id from changing the base uri",
-        "schema": {
-            "$id": "http://localhost:1234/sibling_id/base/",
-            "definitions": {
-                "foo": {
-                    "$id": "http://localhost:1234/sibling_id/foo.json",
-                    "type": "string"
-                },
-                "base_foo": {
-                    "$comment": "this canonical uri is http://localhost:1234/sibling_id/base/foo.json",
-                    "$id": "foo.json",
-                    "type": "number"
-                }
-            },
-            "allOf": [
-                {
-                    "$comment": "$ref resolves to http://localhost:1234/sibling_id/base/foo.json, not http://localhost:1234/sibling_id/foo.json",
-                    "$id": "http://localhost:1234/sibling_id/",
-                    "$ref": "foo.json"
-                }
-            ]
-        },
-        "tests": [
-            {
-                "description": "$ref resolves to /definitions/base_foo, data does not validate",
-                "data": "a",
-                "valid": false
-            },
-            {
-                "description": "$ref resolves to /definitions/base_foo, data validates",
-                "data": 1,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "remote ref, containing refs itself",
-        "schema": {"$ref": "http://json-schema.org/draft-06/schema#"},
-        "tests": [
-            {
-                "description": "remote ref valid",
-                "data": {"minLength": 1},
-                "valid": true
-            },
-            {
-                "description": "remote ref invalid",
-                "data": {"minLength": -1},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "property named $ref that is not a reference",
-        "schema": {
-            "properties": {
-                "$ref": {"type": "string"}
-            }
-        },
-        "tests": [
-            {
-                "description": "property named $ref valid",
-                "data": {"$ref": "a"},
-                "valid": true
-            },
-            {
-                "description": "property named $ref invalid",
-                "data": {"$ref": 2},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "property named $ref, containing an actual $ref",
-        "schema": {
-            "properties": {
-                "$ref": {"$ref": "#/definitions/is-string"}
-            },
-            "definitions": {
-                "is-string": {
-                    "type": "string"
-                }
-            }
-        },
-        "tests": [
-            {
-                "description": "property named $ref valid",
-                "data": {"$ref": "a"},
-                "valid": true
-            },
-            {
-                "description": "property named $ref invalid",
-                "data": {"$ref": 2},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "$ref to boolean schema true",
-        "schema": {
-            "allOf": [{ "$ref": "#/definitions/bool" }],
-            "definitions": {
-                "bool": true
-            }
-        },
-        "tests": [
-            {
-                "description": "any value is valid",
-                "data": "foo",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "$ref to boolean schema false",
-        "schema": {
-            "allOf": [{ "$ref": "#/definitions/bool" }],
-            "definitions": {
-                "bool": false
-            }
-        },
-        "tests": [
-            {
-                "description": "any value is invalid",
-                "data": "foo",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "Recursive references between schemas",
-        "schema": {
-            "$id": "http://localhost:1234/tree",
-            "description": "tree of nodes",
-            "type": "object",
-            "properties": {
-                "meta": {"type": "string"},
-                "nodes": {
-                    "type": "array",
-                    "items": {"$ref": "node"}
-                }
-            },
-            "required": ["meta", "nodes"],
-            "definitions": {
-                "node": {
-                    "$id": "http://localhost:1234/node",
-                    "description": "node",
-                    "type": "object",
-                    "properties": {
-                        "value": {"type": "number"},
-                        "subtree": {"$ref": "tree"}
-                    },
-                    "required": ["value"]
-                }
-            }
-        },
-        "tests": [
-            {
-                "description": "valid tree",
-                "data": { 
-                    "meta": "root",
-                    "nodes": [
-                        {
-                            "value": 1,
-                            "subtree": {
-                                "meta": "child",
-                                "nodes": [
-                                    {"value": 1.1},
-                                    {"value": 1.2}
-                                ]
-                            }
-                        },
-                        {
-                            "value": 2,
-                            "subtree": {
-                                "meta": "child",
-                                "nodes": [
-                                    {"value": 2.1},
-                                    {"value": 2.2}
-                                ]
-                            }
-                        }
-                    ]
-                },
-                "valid": true
-            },
-            {
-                "description": "invalid tree",
-                "data": { 
-                    "meta": "root",
-                    "nodes": [
-                        {
-                            "value": 1,
-                            "subtree": {
-                                "meta": "child",
-                                "nodes": [
-                                    {"value": "string is invalid"},
-                                    {"value": 1.2}
-                                ]
-                            }
-                        },
-                        {
-                            "value": 2,
-                            "subtree": {
-                                "meta": "child",
-                                "nodes": [
-                                    {"value": 2.1},
-                                    {"value": 2.2}
-                                ]
-                            }
-                        }
-                    ]
-                },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "refs with quote",
-        "schema": {
-            "properties": {
-                "foo\"bar": {"$ref": "#/definitions/foo%22bar"}
-            },
-            "definitions": {
-                "foo\"bar": {"type": "number"}
-            }
-        },
-        "tests": [
-            {
-                "description": "object with numbers is valid",
-                "data": {
-                    "foo\"bar": 1
-                },
-                "valid": true
-            },
-            {
-                "description": "object with strings is invalid",
-                "data": {
-                    "foo\"bar": "1"
-                },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "Location-independent identifier",
-        "schema": {
-            "allOf": [{
-                "$ref": "#foo"
-            }],
-            "definitions": {
-                "A": {
-                    "$id": "#foo",
-                    "type": "integer"
-                }
-            }
-        },
-        "tests": [
-            {
-                "data": 1,
-                "description": "match",
-                "valid": true
-            },
-            {
-                "data": "a",
-                "description": "mismatch",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "Location-independent identifier with base URI change in subschema",
-        "schema": {
-            "$id": "http://localhost:1234/root",
-            "allOf": [{
-                "$ref": "http://localhost:1234/nested.json#foo"
-            }],
-            "definitions": {
-                "A": {
-                    "$id": "nested.json",
-                    "definitions": {
-                        "B": {
-                            "$id": "#foo",
-                            "type": "integer"
-                        }
-                    }
-                }
-            }
-        },
-        "tests": [
-            {
-                "data": 1,
-                "description": "match",
-                "valid": true
-            },
-            {
-                "data": "a",
-                "description": "mismatch",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "naive replacement of $ref with its destination is not correct",
-        "schema": {
-            "definitions": {
-                "a_string": { "type": "string" }
-            },
-            "enum": [
-                { "$ref": "#/definitions/a_string" }
-            ]
-        },
-        "tests": [
-            {
-                "description": "do not evaluate the $ref inside the enum, matching any string",
-                "data": "this is a string",
-                "valid": false
-            },
-            {
-                "description": "do not evaluate the $ref inside the enum, definition exact match",
-                "data": { "type": "string" },
-                "valid": false
-            },
-            {
-                "description": "match the enum exactly",
-                "data": { "$ref": "#/definitions/a_string" },
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "refs with relative uris and defs",
-        "schema": {
-            "$id": "http://example.com/schema-relative-uri-defs1.json",
-            "properties": {
-                "foo": {
-                    "$id": "schema-relative-uri-defs2.json",
-                    "definitions": {
-                        "inner": {
-                            "properties": {
-                                "bar": { "type": "string" }
-                            }
-                        }
-                    },
-                    "allOf": [ { "$ref": "#/definitions/inner" } ]
-                }
-            },
-            "allOf": [ { "$ref": "schema-relative-uri-defs2.json" } ]
-        },
-        "tests": [
-            {
-                "description": "invalid on inner field",
-                "data": {
-                    "foo": {
-                        "bar": 1
-                    },
-                    "bar": "a"
-                },
-                "valid": false
-            },
-            {
-                "description": "invalid on outer field",
-                "data": {
-                    "foo": {
-                        "bar": "a"
-                    },
-                    "bar": 1
-                },
-                "valid": false
-            },
-            {
-                "description": "valid on both fields",
-                "data": {
-                    "foo": {
-                        "bar": "a"
-                    },
-                    "bar": "a"
-                },
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "relative refs with absolute uris and defs",
-        "schema": {
-            "$id": "http://example.com/schema-refs-absolute-uris-defs1.json",
-            "properties": {
-                "foo": {
-                    "$id": "http://example.com/schema-refs-absolute-uris-defs2.json",
-                    "definitions": {
-                        "inner": {
-                            "properties": {
-                                "bar": { "type": "string" }
-                            }
-                        }
-                    },
-                    "allOf": [ { "$ref": "#/definitions/inner" } ]
-                }
-            },
-            "allOf": [ { "$ref": "schema-refs-absolute-uris-defs2.json" } ]
-        },
-        "tests": [
-            {
-                "description": "invalid on inner field",
-                "data": {
-                    "foo": {
-                        "bar": 1
-                    },
-                    "bar": "a"
-                },
-                "valid": false
-            },
-            {
-                "description": "invalid on outer field",
-                "data": {
-                    "foo": {
-                        "bar": "a"
-                    },
-                    "bar": 1
-                },
-                "valid": false
-            },
-            {
-                "description": "valid on both fields",
-                "data": {
-                    "foo": {
-                        "bar": "a"
-                    },
-                    "bar": "a"
-                },
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "simple URN base URI with $ref via the URN",
-        "schema": {
-            "$comment": "URIs do not have to have HTTP(s) schemes",
-            "$id": "urn:uuid:deadbeef-1234-ffff-ffff-4321feebdaed",
-            "minimum": 30,
-            "properties": {
-                "foo": {"$ref": "urn:uuid:deadbeef-1234-ffff-ffff-4321feebdaed"}
-            }
-        },
-        "tests": [
-            {
-                "description": "valid under the URN IDed schema",
-                "data": {"foo": 37},
-                "valid": true
-            },
-            {
-                "description": "invalid under the URN IDed schema",
-                "data": {"foo": 12},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "simple URN base URI with JSON pointer",
-        "schema": {
-            "$comment": "URIs do not have to have HTTP(s) schemes",
-            "$id": "urn:uuid:deadbeef-1234-00ff-ff00-4321feebdaed",
-            "properties": {
-                "foo": {"$ref": "#/definitions/bar"}
-            },
-            "definitions": {
-                "bar": {"type": "string"}
-            }
-        },
-        "tests": [
-            {
-                "description": "a string is valid",
-                "data": {"foo": "bar"},
-                "valid": true
-            },
-            {
-                "description": "a non-string is invalid",
-                "data": {"foo": 12},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "URN base URI with NSS",
-        "schema": {
-            "$comment": "RFC 8141 §2.2",
-            "$id": "urn:example:1/406/47452/2",
-            "properties": {
-                "foo": {"$ref": "#/definitions/bar"}
-            },
-            "definitions": {
-                "bar": {"type": "string"}
-            }
-        },
-        "tests": [
-            {
-                "description": "a string is valid",
-                "data": {"foo": "bar"},
-                "valid": true
-            },
-            {
-                "description": "a non-string is invalid",
-                "data": {"foo": 12},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "URN base URI with r-component",
-        "schema": {
-            "$comment": "RFC 8141 §2.3.1",
-            "$id": "urn:example:foo-bar-baz-qux?+CCResolve:cc=uk",
-            "properties": {
-                "foo": {"$ref": "#/definitions/bar"}
-            },
-            "definitions": {
-                "bar": {"type": "string"}
-            }
-        },
-        "tests": [
-            {
-                "description": "a string is valid",
-                "data": {"foo": "bar"},
-                "valid": true
-            },
-            {
-                "description": "a non-string is invalid",
-                "data": {"foo": 12},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "URN base URI with q-component",
-        "schema": {
-            "$comment": "RFC 8141 §2.3.2",
-            "$id": "urn:example:weather?=op=map&lat=39.56&lon=-104.85&datetime=1969-07-21T02:56:15Z",
-            "properties": {
-                "foo": {"$ref": "#/definitions/bar"}
-            },
-            "definitions": {
-                "bar": {"type": "string"}
-            }
-        },
-        "tests": [
-            {
-                "description": "a string is valid",
-                "data": {"foo": "bar"},
-                "valid": true
-            },
-            {
-                "description": "a non-string is invalid",
-                "data": {"foo": 12},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "URN base URI with URN and JSON pointer ref",
-        "schema": {
-            "$id": "urn:uuid:deadbeef-1234-0000-0000-4321feebdaed",
-            "properties": {
-                "foo": {"$ref": "urn:uuid:deadbeef-1234-0000-0000-4321feebdaed#/definitions/bar"}
-            },
-            "definitions": {
-                "bar": {"type": "string"}
-            }
-        },
-        "tests": [
-            {
-                "description": "a string is valid",
-                "data": {"foo": "bar"},
-                "valid": true
-            },
-            {
-                "description": "a non-string is invalid",
-                "data": {"foo": 12},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "URN base URI with URN and anchor ref",
-        "schema": {
-            "$id": "urn:uuid:deadbeef-1234-ff00-00ff-4321feebdaed",
-            "properties": {
-                "foo": {"$ref": "urn:uuid:deadbeef-1234-ff00-00ff-4321feebdaed#something"}
-            },
-            "definitions": {
-                "bar": {
-                    "$id": "#something",
-                    "type": "string"
-                }
-            }
-        },
-        "tests": [
-            {
-                "description": "a string is valid",
-                "data": {"foo": "bar"},
-                "valid": true
-            },
-            {
-                "description": "a non-string is invalid",
-                "data": {"foo": 12},
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft6/refRemote.json b/json/tests/draft6/refRemote.json
deleted file mode 100644
index c2b2002..0000000
--- a/json/tests/draft6/refRemote.json
+++ /dev/null
@@ -1,239 +0,0 @@
-[
-    {
-        "description": "remote ref",
-        "schema": {"$ref": "http://localhost:1234/integer.json"},
-        "tests": [
-            {
-                "description": "remote ref valid",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "remote ref invalid",
-                "data": "a",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "fragment within remote ref",
-        "schema": {"$ref": "http://localhost:1234/subSchemas.json#/integer"},
-        "tests": [
-            {
-                "description": "remote fragment valid",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "remote fragment invalid",
-                "data": "a",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "ref within remote ref",
-        "schema": {
-            "$ref": "http://localhost:1234/subSchemas.json#/refToInteger"
-        },
-        "tests": [
-            {
-                "description": "ref within ref valid",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "ref within ref invalid",
-                "data": "a",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "base URI change",
-        "schema": {
-            "$id": "http://localhost:1234/",
-            "items": {
-                "$id": "baseUriChange/",
-                "items": {"$ref": "folderInteger.json"}
-            }
-        },
-        "tests": [
-            {
-                "description": "base URI change ref valid",
-                "data": [[1]],
-                "valid": true
-            },
-            {
-                "description": "base URI change ref invalid",
-                "data": [["a"]],
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "base URI change - change folder",
-        "schema": {
-            "$id": "http://localhost:1234/scope_change_defs1.json",
-            "type" : "object",
-            "properties": {
-                "list": {"$ref": "#/definitions/baz"}
-            },
-            "definitions": {
-                "baz": {
-                    "$id": "baseUriChangeFolder/",
-                    "type": "array",
-                    "items": {"$ref": "folderInteger.json"}
-                }
-            }
-        },
-        "tests": [
-            {
-                "description": "number is valid",
-                "data": {"list": [1]},
-                "valid": true
-            },
-            {
-                "description": "string is invalid",
-                "data": {"list": ["a"]},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "base URI change - change folder in subschema",
-        "schema": {
-            "$id": "http://localhost:1234/scope_change_defs2.json",
-            "type" : "object",
-            "properties": {
-                "list": {"$ref": "#/definitions/baz/definitions/bar"}
-            },
-            "definitions": {
-                "baz": {
-                    "$id": "baseUriChangeFolderInSubschema/",
-                    "definitions": {
-                        "bar": {
-                            "type": "array",
-                            "items": {"$ref": "folderInteger.json"}
-                        }
-                    }
-                }
-            }
-        },
-        "tests": [
-            {
-                "description": "number is valid",
-                "data": {"list": [1]},
-                "valid": true
-            },
-            {
-                "description": "string is invalid",
-                "data": {"list": ["a"]},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "root ref in remote ref",
-        "schema": {
-            "$id": "http://localhost:1234/object",
-            "type": "object",
-            "properties": {
-                "name": {"$ref": "name.json#/definitions/orNull"}
-            }
-        },
-        "tests": [
-            {
-                "description": "string is valid",
-                "data": {
-                    "name": "foo"
-                },
-                "valid": true
-            },
-            {
-                "description": "null is valid",
-                "data": {
-                    "name": null
-                },
-                "valid": true
-            },
-            {
-                "description": "object is invalid",
-                "data": {
-                    "name": {
-                        "name": null
-                    }
-                },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "remote ref with ref to definitions",
-        "schema": {
-            "$id": "http://localhost:1234/schema-remote-ref-ref-defs1.json",
-            "allOf": [
-                { "$ref": "ref-and-definitions.json" }
-            ]
-        },
-        "tests": [
-            {
-                "description": "invalid",
-                "data": {
-                    "bar": 1
-                },
-                "valid": false
-            },
-            {
-                "description": "valid",
-                "data": {
-                    "bar": "a"
-                },
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "Location-independent identifier in remote ref",
-        "schema": {
-            "$ref": "http://localhost:1234/locationIndependentIdentifierPre2019.json#/definitions/refToInteger"
-        },
-        "tests": [
-            {
-                "description": "integer is valid",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "string is invalid",
-                "data": "foo",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "retrieved nested refs resolve relative to their URI not $id",
-        "schema": {
-            "$id": "http://localhost:1234/some-id",
-            "properties": {
-                "name": {"$ref": "nested/foo-ref-string.json"}
-            }
-        },
-        "tests": [
-            {
-                "description": "number is invalid",
-                "data": {
-                    "name": {"foo":  1}
-                },
-                "valid": false
-            },
-            {
-                "description": "string is valid",
-                "data": {
-                    "name": {"foo":  "a"}
-                },
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft6/required.json b/json/tests/draft6/required.json
deleted file mode 100644
index 8d8087a..0000000
--- a/json/tests/draft6/required.json
+++ /dev/null
@@ -1,151 +0,0 @@
-[
-    {
-        "description": "required validation",
-        "schema": {
-            "properties": {
-                "foo": {},
-                "bar": {}
-            },
-            "required": ["foo"]
-        },
-        "tests": [
-            {
-                "description": "present required property is valid",
-                "data": {"foo": 1},
-                "valid": true
-            },
-            {
-                "description": "non-present required property is invalid",
-                "data": {"bar": 1},
-                "valid": false
-            },
-            {
-                "description": "ignores arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "ignores strings",
-                "data": "",
-                "valid": true
-            },
-            {
-                "description": "ignores other non-objects",
-                "data": 12,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "required default validation",
-        "schema": {
-            "properties": {
-                "foo": {}
-            }
-        },
-        "tests": [
-            {
-                "description": "not required by default",
-                "data": {},
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "required with empty array",
-        "schema": {
-            "properties": {
-                "foo": {}
-            },
-            "required": []
-        },
-        "tests": [
-            {
-                "description": "property not required",
-                "data": {},
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "required with escaped characters",
-        "schema": {
-            "required": [
-                "foo\nbar",
-                "foo\"bar",
-                "foo\\bar",
-                "foo\rbar",
-                "foo\tbar",
-                "foo\fbar"
-            ]
-        },
-        "tests": [
-            {
-                "description": "object with all properties present is valid",
-                "data": {
-                    "foo\nbar": 1,
-                    "foo\"bar": 1,
-                    "foo\\bar": 1,
-                    "foo\rbar": 1,
-                    "foo\tbar": 1,
-                    "foo\fbar": 1
-                },
-                "valid": true
-            },
-            {
-                "description": "object with some properties missing is invalid",
-                "data": {
-                    "foo\nbar": "1",
-                    "foo\"bar": "1"
-                },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "required properties whose names are Javascript object property names",
-        "comment": "Ensure JS implementations don't universally consider e.g. __proto__ to always be present in an object.",
-        "schema": { "required": ["__proto__", "toString", "constructor"] },
-        "tests": [
-            {
-                "description": "ignores arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "ignores other non-objects",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "none of the properties mentioned",
-                "data": {},
-                "valid": false
-            },
-            {
-                "description": "__proto__ present",
-                "data": { "__proto__": "foo" },
-                "valid": false
-            },
-            {
-                "description": "toString present",
-                "data": { "toString": { "length": 37 } },
-                "valid": false
-            },
-            {
-                "description": "constructor present",
-                "data": { "constructor": { "length": 37 } },
-                "valid": false
-            },
-            {
-                "description": "all present",
-                "data": { 
-                    "__proto__": 12,
-                    "toString": { "length": "foo" },
-                    "constructor": 37
-                },
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft6/type.json b/json/tests/draft6/type.json
deleted file mode 100644
index 8304647..0000000
--- a/json/tests/draft6/type.json
+++ /dev/null
@@ -1,474 +0,0 @@
-[
-    {
-        "description": "integer type matches integers",
-        "schema": {"type": "integer"},
-        "tests": [
-            {
-                "description": "an integer is an integer",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "a float with zero fractional part is an integer",
-                "data": 1.0,
-                "valid": true
-            },
-            {
-                "description": "a float is not an integer",
-                "data": 1.1,
-                "valid": false
-            },
-            {
-                "description": "a string is not an integer",
-                "data": "foo",
-                "valid": false
-            },
-            {
-                "description": "a string is still not an integer, even if it looks like one",
-                "data": "1",
-                "valid": false
-            },
-            {
-                "description": "an object is not an integer",
-                "data": {},
-                "valid": false
-            },
-            {
-                "description": "an array is not an integer",
-                "data": [],
-                "valid": false
-            },
-            {
-                "description": "a boolean is not an integer",
-                "data": true,
-                "valid": false
-            },
-            {
-                "description": "null is not an integer",
-                "data": null,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "number type matches numbers",
-        "schema": {"type": "number"},
-        "tests": [
-            {
-                "description": "an integer is a number",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "a float with zero fractional part is a number (and an integer)",
-                "data": 1.0,
-                "valid": true
-            },
-            {
-                "description": "a float is a number",
-                "data": 1.1,
-                "valid": true
-            },
-            {
-                "description": "a string is not a number",
-                "data": "foo",
-                "valid": false
-            },
-            {
-                "description": "a string is still not a number, even if it looks like one",
-                "data": "1",
-                "valid": false
-            },
-            {
-                "description": "an object is not a number",
-                "data": {},
-                "valid": false
-            },
-            {
-                "description": "an array is not a number",
-                "data": [],
-                "valid": false
-            },
-            {
-                "description": "a boolean is not a number",
-                "data": true,
-                "valid": false
-            },
-            {
-                "description": "null is not a number",
-                "data": null,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "string type matches strings",
-        "schema": {"type": "string"},
-        "tests": [
-            {
-                "description": "1 is not a string",
-                "data": 1,
-                "valid": false
-            },
-            {
-                "description": "a float is not a string",
-                "data": 1.1,
-                "valid": false
-            },
-            {
-                "description": "a string is a string",
-                "data": "foo",
-                "valid": true
-            },
-            {
-                "description": "a string is still a string, even if it looks like a number",
-                "data": "1",
-                "valid": true
-            },
-            {
-                "description": "an empty string is still a string",
-                "data": "",
-                "valid": true
-            },
-            {
-                "description": "an object is not a string",
-                "data": {},
-                "valid": false
-            },
-            {
-                "description": "an array is not a string",
-                "data": [],
-                "valid": false
-            },
-            {
-                "description": "a boolean is not a string",
-                "data": true,
-                "valid": false
-            },
-            {
-                "description": "null is not a string",
-                "data": null,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "object type matches objects",
-        "schema": {"type": "object"},
-        "tests": [
-            {
-                "description": "an integer is not an object",
-                "data": 1,
-                "valid": false
-            },
-            {
-                "description": "a float is not an object",
-                "data": 1.1,
-                "valid": false
-            },
-            {
-                "description": "a string is not an object",
-                "data": "foo",
-                "valid": false
-            },
-            {
-                "description": "an object is an object",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "an array is not an object",
-                "data": [],
-                "valid": false
-            },
-            {
-                "description": "a boolean is not an object",
-                "data": true,
-                "valid": false
-            },
-            {
-                "description": "null is not an object",
-                "data": null,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "array type matches arrays",
-        "schema": {"type": "array"},
-        "tests": [
-            {
-                "description": "an integer is not an array",
-                "data": 1,
-                "valid": false
-            },
-            {
-                "description": "a float is not an array",
-                "data": 1.1,
-                "valid": false
-            },
-            {
-                "description": "a string is not an array",
-                "data": "foo",
-                "valid": false
-            },
-            {
-                "description": "an object is not an array",
-                "data": {},
-                "valid": false
-            },
-            {
-                "description": "an array is an array",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "a boolean is not an array",
-                "data": true,
-                "valid": false
-            },
-            {
-                "description": "null is not an array",
-                "data": null,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "boolean type matches booleans",
-        "schema": {"type": "boolean"},
-        "tests": [
-            {
-                "description": "an integer is not a boolean",
-                "data": 1,
-                "valid": false
-            },
-            {
-                "description": "zero is not a boolean",
-                "data": 0,
-                "valid": false
-            },
-            {
-                "description": "a float is not a boolean",
-                "data": 1.1,
-                "valid": false
-            },
-            {
-                "description": "a string is not a boolean",
-                "data": "foo",
-                "valid": false
-            },
-            {
-                "description": "an empty string is not a boolean",
-                "data": "",
-                "valid": false
-            },
-            {
-                "description": "an object is not a boolean",
-                "data": {},
-                "valid": false
-            },
-            {
-                "description": "an array is not a boolean",
-                "data": [],
-                "valid": false
-            },
-            {
-                "description": "true is a boolean",
-                "data": true,
-                "valid": true
-            },
-            {
-                "description": "false is a boolean",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "null is not a boolean",
-                "data": null,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "null type matches only the null object",
-        "schema": {"type": "null"},
-        "tests": [
-            {
-                "description": "an integer is not null",
-                "data": 1,
-                "valid": false
-            },
-            {
-                "description": "a float is not null",
-                "data": 1.1,
-                "valid": false
-            },
-            {
-                "description": "zero is not null",
-                "data": 0,
-                "valid": false
-            },
-            {
-                "description": "a string is not null",
-                "data": "foo",
-                "valid": false
-            },
-            {
-                "description": "an empty string is not null",
-                "data": "",
-                "valid": false
-            },
-            {
-                "description": "an object is not null",
-                "data": {},
-                "valid": false
-            },
-            {
-                "description": "an array is not null",
-                "data": [],
-                "valid": false
-            },
-            {
-                "description": "true is not null",
-                "data": true,
-                "valid": false
-            },
-            {
-                "description": "false is not null",
-                "data": false,
-                "valid": false
-            },
-            {
-                "description": "null is null",
-                "data": null,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "multiple types can be specified in an array",
-        "schema": {"type": ["integer", "string"]},
-        "tests": [
-            {
-                "description": "an integer is valid",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "a string is valid",
-                "data": "foo",
-                "valid": true
-            },
-            {
-                "description": "a float is invalid",
-                "data": 1.1,
-                "valid": false
-            },
-            {
-                "description": "an object is invalid",
-                "data": {},
-                "valid": false
-            },
-            {
-                "description": "an array is invalid",
-                "data": [],
-                "valid": false
-            },
-            {
-                "description": "a boolean is invalid",
-                "data": true,
-                "valid": false
-            },
-            {
-                "description": "null is invalid",
-                "data": null,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "type as array with one item",
-        "schema": {
-            "type": ["string"]
-        },
-        "tests": [
-            {
-                "description": "string is valid",
-                "data": "foo",
-                "valid": true
-            },
-            {
-                "description": "number is invalid",
-                "data": 123,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "type: array or object",
-        "schema": {
-            "type": ["array", "object"]
-        },
-        "tests": [
-            {
-                "description": "array is valid",
-                "data": [1,2,3],
-                "valid": true
-            },
-            {
-                "description": "object is valid",
-                "data": {"foo": 123},
-                "valid": true
-            },
-            {
-                "description": "number is invalid",
-                "data": 123,
-                "valid": false
-            },
-            {
-                "description": "string is invalid",
-                "data": "foo",
-                "valid": false
-            },
-            {
-                "description": "null is invalid",
-                "data": null,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "type: array, object or null",
-        "schema": {
-            "type": ["array", "object", "null"]
-        },
-        "tests": [
-            {
-                "description": "array is valid",
-                "data": [1,2,3],
-                "valid": true
-            },
-            {
-                "description": "object is valid",
-                "data": {"foo": 123},
-                "valid": true
-            },
-            {
-                "description": "null is valid",
-                "data": null,
-                "valid": true
-            },
-            {
-                "description": "number is invalid",
-                "data": 123,
-                "valid": false
-            },
-            {
-                "description": "string is invalid",
-                "data": "foo",
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft6/uniqueItems.json b/json/tests/draft6/uniqueItems.json
deleted file mode 100644
index 2ccf666..0000000
--- a/json/tests/draft6/uniqueItems.json
+++ /dev/null
@@ -1,404 +0,0 @@
-[
-    {
-        "description": "uniqueItems validation",
-        "schema": {"uniqueItems": true},
-        "tests": [
-            {
-                "description": "unique array of integers is valid",
-                "data": [1, 2],
-                "valid": true
-            },
-            {
-                "description": "non-unique array of integers is invalid",
-                "data": [1, 1],
-                "valid": false
-            },
-            {
-                "description": "non-unique array of more than two integers is invalid",
-                "data": [1, 2, 1],
-                "valid": false
-            },
-            {
-                "description": "numbers are unique if mathematically unequal",
-                "data": [1.0, 1.00, 1],
-                "valid": false
-            },
-            {
-                "description": "false is not equal to zero",
-                "data": [0, false],
-                "valid": true
-            },
-            {
-                "description": "true is not equal to one",
-                "data": [1, true],
-                "valid": true
-            },
-            {
-                "description": "unique array of strings is valid",
-                "data": ["foo", "bar", "baz"],
-                "valid": true
-            },
-            {
-                "description": "non-unique array of strings is invalid",
-                "data": ["foo", "bar", "foo"],
-                "valid": false
-            },
-            {
-                "description": "unique array of objects is valid",
-                "data": [{"foo": "bar"}, {"foo": "baz"}],
-                "valid": true
-            },
-            {
-                "description": "non-unique array of objects is invalid",
-                "data": [{"foo": "bar"}, {"foo": "bar"}],
-                "valid": false
-            },
-            {
-                "description": "unique array of nested objects is valid",
-                "data": [
-                    {"foo": {"bar" : {"baz" : true}}},
-                    {"foo": {"bar" : {"baz" : false}}}
-                ],
-                "valid": true
-            },
-            {
-                "description": "non-unique array of nested objects is invalid",
-                "data": [
-                    {"foo": {"bar" : {"baz" : true}}},
-                    {"foo": {"bar" : {"baz" : true}}}
-                ],
-                "valid": false
-            },
-            {
-                "description": "unique array of arrays is valid",
-                "data": [["foo"], ["bar"]],
-                "valid": true
-            },
-            {
-                "description": "non-unique array of arrays is invalid",
-                "data": [["foo"], ["foo"]],
-                "valid": false
-            },
-            {
-                "description": "non-unique array of more than two arrays is invalid",
-                "data": [["foo"], ["bar"], ["foo"]],
-                "valid": false
-            },
-            {
-                "description": "1 and true are unique",
-                "data": [1, true],
-                "valid": true
-            },
-            {
-                "description": "0 and false are unique",
-                "data": [0, false],
-                "valid": true
-            },
-            {
-                "description": "[1] and [true] are unique",
-                "data": [[1], [true]],
-                "valid": true
-            },
-            {
-                "description": "[0] and [false] are unique",
-                "data": [[0], [false]],
-                "valid": true
-            },
-            {
-                "description": "nested [1] and [true] are unique",
-                "data": [[[1], "foo"], [[true], "foo"]],
-                "valid": true
-            },
-            {
-                "description": "nested [0] and [false] are unique",
-                "data": [[[0], "foo"], [[false], "foo"]],
-                "valid": true
-            },
-            {
-                "description": "unique heterogeneous types are valid",
-                "data": [{}, [1], true, null, 1, "{}"],
-                "valid": true
-            },
-            {
-                "description": "non-unique heterogeneous types are invalid",
-                "data": [{}, [1], true, null, {}, 1],
-                "valid": false
-            },
-            {
-                "description": "different objects are unique",
-                "data": [{"a": 1, "b": 2}, {"a": 2, "b": 1}],
-                "valid": true
-            },
-            {
-                "description": "objects are non-unique despite key order",
-                "data": [{"a": 1, "b": 2}, {"b": 2, "a": 1}],
-                "valid": false
-            },
-            {
-                "description": "{\"a\": false} and {\"a\": 0} are unique",
-                "data": [{"a": false}, {"a": 0}],
-                "valid": true
-            },
-            {
-                "description": "{\"a\": true} and {\"a\": 1} are unique",
-                "data": [{"a": true}, {"a": 1}],
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "uniqueItems with an array of items",
-        "schema": {
-            "items": [{"type": "boolean"}, {"type": "boolean"}],
-            "uniqueItems": true
-        },
-        "tests": [
-            {
-                "description": "[false, true] from items array is valid",
-                "data": [false, true],
-                "valid": true
-            },
-            {
-                "description": "[true, false] from items array is valid",
-                "data": [true, false],
-                "valid": true
-            },
-            {
-                "description": "[false, false] from items array is not valid",
-                "data": [false, false],
-                "valid": false
-            },
-            {
-                "description": "[true, true] from items array is not valid",
-                "data": [true, true],
-                "valid": false
-            },
-            {
-                "description": "unique array extended from [false, true] is valid",
-                "data": [false, true, "foo", "bar"],
-                "valid": true
-            },
-            {
-                "description": "unique array extended from [true, false] is valid",
-                "data": [true, false, "foo", "bar"],
-                "valid": true
-            },
-            {
-                "description": "non-unique array extended from [false, true] is not valid",
-                "data": [false, true, "foo", "foo"],
-                "valid": false
-            },
-            {
-                "description": "non-unique array extended from [true, false] is not valid",
-                "data": [true, false, "foo", "foo"],
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "uniqueItems with an array of items and additionalItems=false",
-        "schema": {
-            "items": [{"type": "boolean"}, {"type": "boolean"}],
-            "uniqueItems": true,
-            "additionalItems": false
-        },
-        "tests": [
-            {
-                "description": "[false, true] from items array is valid",
-                "data": [false, true],
-                "valid": true
-            },
-            {
-                "description": "[true, false] from items array is valid",
-                "data": [true, false],
-                "valid": true
-            },
-            {
-                "description": "[false, false] from items array is not valid",
-                "data": [false, false],
-                "valid": false
-            },
-            {
-                "description": "[true, true] from items array is not valid",
-                "data": [true, true],
-                "valid": false
-            },
-            {
-                "description": "extra items are invalid even if unique",
-                "data": [false, true, null],
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "uniqueItems=false validation",
-        "schema": { "uniqueItems": false },
-        "tests": [
-            {
-                "description": "unique array of integers is valid",
-                "data": [1, 2],
-                "valid": true
-            },
-            {
-                "description": "non-unique array of integers is valid",
-                "data": [1, 1],
-                "valid": true
-            },
-            {
-                "description": "numbers are unique if mathematically unequal",
-                "data": [1.0, 1.00, 1],
-                "valid": true
-            },
-            {
-                "description": "false is not equal to zero",
-                "data": [0, false],
-                "valid": true
-            },
-            {
-                "description": "true is not equal to one",
-                "data": [1, true],
-                "valid": true
-            },
-            {
-                "description": "unique array of objects is valid",
-                "data": [{"foo": "bar"}, {"foo": "baz"}],
-                "valid": true
-            },
-            {
-                "description": "non-unique array of objects is valid",
-                "data": [{"foo": "bar"}, {"foo": "bar"}],
-                "valid": true
-            },
-            {
-                "description": "unique array of nested objects is valid",
-                "data": [
-                    {"foo": {"bar" : {"baz" : true}}},
-                    {"foo": {"bar" : {"baz" : false}}}
-                ],
-                "valid": true
-            },
-            {
-                "description": "non-unique array of nested objects is valid",
-                "data": [
-                    {"foo": {"bar" : {"baz" : true}}},
-                    {"foo": {"bar" : {"baz" : true}}}
-                ],
-                "valid": true
-            },
-            {
-                "description": "unique array of arrays is valid",
-                "data": [["foo"], ["bar"]],
-                "valid": true
-            },
-            {
-                "description": "non-unique array of arrays is valid",
-                "data": [["foo"], ["foo"]],
-                "valid": true
-            },
-            {
-                "description": "1 and true are unique",
-                "data": [1, true],
-                "valid": true
-            },
-            {
-                "description": "0 and false are unique",
-                "data": [0, false],
-                "valid": true
-            },
-            {
-                "description": "unique heterogeneous types are valid",
-                "data": [{}, [1], true, null, 1],
-                "valid": true
-            },
-            {
-                "description": "non-unique heterogeneous types are valid",
-                "data": [{}, [1], true, null, {}, 1],
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "uniqueItems=false with an array of items",
-        "schema": {
-            "items": [{"type": "boolean"}, {"type": "boolean"}],
-            "uniqueItems": false
-        },
-        "tests": [
-            {
-                "description": "[false, true] from items array is valid",
-                "data": [false, true],
-                "valid": true
-            },
-            {
-                "description": "[true, false] from items array is valid",
-                "data": [true, false],
-                "valid": true
-            },
-            {
-                "description": "[false, false] from items array is valid",
-                "data": [false, false],
-                "valid": true
-            },
-            {
-                "description": "[true, true] from items array is valid",
-                "data": [true, true],
-                "valid": true
-            },
-            {
-                "description": "unique array extended from [false, true] is valid",
-                "data": [false, true, "foo", "bar"],
-                "valid": true
-            },
-            {
-                "description": "unique array extended from [true, false] is valid",
-                "data": [true, false, "foo", "bar"],
-                "valid": true
-            },
-            {
-                "description": "non-unique array extended from [false, true] is valid",
-                "data": [false, true, "foo", "foo"],
-                "valid": true
-            },
-            {
-                "description": "non-unique array extended from [true, false] is valid",
-                "data": [true, false, "foo", "foo"],
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "uniqueItems=false with an array of items and additionalItems=false",
-        "schema": {
-            "items": [{"type": "boolean"}, {"type": "boolean"}],
-            "uniqueItems": false,
-            "additionalItems": false
-        },
-        "tests": [
-            {
-                "description": "[false, true] from items array is valid",
-                "data": [false, true],
-                "valid": true
-            },
-            {
-                "description": "[true, false] from items array is valid",
-                "data": [true, false],
-                "valid": true
-            },
-            {
-                "description": "[false, false] from items array is valid",
-                "data": [false, false],
-                "valid": true
-            },
-            {
-                "description": "[true, true] from items array is valid",
-                "data": [true, true],
-                "valid": true
-            },
-            {
-                "description": "extra items are invalid even if unique",
-                "data": [false, true, null],
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft6/unknownKeyword.json b/json/tests/draft6/unknownKeyword.json
deleted file mode 100644
index 1f58d97..0000000
--- a/json/tests/draft6/unknownKeyword.json
+++ /dev/null
@@ -1,56 +0,0 @@
-[
-    {
-        "description": "$id inside an unknown keyword is not a real identifier",
-        "comment": "the implementation must not be confused by an $id in locations we do not know how to parse",
-        "schema": {
-            "definitions": {
-                "id_in_unknown0": {
-                    "not": {
-                        "array_of_schemas": [
-                            {
-                              "$id": "https://localhost:1234/unknownKeyword/my_identifier.json",
-                              "type": "null"
-                            }
-                        ]
-                    }
-                },
-                "real_id_in_schema": {
-                    "$id": "https://localhost:1234/unknownKeyword/my_identifier.json",
-                    "type": "string"
-                },
-                "id_in_unknown1": {
-                    "not": {
-                        "object_of_schemas": {
-                            "foo": {
-                              "$id": "https://localhost:1234/unknownKeyword/my_identifier.json",
-                              "type": "integer"
-                            }
-                        }
-                    }
-                }
-            },
-            "anyOf": [
-                { "$ref": "#/definitions/id_in_unknown0" },
-                { "$ref": "#/definitions/id_in_unknown1" },
-                { "$ref": "https://localhost:1234/unknownKeyword/my_identifier.json" }
-            ]
-        },
-        "tests": [
-            {
-                "description": "type matches second anyOf, which has a real schema in it",
-                "data": "a string",
-                "valid": true
-            },
-            {
-                "description": "type matches non-schema in first anyOf",
-                "data": null,
-                "valid": false
-            },
-            {
-                "description": "type matches non-schema in third anyOf",
-                "data": 1,
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft7/additionalItems.json b/json/tests/draft7/additionalItems.json
deleted file mode 100644
index deb44fd..0000000
--- a/json/tests/draft7/additionalItems.json
+++ /dev/null
@@ -1,164 +0,0 @@
-[
-    {
-        "description": "additionalItems as schema",
-        "schema": {
-            "items": [{}],
-            "additionalItems": {"type": "integer"}
-        },
-        "tests": [
-            {
-                "description": "additional items match schema",
-                "data": [ null, 2, 3, 4 ],
-                "valid": true
-            },
-            {
-                "description": "additional items do not match schema",
-                "data": [ null, 2, 3, "foo" ],
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "when items is schema, additionalItems does nothing",
-        "schema": {
-            "items": {},
-            "additionalItems": false
-        },
-        "tests": [
-            {
-                "description": "all items match schema",
-                "data": [ 1, 2, 3, 4, 5 ],
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "array of items with no additionalItems permitted",
-        "schema": {
-            "items": [{}, {}, {}],
-            "additionalItems": false
-        },
-        "tests": [
-            {
-                "description": "empty array",
-                "data": [ ],
-                "valid": true
-            },
-            {
-                "description": "fewer number of items present (1)",
-                "data": [ 1 ],
-                "valid": true
-            },
-            {
-                "description": "fewer number of items present (2)",
-                "data": [ 1, 2 ],
-                "valid": true
-            },
-            {
-                "description": "equal number of items present",
-                "data": [ 1, 2, 3 ],
-                "valid": true
-            },
-            {
-                "description": "additional items are not permitted",
-                "data": [ 1, 2, 3, 4 ],
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "additionalItems as false without items",
-        "schema": {"additionalItems": false},
-        "tests": [
-            {
-                "description":
-                    "items defaults to empty schema so everything is valid",
-                "data": [ 1, 2, 3, 4, 5 ],
-                "valid": true
-            },
-            {
-                "description": "ignores non-arrays",
-                "data": {"foo" : "bar"},
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "additionalItems are allowed by default",
-        "schema": {"items": [{"type": "integer"}]},
-        "tests": [
-            {
-                "description": "only the first item is validated",
-                "data": [1, "foo", false],
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "additionalItems does not look in applicators, valid case",
-        "schema": {
-            "allOf": [
-                { "items": [ { "type": "integer" } ] }
-            ],
-            "additionalItems": { "type": "boolean" }
-        },
-        "tests": [
-            {
-                "description": "items defined in allOf are not examined",
-                "data": [ 1, null ],
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "additionalItems does not look in applicators, invalid case",
-        "schema": {
-            "allOf": [
-                { "items": [ { "type": "integer" }, { "type": "string" } ] }
-            ],
-            "items": [ {"type": "integer" } ],
-            "additionalItems": { "type": "boolean" }
-        },
-        "tests": [
-            {
-                "description": "items defined in allOf are not examined",
-                "data": [ 1, "hello" ],
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "items validation adjusts the starting index for additionalItems",
-        "schema": {
-            "items": [ { "type": "string" } ],
-            "additionalItems": { "type": "integer" }
-        },
-        "tests": [
-            {
-                "description": "valid items",
-                "data": [ "x", 2, 3 ],
-                "valid": true
-            },
-            {
-                "description": "wrong type of second item",
-                "data": [ "x", "y" ],
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "additionalItems with null instance elements",
-        "schema": {
-            "additionalItems": {
-                "type": "null"
-            }
-        },
-        "tests": [
-            {
-                "description": "allows null elements",
-                "data": [ null ],
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft7/additionalProperties.json b/json/tests/draft7/additionalProperties.json
deleted file mode 100644
index 0f8e162..0000000
--- a/json/tests/draft7/additionalProperties.json
+++ /dev/null
@@ -1,147 +0,0 @@
-[
-    {
-        "description":
-            "additionalProperties being false does not allow other properties",
-        "schema": {
-            "properties": {"foo": {}, "bar": {}},
-            "patternProperties": { "^v": {} },
-            "additionalProperties": false
-        },
-        "tests": [
-            {
-                "description": "no additional properties is valid",
-                "data": {"foo": 1},
-                "valid": true
-            },
-            {
-                "description": "an additional property is invalid",
-                "data": {"foo" : 1, "bar" : 2, "quux" : "boom"},
-                "valid": false
-            },
-            {
-                "description": "ignores arrays",
-                "data": [1, 2, 3],
-                "valid": true
-            },
-            {
-                "description": "ignores strings",
-                "data": "foobarbaz",
-                "valid": true
-            },
-            {
-                "description": "ignores other non-objects",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "patternProperties are not additional properties",
-                "data": {"foo":1, "vroom": 2},
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "non-ASCII pattern with additionalProperties",
-        "schema": {
-            "patternProperties": {"^á": {}},
-            "additionalProperties": false
-        },
-        "tests": [
-            {
-                "description": "matching the pattern is valid",
-                "data": {"ármányos": 2},
-                "valid": true
-            },
-            {
-                "description": "not matching the pattern is invalid",
-                "data": {"élmény": 2},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "additionalProperties with schema",
-        "schema": {
-            "properties": {"foo": {}, "bar": {}},
-            "additionalProperties": {"type": "boolean"}
-        },
-        "tests": [
-            {
-                "description": "no additional properties is valid",
-                "data": {"foo": 1},
-                "valid": true
-            },
-            {
-                "description": "an additional valid property is valid",
-                "data": {"foo" : 1, "bar" : 2, "quux" : true},
-                "valid": true
-            },
-            {
-                "description": "an additional invalid property is invalid",
-                "data": {"foo" : 1, "bar" : 2, "quux" : 12},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description":
-            "additionalProperties can exist by itself",
-        "schema": {
-            "additionalProperties": {"type": "boolean"}
-        },
-        "tests": [
-            {
-                "description": "an additional valid property is valid",
-                "data": {"foo" : true},
-                "valid": true
-            },
-            {
-                "description": "an additional invalid property is invalid",
-                "data": {"foo" : 1},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "additionalProperties are allowed by default",
-        "schema": {"properties": {"foo": {}, "bar": {}}},
-        "tests": [
-            {
-                "description": "additional properties are allowed",
-                "data": {"foo": 1, "bar": 2, "quux": true},
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "additionalProperties does not look in applicators",
-        "schema": {
-            "allOf": [
-                {"properties": {"foo": {}}}
-            ],
-            "additionalProperties": {"type": "boolean"}
-        },
-        "tests": [
-            {
-                "description": "properties defined in allOf are not examined",
-                "data": {"foo": 1, "bar": true},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "additionalProperties with null valued instance properties",
-        "schema": {
-            "additionalProperties": {
-                "type": "null"
-            }
-        },
-        "tests": [
-            {
-                "description": "allows null values",
-                "data": {"foo": null},
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft7/allOf.json b/json/tests/draft7/allOf.json
deleted file mode 100644
index ec9319e..0000000
--- a/json/tests/draft7/allOf.json
+++ /dev/null
@@ -1,294 +0,0 @@
-[
-    {
-        "description": "allOf",
-        "schema": {
-            "allOf": [
-                {
-                    "properties": {
-                        "bar": {"type": "integer"}
-                    },
-                    "required": ["bar"]
-                },
-                {
-                    "properties": {
-                        "foo": {"type": "string"}
-                    },
-                    "required": ["foo"]
-                }
-            ]
-        },
-        "tests": [
-            {
-                "description": "allOf",
-                "data": {"foo": "baz", "bar": 2},
-                "valid": true
-            },
-            {
-                "description": "mismatch second",
-                "data": {"foo": "baz"},
-                "valid": false
-            },
-            {
-                "description": "mismatch first",
-                "data": {"bar": 2},
-                "valid": false
-            },
-            {
-                "description": "wrong type",
-                "data": {"foo": "baz", "bar": "quux"},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "allOf with base schema",
-        "schema": {
-            "properties": {"bar": {"type": "integer"}},
-            "required": ["bar"],
-            "allOf" : [
-                {
-                    "properties": {
-                        "foo": {"type": "string"}
-                    },
-                    "required": ["foo"]
-                },
-                {
-                    "properties": {
-                        "baz": {"type": "null"}
-                    },
-                    "required": ["baz"]
-                }
-            ]
-        },
-        "tests": [
-            {
-                "description": "valid",
-                "data": {"foo": "quux", "bar": 2, "baz": null},
-                "valid": true
-            },
-            {
-                "description": "mismatch base schema",
-                "data": {"foo": "quux", "baz": null},
-                "valid": false
-            },
-            {
-                "description": "mismatch first allOf",
-                "data": {"bar": 2, "baz": null},
-                "valid": false
-            },
-            {
-                "description": "mismatch second allOf",
-                "data": {"foo": "quux", "bar": 2},
-                "valid": false
-            },
-            {
-                "description": "mismatch both",
-                "data": {"bar": 2},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "allOf simple types",
-        "schema": {
-            "allOf": [
-                {"maximum": 30},
-                {"minimum": 20}
-            ]
-        },
-        "tests": [
-            {
-                "description": "valid",
-                "data": 25,
-                "valid": true
-            },
-            {
-                "description": "mismatch one",
-                "data": 35,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "allOf with boolean schemas, all true",
-        "schema": {"allOf": [true, true]},
-        "tests": [
-            {
-                "description": "any value is valid",
-                "data": "foo",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "allOf with boolean schemas, some false",
-        "schema": {"allOf": [true, false]},
-        "tests": [
-            {
-                "description": "any value is invalid",
-                "data": "foo",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "allOf with boolean schemas, all false",
-        "schema": {"allOf": [false, false]},
-        "tests": [
-            {
-                "description": "any value is invalid",
-                "data": "foo",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "allOf with one empty schema",
-        "schema": {
-            "allOf": [
-                {}
-            ]
-        },
-        "tests": [
-            {
-                "description": "any data is valid",
-                "data": 1,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "allOf with two empty schemas",
-        "schema": {
-            "allOf": [
-                {},
-                {}
-            ]
-        },
-        "tests": [
-            {
-                "description": "any data is valid",
-                "data": 1,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "allOf with the first empty schema",
-        "schema": {
-            "allOf": [
-                {},
-                { "type": "number" }
-            ]
-        },
-        "tests": [
-            {
-                "description": "number is valid",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "string is invalid",
-                "data": "foo",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "allOf with the last empty schema",
-        "schema": {
-            "allOf": [
-                { "type": "number" },
-                {}
-            ]
-        },
-        "tests": [
-            {
-                "description": "number is valid",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "string is invalid",
-                "data": "foo",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "nested allOf, to check validation semantics",
-        "schema": {
-            "allOf": [
-                {
-                    "allOf": [
-                        {
-                            "type": "null"
-                        }
-                    ]
-                }
-            ]
-        },
-        "tests": [
-            {
-                "description": "null is valid",
-                "data": null,
-                "valid": true
-            },
-            {
-                "description": "anything non-null is invalid",
-                "data": 123,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "allOf combined with anyOf, oneOf",
-        "schema": {
-            "allOf": [ { "multipleOf": 2 } ],
-            "anyOf": [ { "multipleOf": 3 } ],
-            "oneOf": [ { "multipleOf": 5 } ]
-        },
-        "tests": [
-            {
-                "description": "allOf: false, anyOf: false, oneOf: false",
-                "data": 1,
-                "valid": false
-            },
-            {
-                "description": "allOf: false, anyOf: false, oneOf: true",
-                "data": 5,
-                "valid": false
-            },
-            {
-                "description": "allOf: false, anyOf: true, oneOf: false",
-                "data": 3,
-                "valid": false
-            },
-            {
-                "description": "allOf: false, anyOf: true, oneOf: true",
-                "data": 15,
-                "valid": false
-            },
-            {
-                "description": "allOf: true, anyOf: false, oneOf: false",
-                "data": 2,
-                "valid": false
-            },
-            {
-                "description": "allOf: true, anyOf: false, oneOf: true",
-                "data": 10,
-                "valid": false
-            },
-            {
-                "description": "allOf: true, anyOf: true, oneOf: false",
-                "data": 6,
-                "valid": false
-            },
-            {
-                "description": "allOf: true, anyOf: true, oneOf: true",
-                "data": 30,
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft7/anyOf.json b/json/tests/draft7/anyOf.json
deleted file mode 100644
index ab5eb38..0000000
--- a/json/tests/draft7/anyOf.json
+++ /dev/null
@@ -1,189 +0,0 @@
-[
-    {
-        "description": "anyOf",
-        "schema": {
-            "anyOf": [
-                {
-                    "type": "integer"
-                },
-                {
-                    "minimum": 2
-                }
-            ]
-        },
-        "tests": [
-            {
-                "description": "first anyOf valid",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "second anyOf valid",
-                "data": 2.5,
-                "valid": true
-            },
-            {
-                "description": "both anyOf valid",
-                "data": 3,
-                "valid": true
-            },
-            {
-                "description": "neither anyOf valid",
-                "data": 1.5,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "anyOf with base schema",
-        "schema": {
-            "type": "string",
-            "anyOf" : [
-                {
-                    "maxLength": 2
-                },
-                {
-                    "minLength": 4
-                }
-            ]
-        },
-        "tests": [
-            {
-                "description": "mismatch base schema",
-                "data": 3,
-                "valid": false
-            },
-            {
-                "description": "one anyOf valid",
-                "data": "foobar",
-                "valid": true
-            },
-            {
-                "description": "both anyOf invalid",
-                "data": "foo",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "anyOf with boolean schemas, all true",
-        "schema": {"anyOf": [true, true]},
-        "tests": [
-            {
-                "description": "any value is valid",
-                "data": "foo",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "anyOf with boolean schemas, some true",
-        "schema": {"anyOf": [true, false]},
-        "tests": [
-            {
-                "description": "any value is valid",
-                "data": "foo",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "anyOf with boolean schemas, all false",
-        "schema": {"anyOf": [false, false]},
-        "tests": [
-            {
-                "description": "any value is invalid",
-                "data": "foo",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "anyOf complex types",
-        "schema": {
-            "anyOf": [
-                {
-                    "properties": {
-                        "bar": {"type": "integer"}
-                    },
-                    "required": ["bar"]
-                },
-                {
-                    "properties": {
-                        "foo": {"type": "string"}
-                    },
-                    "required": ["foo"]
-                }
-            ]
-        },
-        "tests": [
-            {
-                "description": "first anyOf valid (complex)",
-                "data": {"bar": 2},
-                "valid": true
-            },
-            {
-                "description": "second anyOf valid (complex)",
-                "data": {"foo": "baz"},
-                "valid": true
-            },
-            {
-                "description": "both anyOf valid (complex)",
-                "data": {"foo": "baz", "bar": 2},
-                "valid": true
-            },
-            {
-                "description": "neither anyOf valid (complex)",
-                "data": {"foo": 2, "bar": "quux"},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "anyOf with one empty schema",
-        "schema": {
-            "anyOf": [
-                { "type": "number" },
-                {}
-            ]
-        },
-        "tests": [
-            {
-                "description": "string is valid",
-                "data": "foo",
-                "valid": true
-            },
-            {
-                "description": "number is valid",
-                "data": 123,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "nested anyOf, to check validation semantics",
-        "schema": {
-            "anyOf": [
-                {
-                    "anyOf": [
-                        {
-                            "type": "null"
-                        }
-                    ]
-                }
-            ]
-        },
-        "tests": [
-            {
-                "description": "null is valid",
-                "data": null,
-                "valid": true
-            },
-            {
-                "description": "anything non-null is invalid",
-                "data": 123,
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft7/boolean_schema.json b/json/tests/draft7/boolean_schema.json
deleted file mode 100644
index 6d40f23..0000000
--- a/json/tests/draft7/boolean_schema.json
+++ /dev/null
@@ -1,104 +0,0 @@
-[
-    {
-        "description": "boolean schema 'true'",
-        "schema": true,
-        "tests": [
-            {
-                "description": "number is valid",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "string is valid",
-                "data": "foo",
-                "valid": true
-            },
-            {
-                "description": "boolean true is valid",
-                "data": true,
-                "valid": true
-            },
-            {
-                "description": "boolean false is valid",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "null is valid",
-                "data": null,
-                "valid": true
-            },
-            {
-                "description": "object is valid",
-                "data": {"foo": "bar"},
-                "valid": true
-            },
-            {
-                "description": "empty object is valid",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "array is valid",
-                "data": ["foo"],
-                "valid": true
-            },
-            {
-                "description": "empty array is valid",
-                "data": [],
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "boolean schema 'false'",
-        "schema": false,
-        "tests": [
-            {
-                "description": "number is invalid",
-                "data": 1,
-                "valid": false
-            },
-            {
-                "description": "string is invalid",
-                "data": "foo",
-                "valid": false
-            },
-            {
-                "description": "boolean true is invalid",
-                "data": true,
-                "valid": false
-            },
-            {
-                "description": "boolean false is invalid",
-                "data": false,
-                "valid": false
-            },
-            {
-                "description": "null is invalid",
-                "data": null,
-                "valid": false
-            },
-            {
-                "description": "object is invalid",
-                "data": {"foo": "bar"},
-                "valid": false
-            },
-            {
-                "description": "empty object is invalid",
-                "data": {},
-                "valid": false
-            },
-            {
-                "description": "array is invalid",
-                "data": ["foo"],
-                "valid": false
-            },
-            {
-                "description": "empty array is invalid",
-                "data": [],
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft7/const.json b/json/tests/draft7/const.json
deleted file mode 100644
index 1c2cafc..0000000
--- a/json/tests/draft7/const.json
+++ /dev/null
@@ -1,342 +0,0 @@
-[
-    {
-        "description": "const validation",
-        "schema": {"const": 2},
-        "tests": [
-            {
-                "description": "same value is valid",
-                "data": 2,
-                "valid": true
-            },
-            {
-                "description": "another value is invalid",
-                "data": 5,
-                "valid": false
-            },
-            {
-                "description": "another type is invalid",
-                "data": "a",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "const with object",
-        "schema": {"const": {"foo": "bar", "baz": "bax"}},
-        "tests": [
-            {
-                "description": "same object is valid",
-                "data": {"foo": "bar", "baz": "bax"},
-                "valid": true
-            },
-            {
-                "description": "same object with different property order is valid",
-                "data": {"baz": "bax", "foo": "bar"},
-                "valid": true
-            },
-            {
-                "description": "another object is invalid",
-                "data": {"foo": "bar"},
-                "valid": false
-            },
-            {
-                "description": "another type is invalid",
-                "data": [1, 2],
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "const with array",
-        "schema": {"const": [{ "foo": "bar" }]},
-        "tests": [
-            {
-                "description": "same array is valid",
-                "data": [{"foo": "bar"}],
-                "valid": true
-            },
-            {
-                "description": "another array item is invalid",
-                "data": [2],
-                "valid": false
-            },
-            {
-                "description": "array with additional items is invalid",
-                "data": [1, 2, 3],
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "const with null",
-        "schema": {"const": null},
-        "tests": [
-            {
-                "description": "null is valid",
-                "data": null,
-                "valid": true
-            },
-            {
-                "description": "not null is invalid",
-                "data": 0,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "const with false does not match 0",
-        "schema": {"const": false},
-        "tests": [
-            {
-                "description": "false is valid",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "integer zero is invalid",
-                "data": 0,
-                "valid": false
-            },
-            {
-                "description": "float zero is invalid",
-                "data": 0.0,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "const with true does not match 1",
-        "schema": {"const": true},
-        "tests": [
-            {
-                "description": "true is valid",
-                "data": true,
-                "valid": true
-            },
-            {
-                "description": "integer one is invalid",
-                "data": 1,
-                "valid": false
-            },
-            {
-                "description": "float one is invalid",
-                "data": 1.0,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "const with [false] does not match [0]",
-        "schema": {"const": [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": "const with [true] does not match [1]",
-        "schema": {"const": [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": "const with {\"a\": false} does not match {\"a\": 0}",
-        "schema": {"const": {"a": false}},
-        "tests": [
-            {
-                "description": "{\"a\": false} is valid",
-                "data": {"a": false},
-                "valid": true
-            },
-            {
-                "description": "{\"a\": 0} is invalid",
-                "data": {"a": 0},
-                "valid": false
-            },
-            {
-                "description": "{\"a\": 0.0} is invalid",
-                "data": {"a": 0.0},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "const with {\"a\": true} does not match {\"a\": 1}",
-        "schema": {"const": {"a": true}},
-        "tests": [
-            {
-                "description": "{\"a\": true} is valid",
-                "data": {"a": true},
-                "valid": true
-            },
-            {
-                "description": "{\"a\": 1} is invalid",
-                "data": {"a": 1},
-                "valid": false
-            },
-            {
-                "description": "{\"a\": 1.0} is invalid",
-                "data": {"a": 1.0},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "const with 0 does not match other zero-like types",
-        "schema": {"const": 0},
-        "tests": [
-            {
-                "description": "false is invalid",
-                "data": false,
-                "valid": false
-            },
-            {
-                "description": "integer zero is valid",
-                "data": 0,
-                "valid": true
-            },
-            {
-                "description": "float zero is valid",
-                "data": 0.0,
-                "valid": true
-            },
-            {
-                "description": "empty object is invalid",
-                "data": {},
-                "valid": false
-            },
-            {
-                "description": "empty array is invalid",
-                "data": [],
-                "valid": false
-            },
-            {
-                "description": "empty string is invalid",
-                "data": "",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "const with 1 does not match true",
-        "schema": {"const": 1},
-        "tests": [
-            {
-                "description": "true is invalid",
-                "data": true,
-                "valid": false
-            },
-            {
-                "description": "integer one is valid",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "float one is valid",
-                "data": 1.0,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "const with -2.0 matches integer and float types",
-        "schema": {"const": -2.0},
-        "tests": [
-            {
-                "description": "integer -2 is valid",
-                "data": -2,
-                "valid": true
-            },
-            {
-                "description": "integer 2 is invalid",
-                "data": 2,
-                "valid": false
-            },
-            {
-                "description": "float -2.0 is valid",
-                "data": -2.0,
-                "valid": true
-            },
-            {
-                "description": "float 2.0 is invalid",
-                "data": 2.0,
-                "valid": false
-            },
-            {
-                "description": "float -2.00001 is invalid",
-                "data": -2.00001,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "float and integers are equal up to 64-bit representation limits",
-        "schema": {"const": 9007199254740992},
-        "tests": [
-            {
-                "description": "integer is valid",
-                "data": 9007199254740992,
-                "valid": true
-            },
-            {
-                "description": "integer minus one is invalid",
-                "data": 9007199254740991,
-                "valid": false
-            },
-            {
-                "description": "float is valid",
-                "data": 9007199254740992.0,
-                "valid": true
-            },
-            {
-                "description": "float minus one is invalid",
-                "data": 9007199254740991.0,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "nul characters in strings",
-        "schema": { "const": "hello\u0000there" },
-        "tests": [
-            {
-                "description": "match string with nul",
-                "data": "hello\u0000there",
-                "valid": true
-            },
-            {
-                "description": "do not match string lacking nul",
-                "data": "hellothere",
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft7/contains.json b/json/tests/draft7/contains.json
deleted file mode 100644
index 2b1a515..0000000
--- a/json/tests/draft7/contains.json
+++ /dev/null
@@ -1,165 +0,0 @@
-[
-    {
-        "description": "contains keyword validation",
-        "schema": {
-            "contains": {"minimum": 5}
-        },
-        "tests": [
-            {
-                "description": "array with item matching schema (5) is valid",
-                "data": [3, 4, 5],
-                "valid": true
-            },
-            {
-                "description": "array with item matching schema (6) is valid",
-                "data": [3, 4, 6],
-                "valid": true
-            },
-            {
-                "description": "array with two items matching schema (5, 6) is valid",
-                "data": [3, 4, 5, 6],
-                "valid": true
-            },
-            {
-                "description": "array without items matching schema is invalid",
-                "data": [2, 3, 4],
-                "valid": false
-            },
-            {
-                "description": "empty array is invalid",
-                "data": [],
-                "valid": false
-            },
-            {
-                "description": "not array is valid",
-                "data": {},
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "contains keyword with const keyword",
-        "schema": {
-            "contains": { "const": 5 }
-        },
-        "tests": [
-            {
-                "description": "array with item 5 is valid",
-                "data": [3, 4, 5],
-                "valid": true
-            },
-            {
-                "description": "array with two items 5 is valid",
-                "data": [3, 4, 5, 5],
-                "valid": true
-            },
-            {
-                "description": "array without item 5 is invalid",
-                "data": [1, 2, 3, 4],
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "contains keyword with boolean schema true",
-        "schema": {"contains": true},
-        "tests": [
-            {
-                "description": "any non-empty array is valid",
-                "data": ["foo"],
-                "valid": true
-            },
-            {
-                "description": "empty array is invalid",
-                "data": [],
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "contains keyword with boolean schema false",
-        "schema": {"contains": false},
-        "tests": [
-            {
-                "description": "any non-empty array is invalid",
-                "data": ["foo"],
-                "valid": false
-            },
-            {
-                "description": "empty array is invalid",
-                "data": [],
-                "valid": false
-            },
-            {
-                "description": "non-arrays are valid",
-                "data": "contains does not apply to strings",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "items + contains",
-        "schema": {
-            "items": { "multipleOf": 2 },
-            "contains": { "multipleOf": 3 }
-        },
-        "tests": [
-            {
-                "description": "matches items, does not match contains",
-                "data": [ 2, 4, 8 ],
-                "valid": false
-            },
-            {
-                "description": "does not match items, matches contains",
-                "data": [ 3, 6, 9 ],
-                "valid": false
-            },
-            {
-                "description": "matches both items and contains",
-                "data": [ 6, 12 ],
-                "valid": true
-            },
-            {
-                "description": "matches neither items nor contains",
-                "data": [ 1, 5 ],
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "contains with false if subschema",
-        "schema": {
-            "contains": {
-                "if": false,
-                "else": true
-            }
-        },
-        "tests": [
-            {
-                "description": "any non-empty array is valid",
-                "data": ["foo"],
-                "valid": true
-            },
-            {
-                "description": "empty array is invalid",
-                "data": [],
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "contains with null instance elements",
-        "schema": {
-            "contains": {
-                "type": "null"
-            }
-        },
-        "tests": [
-            {
-                "description": "allows null items",
-                "data": [ null ],
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft7/default.json b/json/tests/draft7/default.json
deleted file mode 100644
index 289a9b6..0000000
--- a/json/tests/draft7/default.json
+++ /dev/null
@@ -1,79 +0,0 @@
-[
-    {
-        "description": "invalid type for default",
-        "schema": {
-            "properties": {
-                "foo": {
-                    "type": "integer",
-                    "default": []
-                }
-            }
-        },
-        "tests": [
-            {
-                "description": "valid when property is specified",
-                "data": {"foo": 13},
-                "valid": true
-            },
-            {
-                "description": "still valid when the invalid default is used",
-                "data": {},
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "invalid string value for default",
-        "schema": {
-            "properties": {
-                "bar": {
-                    "type": "string",
-                    "minLength": 4,
-                    "default": "bad"
-                }
-            }
-        },
-        "tests": [
-            {
-                "description": "valid when property is specified",
-                "data": {"bar": "good"},
-                "valid": true
-            },
-            {
-                "description": "still valid when the invalid default is used",
-                "data": {},
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "the default keyword does not do anything if the property is missing",
-        "schema": {
-            "type": "object",
-            "properties": {
-                "alpha": {
-                    "type": "number",
-                    "maximum": 3,
-                    "default": 5
-                }
-            }
-        },
-        "tests": [
-            {
-                "description": "an explicit property value is checked against maximum (passing)",
-                "data": { "alpha": 1 },
-                "valid": true
-            },
-            {
-                "description": "an explicit property value is checked against maximum (failing)",
-                "data": { "alpha": 5 },
-                "valid": false
-            },
-            {
-                "description": "missing properties are not filled in with the default",
-                "data": {},
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft7/definitions.json b/json/tests/draft7/definitions.json
deleted file mode 100644
index afe396e..0000000
--- a/json/tests/draft7/definitions.json
+++ /dev/null
@@ -1,26 +0,0 @@
-[
-    {
-        "description": "validate definition against metaschema",
-        "schema": {"$ref": "http://json-schema.org/draft-07/schema#"},
-        "tests": [
-            {
-                "description": "valid definition schema",
-                "data": {
-                    "definitions": {
-                        "foo": {"type": "integer"}
-                    }
-                },
-                "valid": true
-            },
-            {
-                "description": "invalid definition schema",
-                "data": {
-                    "definitions": {
-                        "foo": {"type": 1}
-                    }
-                },
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft7/dependencies.json b/json/tests/draft7/dependencies.json
deleted file mode 100644
index a5e5428..0000000
--- a/json/tests/draft7/dependencies.json
+++ /dev/null
@@ -1,248 +0,0 @@
-[
-    {
-        "description": "dependencies",
-        "schema": {
-            "dependencies": {"bar": ["foo"]}
-        },
-        "tests": [
-            {
-                "description": "neither",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "nondependant",
-                "data": {"foo": 1},
-                "valid": true
-            },
-            {
-                "description": "with dependency",
-                "data": {"foo": 1, "bar": 2},
-                "valid": true
-            },
-            {
-                "description": "missing dependency",
-                "data": {"bar": 2},
-                "valid": false
-            },
-            {
-                "description": "ignores arrays",
-                "data": ["bar"],
-                "valid": true
-            },
-            {
-                "description": "ignores strings",
-                "data": "foobar",
-                "valid": true
-            },
-            {
-                "description": "ignores other non-objects",
-                "data": 12,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "dependencies with empty array",
-        "schema": {
-            "dependencies": {"bar": []}
-        },
-        "tests": [
-            {
-                "description": "empty object",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "object with one property",
-                "data": {"bar": 2},
-                "valid": true
-            },
-            {
-                "description": "non-object is valid",
-                "data": 1,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "multiple dependencies",
-        "schema": {
-            "dependencies": {"quux": ["foo", "bar"]}
-        },
-        "tests": [
-            {
-                "description": "neither",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "nondependants",
-                "data": {"foo": 1, "bar": 2},
-                "valid": true
-            },
-            {
-                "description": "with dependencies",
-                "data": {"foo": 1, "bar": 2, "quux": 3},
-                "valid": true
-            },
-            {
-                "description": "missing dependency",
-                "data": {"foo": 1, "quux": 2},
-                "valid": false
-            },
-            {
-                "description": "missing other dependency",
-                "data": {"bar": 1, "quux": 2},
-                "valid": false
-            },
-            {
-                "description": "missing both dependencies",
-                "data": {"quux": 1},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "multiple dependencies subschema",
-        "schema": {
-            "dependencies": {
-                "bar": {
-                    "properties": {
-                        "foo": {"type": "integer"},
-                        "bar": {"type": "integer"}
-                    }
-                }
-            }
-        },
-        "tests": [
-            {
-                "description": "valid",
-                "data": {"foo": 1, "bar": 2},
-                "valid": true
-            },
-            {
-                "description": "no dependency",
-                "data": {"foo": "quux"},
-                "valid": true
-            },
-            {
-                "description": "wrong type",
-                "data": {"foo": "quux", "bar": 2},
-                "valid": false
-            },
-            {
-                "description": "wrong type other",
-                "data": {"foo": 2, "bar": "quux"},
-                "valid": false
-            },
-            {
-                "description": "wrong type both",
-                "data": {"foo": "quux", "bar": "quux"},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "dependencies with boolean subschemas",
-        "schema": {
-            "dependencies": {
-                "foo": true,
-                "bar": false
-            }
-        },
-        "tests": [
-            {
-                "description": "object with property having schema true is valid",
-                "data": {"foo": 1},
-                "valid": true
-            },
-            {
-                "description": "object with property having schema false is invalid",
-                "data": {"bar": 2},
-                "valid": false
-            },
-            {
-                "description": "object with both properties is invalid",
-                "data": {"foo": 1, "bar": 2},
-                "valid": false
-            },
-            {
-                "description": "empty object is valid",
-                "data": {},
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "dependencies with escaped characters",
-        "schema": {
-            "dependencies": {
-                "foo\nbar": ["foo\rbar"],
-                "foo\tbar": {
-                    "minProperties": 4
-                },
-                "foo'bar": {"required": ["foo\"bar"]},
-                "foo\"bar": ["foo'bar"]
-            }
-        },
-        "tests": [
-            {
-                "description": "valid object 1",
-                "data": {
-                    "foo\nbar": 1,
-                    "foo\rbar": 2
-                },
-                "valid": true
-            },
-            {
-                "description": "valid object 2",
-                "data": {
-                    "foo\tbar": 1,
-                    "a": 2,
-                    "b": 3,
-                    "c": 4
-                },
-                "valid": true
-            },
-            {
-                "description": "valid object 3",
-                "data": {
-                    "foo'bar": 1,
-                    "foo\"bar": 2
-                },
-                "valid": true
-            },
-            {
-                "description": "invalid object 1",
-                "data": {
-                    "foo\nbar": 1,
-                    "foo": 2
-                },
-                "valid": false
-            },
-            {
-                "description": "invalid object 2",
-                "data": {
-                    "foo\tbar": 1,
-                    "a": 2
-                },
-                "valid": false
-            },
-            {
-                "description": "invalid object 3",
-                "data": {
-                    "foo'bar": 1
-                },
-                "valid": false
-            },
-            {
-                "description": "invalid object 4",
-                "data": {
-                    "foo\"bar": 2
-                },
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft7/enum.json b/json/tests/draft7/enum.json
deleted file mode 100644
index f085097..0000000
--- a/json/tests/draft7/enum.json
+++ /dev/null
@@ -1,236 +0,0 @@
-[
-    {
-        "description": "simple enum validation",
-        "schema": {"enum": [1, 2, 3]},
-        "tests": [
-            {
-                "description": "one of the enum is valid",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "something else is invalid",
-                "data": 4,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "heterogeneous enum validation",
-        "schema": {"enum": [6, "foo", [], true, {"foo": 12}]},
-        "tests": [
-            {
-                "description": "one of the enum is valid",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "something else is invalid",
-                "data": null,
-                "valid": false
-            },
-            {
-                "description": "objects are deep compared",
-                "data": {"foo": false},
-                "valid": false
-            },
-            {
-                "description": "valid object matches",
-                "data": {"foo": 12},
-                "valid": true
-            },
-            {
-                "description": "extra properties in object is invalid",
-                "data": {"foo": 12, "boo": 42},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "heterogeneous enum-with-null validation",
-        "schema": { "enum": [6, null] },
-        "tests": [
-            {
-                "description": "null is valid",
-                "data": null,
-                "valid": true
-            },
-            {
-                "description": "number is valid",
-                "data": 6,
-                "valid": true
-            },
-            {
-                "description": "something else is invalid",
-                "data": "test",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "enums in properties",
-        "schema": {
-            "type":"object",
-            "properties": {
-                "foo": {"enum":["foo"]},
-                "bar": {"enum":["bar"]}
-            },
-            "required": ["bar"]
-        },
-        "tests": [
-            {
-                "description": "both properties are valid",
-                "data": {"foo":"foo", "bar":"bar"},
-                "valid": true
-            },
-            {
-                "description": "wrong foo value",
-                "data": {"foo":"foot", "bar":"bar"},
-                "valid": false
-            },
-            {
-                "description": "wrong bar value",
-                "data": {"foo":"foo", "bar":"bart"},
-                "valid": false
-            },
-            {
-                "description": "missing optional property is valid",
-                "data": {"bar":"bar"},
-                "valid": true
-            },
-            {
-                "description": "missing required property is invalid",
-                "data": {"foo":"foo"},
-                "valid": false
-            },
-            {
-                "description": "missing all properties is invalid",
-                "data": {},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "enum with escaped characters",
-        "schema": {
-            "enum": ["foo\nbar", "foo\rbar"]
-        },
-        "tests": [
-            {
-                "description": "member 1 is valid",
-                "data": "foo\nbar",
-                "valid": true
-            },
-            {
-                "description": "member 2 is valid",
-                "data": "foo\rbar",
-                "valid": true
-            },
-            {
-                "description": "another string is invalid",
-                "data": "abc",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "enum with false does not match 0",
-        "schema": {"enum": [false]},
-        "tests": [
-            {
-                "description": "false is valid",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "integer zero is invalid",
-                "data": 0,
-                "valid": false
-            },
-            {
-                "description": "float zero is invalid",
-                "data": 0.0,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "enum with true does not match 1",
-        "schema": {"enum": [true]},
-        "tests": [
-            {
-                "description": "true is valid",
-                "data": true,
-                "valid": true
-            },
-            {
-                "description": "integer one is invalid",
-                "data": 1,
-                "valid": false
-            },
-            {
-                "description": "float one is invalid",
-                "data": 1.0,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "enum with 0 does not match false",
-        "schema": {"enum": [0]},
-        "tests": [
-            {
-                "description": "false is invalid",
-                "data": false,
-                "valid": false
-            },
-            {
-                "description": "integer zero is valid",
-                "data": 0,
-                "valid": true
-            },
-            {
-                "description": "float zero is valid",
-                "data": 0.0,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "enum with 1 does not match true",
-        "schema": {"enum": [1]},
-        "tests": [
-            {
-                "description": "true is invalid",
-                "data": true,
-                "valid": false
-            },
-            {
-                "description": "integer one is valid",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "float one is valid",
-                "data": 1.0,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "nul characters in strings",
-        "schema": { "enum": [ "hello\u0000there" ] },
-        "tests": [
-            {
-                "description": "match string with nul",
-                "data": "hello\u0000there",
-                "valid": true
-            },
-            {
-                "description": "do not match string lacking nul",
-                "data": "hellothere",
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft7/exclusiveMaximum.json b/json/tests/draft7/exclusiveMaximum.json
deleted file mode 100644
index dc3cd70..0000000
--- a/json/tests/draft7/exclusiveMaximum.json
+++ /dev/null
@@ -1,30 +0,0 @@
-[
-    {
-        "description": "exclusiveMaximum validation",
-        "schema": {
-            "exclusiveMaximum": 3.0
-        },
-        "tests": [
-            {
-                "description": "below the exclusiveMaximum is valid",
-                "data": 2.2,
-                "valid": true
-            },
-            {
-                "description": "boundary point is invalid",
-                "data": 3.0,
-                "valid": false
-            },
-            {
-                "description": "above the exclusiveMaximum is invalid",
-                "data": 3.5,
-                "valid": false
-            },
-            {
-                "description": "ignores non-numbers",
-                "data": "x",
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft7/exclusiveMinimum.json b/json/tests/draft7/exclusiveMinimum.json
deleted file mode 100644
index b38d7ec..0000000
--- a/json/tests/draft7/exclusiveMinimum.json
+++ /dev/null
@@ -1,30 +0,0 @@
-[
-    {
-        "description": "exclusiveMinimum validation",
-        "schema": {
-            "exclusiveMinimum": 1.1
-        },
-        "tests": [
-            {
-                "description": "above the exclusiveMinimum is valid",
-                "data": 1.2,
-                "valid": true
-            },
-            {
-                "description": "boundary point is invalid",
-                "data": 1.1,
-                "valid": false
-            },
-            {
-                "description": "below the exclusiveMinimum is invalid",
-                "data": 0.6,
-                "valid": false
-            },
-            {
-                "description": "ignores non-numbers",
-                "data": "x",
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft7/format.json b/json/tests/draft7/format.json
deleted file mode 100644
index e2447d6..0000000
--- a/json/tests/draft7/format.json
+++ /dev/null
@@ -1,614 +0,0 @@
-[
-    {
-        "description": "email format",
-        "schema": { "format": "email" },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "idn-email format",
-        "schema": { "format": "idn-email" },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "regex format",
-        "schema": { "format": "regex" },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "ipv4 format",
-        "schema": { "format": "ipv4" },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "ipv6 format",
-        "schema": { "format": "ipv6" },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "idn-hostname format",
-        "schema": { "format": "idn-hostname" },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "hostname format",
-        "schema": { "format": "hostname" },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "date format",
-        "schema": { "format": "date" },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "date-time format",
-        "schema": { "format": "date-time" },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "time format",
-        "schema": { "format": "time" },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "json-pointer format",
-        "schema": { "format": "json-pointer" },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "relative-json-pointer format",
-        "schema": { "format": "relative-json-pointer" },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "iri format",
-        "schema": { "format": "iri" },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "iri-reference format",
-        "schema": { "format": "iri-reference" },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "uri format",
-        "schema": { "format": "uri" },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "uri-reference format",
-        "schema": { "format": "uri-reference" },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "uri-template format",
-        "schema": { "format": "uri-template" },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft7/id.json b/json/tests/draft7/id.json
deleted file mode 100644
index 6be81b8..0000000
--- a/json/tests/draft7/id.json
+++ /dev/null
@@ -1,114 +0,0 @@
-[
-    {
-        "description": "id inside an enum is not a real identifier",
-        "comment": "the implementation must not be confused by an id buried in the enum",
-        "schema": {
-            "definitions": {
-                "id_in_enum": {
-                    "enum": [
-                        {
-                          "$id": "https://localhost:1234/id/my_identifier.json",
-                          "type": "null"
-                        }
-                    ]
-                },
-                "real_id_in_schema": {
-                    "$id": "https://localhost:1234/id/my_identifier.json",
-                    "type": "string"
-                },
-                "zzz_id_in_const": {
-                    "const": {
-                        "$id": "https://localhost:1234/id/my_identifier.json",
-                        "type": "null"
-                    }
-                }
-            },
-            "anyOf": [
-                { "$ref": "#/definitions/id_in_enum" },
-                { "$ref": "https://localhost:1234/id/my_identifier.json" }
-            ]
-        },
-        "tests": [
-            {
-                "description": "exact match to enum, and type matches",
-                "data": {
-                    "$id": "https://localhost:1234/id/my_identifier.json",
-                    "type": "null"
-                },
-                "valid": true
-            },
-            {
-                "description": "match $ref to id",
-                "data": "a string to match #/definitions/id_in_enum",
-                "valid": true
-            },
-            {
-                "description": "no match on enum or $ref to id",
-                "data": 1,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "non-schema object containing a plain-name $id property",
-        "schema": {
-            "definitions": {
-                "const_not_anchor": {
-                    "const": {
-                        "$id": "#not_a_real_anchor"
-                    }
-                }
-            },
-            "if": {
-                "const": "skip not_a_real_anchor"
-            },
-            "then": true,
-            "else" : {
-                "$ref": "#/definitions/const_not_anchor"
-            }
-        },
-        "tests": [
-            {
-                "description": "skip traversing definition for a valid result",
-                "data": "skip not_a_real_anchor",
-                "valid": true
-            },
-            {
-                "description": "const at const_not_anchor does not match",
-                "data": 1,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "non-schema object containing an $id property",
-        "schema": {
-            "definitions": {
-                "const_not_id": {
-                    "const": {
-                        "$id": "not_a_real_id"
-                    }
-                }
-            },
-            "if": {
-                "const": "skip not_a_real_id"
-            },
-            "then": true,
-            "else" : {
-                "$ref": "#/definitions/const_not_id"
-            }
-        },
-        "tests": [
-            {
-                "description": "skip traversing definition for a valid result",
-                "data": "skip not_a_real_id",
-                "valid": true
-            },
-            {
-                "description": "const at const_not_id does not match",
-                "data": 1,
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft7/if-then-else.json b/json/tests/draft7/if-then-else.json
deleted file mode 100644
index 284e919..0000000
--- a/json/tests/draft7/if-then-else.json
+++ /dev/null
@@ -1,258 +0,0 @@
-[
-    {
-        "description": "ignore if without then or else",
-        "schema": {
-            "if": {
-                "const": 0
-            }
-        },
-        "tests": [
-            {
-                "description": "valid when valid against lone if",
-                "data": 0,
-                "valid": true
-            },
-            {
-                "description": "valid when invalid against lone if",
-                "data": "hello",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "ignore then without if",
-        "schema": {
-            "then": {
-                "const": 0
-            }
-        },
-        "tests": [
-            {
-                "description": "valid when valid against lone then",
-                "data": 0,
-                "valid": true
-            },
-            {
-                "description": "valid when invalid against lone then",
-                "data": "hello",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "ignore else without if",
-        "schema": {
-            "else": {
-                "const": 0
-            }
-        },
-        "tests": [
-            {
-                "description": "valid when valid against lone else",
-                "data": 0,
-                "valid": true
-            },
-            {
-                "description": "valid when invalid against lone else",
-                "data": "hello",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "if and then without else",
-        "schema": {
-            "if": {
-                "exclusiveMaximum": 0
-            },
-            "then": {
-                "minimum": -10
-            }
-        },
-        "tests": [
-            {
-                "description": "valid through then",
-                "data": -1,
-                "valid": true
-            },
-            {
-                "description": "invalid through then",
-                "data": -100,
-                "valid": false
-            },
-            {
-                "description": "valid when if test fails",
-                "data": 3,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "if and else without then",
-        "schema": {
-            "if": {
-                "exclusiveMaximum": 0
-            },
-            "else": {
-                "multipleOf": 2
-            }
-        },
-        "tests": [
-            {
-                "description": "valid when if test passes",
-                "data": -1,
-                "valid": true
-            },
-            {
-                "description": "valid through else",
-                "data": 4,
-                "valid": true
-            },
-            {
-                "description": "invalid through else",
-                "data": 3,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "validate against correct branch, then vs else",
-        "schema": {
-            "if": {
-                "exclusiveMaximum": 0
-            },
-            "then": {
-                "minimum": -10
-            },
-            "else": {
-                "multipleOf": 2
-            }
-        },
-        "tests": [
-            {
-                "description": "valid through then",
-                "data": -1,
-                "valid": true
-            },
-            {
-                "description": "invalid through then",
-                "data": -100,
-                "valid": false
-            },
-            {
-                "description": "valid through else",
-                "data": 4,
-                "valid": true
-            },
-            {
-                "description": "invalid through else",
-                "data": 3,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "non-interference across combined schemas",
-        "schema": {
-            "allOf": [
-                {
-                    "if": {
-                        "exclusiveMaximum": 0
-                    }
-                },
-                {
-                    "then": {
-                        "minimum": -10
-                    }
-                },
-                {
-                    "else": {
-                        "multipleOf": 2
-                    }
-                }
-            ]
-        },
-        "tests": [
-            {
-                "description": "valid, but would have been invalid through then",
-                "data": -100,
-                "valid": true
-            },
-            {
-                "description": "valid, but would have been invalid through else",
-                "data": 3,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "if with boolean schema true",
-        "schema": {
-            "if": true,
-            "then": { "const": "then" },
-            "else": { "const": "else" }
-        },
-        "tests": [
-            {
-                "description": "boolean schema true in if always chooses the then path (valid)",
-                "data": "then",
-                "valid": true
-            },
-            {
-                "description": "boolean schema true in if always chooses the then path (invalid)",
-                "data": "else",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "if with boolean schema false",
-        "schema": {
-            "if": false,
-            "then": { "const": "then" },
-            "else": { "const": "else" }
-        },
-        "tests": [
-            {
-                "description": "boolean schema false in if always chooses the else path (invalid)",
-                "data": "then",
-                "valid": false
-            },
-            {
-                "description": "boolean schema false in if always chooses the else path (valid)",
-                "data": "else",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "if appears at the end when serialized (keyword processing sequence)",
-        "schema": {
-            "then": { "const": "yes" },
-            "else": { "const": "other" },
-            "if": { "maxLength": 4 }
-        },
-        "tests": [
-            {
-                "description": "yes redirects to then and passes",
-                "data": "yes",
-                "valid": true
-            },
-            {
-                "description": "other redirects to else and passes",
-                "data": "other",
-                "valid": true
-            },
-            {
-                "description": "no redirects to then and fails",
-                "data": "no",
-                "valid": false
-            },
-            {
-                "description": "invalid redirects to else and fails",
-                "data": "invalid",
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft7/infinite-loop-detection.json b/json/tests/draft7/infinite-loop-detection.json
deleted file mode 100644
index f98c74f..0000000
--- a/json/tests/draft7/infinite-loop-detection.json
+++ /dev/null
@@ -1,36 +0,0 @@
-[
-    {
-        "description": "evaluating the same schema location against the same data location twice is not a sign of an infinite loop",
-        "schema": {
-            "definitions": {
-                "int": { "type": "integer" }
-            },
-            "allOf": [
-                {
-                    "properties": {
-                        "foo": {
-                            "$ref": "#/definitions/int"
-                        }
-                    }
-                },
-                {
-                    "additionalProperties": {
-                        "$ref": "#/definitions/int"
-                    }
-                }
-            ]
-        },
-        "tests": [
-            {
-                "description": "passing case",
-                "data": { "foo": 1 },
-                "valid": true
-            },
-            {
-                "description": "failing case",
-                "data": { "foo": "a string" },
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft7/items.json b/json/tests/draft7/items.json
deleted file mode 100644
index 7ed6781..0000000
--- a/json/tests/draft7/items.json
+++ /dev/null
@@ -1,282 +0,0 @@
-[
-    {
-        "description": "a schema given for items",
-        "schema": {
-            "items": {"type": "integer"}
-        },
-        "tests": [
-            {
-                "description": "valid items",
-                "data": [ 1, 2, 3 ],
-                "valid": true
-            },
-            {
-                "description": "wrong type of items",
-                "data": [1, "x"],
-                "valid": false
-            },
-            {
-                "description": "ignores non-arrays",
-                "data": {"foo" : "bar"},
-                "valid": true
-            },
-            {
-                "description": "JavaScript pseudo-array is valid",
-                "data": {
-                    "0": "invalid",
-                    "length": 1
-                },
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "an array of schemas for items",
-        "schema": {
-            "items": [
-                {"type": "integer"},
-                {"type": "string"}
-            ]
-        },
-        "tests": [
-            {
-                "description": "correct types",
-                "data": [ 1, "foo" ],
-                "valid": true
-            },
-            {
-                "description": "wrong types",
-                "data": [ "foo", 1 ],
-                "valid": false
-            },
-            {
-                "description": "incomplete array of items",
-                "data": [ 1 ],
-                "valid": true
-            },
-            {
-                "description": "array with additional items",
-                "data": [ 1, "foo", true ],
-                "valid": true
-            },
-            {
-                "description": "empty array",
-                "data": [ ],
-                "valid": true
-            },
-            {
-                "description": "JavaScript pseudo-array is valid",
-                "data": {
-                    "0": "invalid",
-                    "1": "valid",
-                    "length": 2
-                },
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "items with boolean schema (true)",
-        "schema": {"items": true},
-        "tests": [
-            {
-                "description": "any array is valid",
-                "data": [ 1, "foo", true ],
-                "valid": true
-            },
-            {
-                "description": "empty array is valid",
-                "data": [],
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "items with boolean schema (false)",
-        "schema": {"items": false},
-        "tests": [
-            {
-                "description": "any non-empty array is invalid",
-                "data": [ 1, "foo", true ],
-                "valid": false
-            },
-            {
-                "description": "empty array is valid",
-                "data": [],
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "items with boolean schemas",
-        "schema": {
-            "items": [true, false]
-        },
-        "tests": [
-            {
-                "description": "array with one item is valid",
-                "data": [ 1 ],
-                "valid": true
-            },
-            {
-                "description": "array with two items is invalid",
-                "data": [ 1, "foo" ],
-                "valid": false
-            },
-            {
-                "description": "empty array is valid",
-                "data": [],
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "items and subitems",
-        "schema": {
-            "definitions": {
-                "item": {
-                    "type": "array",
-                    "additionalItems": false,
-                    "items": [
-                        { "$ref": "#/definitions/sub-item" },
-                        { "$ref": "#/definitions/sub-item" }
-                    ]
-                },
-                "sub-item": {
-                    "type": "object",
-                    "required": ["foo"]
-                }
-            },
-            "type": "array",
-            "additionalItems": false,
-            "items": [
-                { "$ref": "#/definitions/item" },
-                { "$ref": "#/definitions/item" },
-                { "$ref": "#/definitions/item" }
-            ]
-        },
-        "tests": [
-            {
-                "description": "valid items",
-                "data": [
-                    [ {"foo": null}, {"foo": null} ],
-                    [ {"foo": null}, {"foo": null} ],
-                    [ {"foo": null}, {"foo": null} ]
-                ],
-                "valid": true
-            },
-            {
-                "description": "too many items",
-                "data": [
-                    [ {"foo": null}, {"foo": null} ],
-                    [ {"foo": null}, {"foo": null} ],
-                    [ {"foo": null}, {"foo": null} ],
-                    [ {"foo": null}, {"foo": null} ]
-                ],
-                "valid": false
-            },
-            {
-                "description": "too many sub-items",
-                "data": [
-                    [ {"foo": null}, {"foo": null}, {"foo": null} ],
-                    [ {"foo": null}, {"foo": null} ],
-                    [ {"foo": null}, {"foo": null} ]
-                ],
-                "valid": false
-            },
-            {
-                "description": "wrong item",
-                "data": [
-                    {"foo": null},
-                    [ {"foo": null}, {"foo": null} ],
-                    [ {"foo": null}, {"foo": null} ]
-                ],
-                "valid": false
-            },
-            {
-                "description": "wrong sub-item",
-                "data": [
-                    [ {}, {"foo": null} ],
-                    [ {"foo": null}, {"foo": null} ],
-                    [ {"foo": null}, {"foo": null} ]
-                ],
-                "valid": false
-            },
-            {
-                "description": "fewer items is valid",
-                "data": [
-                    [ {"foo": null} ],
-                    [ {"foo": null} ]
-                ],
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "nested items",
-        "schema": {
-            "type": "array",
-            "items": {
-                "type": "array",
-                "items": {
-                    "type": "array",
-                    "items": {
-                        "type": "array",
-                        "items": {
-                            "type": "number"
-                        }
-                    }
-                }
-            }
-        },
-        "tests": [
-            {
-                "description": "valid nested array",
-                "data": [[[[1]], [[2],[3]]], [[[4], [5], [6]]]],
-                "valid": true
-            },
-            {
-                "description": "nested array with invalid type",
-                "data": [[[["1"]], [[2],[3]]], [[[4], [5], [6]]]],
-                "valid": false
-            },
-            {
-                "description": "not deep enough",
-                "data": [[[1], [2],[3]], [[4], [5], [6]]],
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "single-form items with null instance elements",
-        "schema": {
-            "items": {
-                "type": "null"
-            }
-        },
-        "tests": [
-            {
-                "description": "allows null elements",
-                "data": [ null ],
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "array-form items with null instance elements",
-        "schema": {
-            "items": [
-                {
-                    "type": "null"
-                }
-            ]
-        },
-        "tests": [
-            {
-                "description": "allows null elements",
-                "data": [ null ],
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft7/maxItems.json b/json/tests/draft7/maxItems.json
deleted file mode 100644
index f0c36ab..0000000
--- a/json/tests/draft7/maxItems.json
+++ /dev/null
@@ -1,44 +0,0 @@
-[
-    {
-        "description": "maxItems validation",
-        "schema": {"maxItems": 2},
-        "tests": [
-            {
-                "description": "shorter is valid",
-                "data": [1],
-                "valid": true
-            },
-            {
-                "description": "exact length is valid",
-                "data": [1, 2],
-                "valid": true
-            },
-            {
-                "description": "too long is invalid",
-                "data": [1, 2, 3],
-                "valid": false
-            },
-            {
-                "description": "ignores non-arrays",
-                "data": "foobar",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "maxItems validation with a decimal",
-        "schema": {"maxItems": 2.0},
-        "tests": [
-            {
-                "description": "shorter is valid",
-                "data": [1],
-                "valid": true
-            },
-            {
-                "description": "too long is invalid",
-                "data": [1, 2, 3],
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft7/maxLength.json b/json/tests/draft7/maxLength.json
deleted file mode 100644
index 748b4da..0000000
--- a/json/tests/draft7/maxLength.json
+++ /dev/null
@@ -1,49 +0,0 @@
-[
-    {
-        "description": "maxLength validation",
-        "schema": {"maxLength": 2},
-        "tests": [
-            {
-                "description": "shorter is valid",
-                "data": "f",
-                "valid": true
-            },
-            {
-                "description": "exact length is valid",
-                "data": "fo",
-                "valid": true
-            },
-            {
-                "description": "too long is invalid",
-                "data": "foo",
-                "valid": false
-            },
-            {
-                "description": "ignores non-strings",
-                "data": 100,
-                "valid": true
-            },
-            {
-                "description": "two supplementary Unicode code points is long enough",
-                "data": "\uD83D\uDCA9\uD83D\uDCA9",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "maxLength validation with a decimal",
-        "schema": {"maxLength": 2.0},
-        "tests": [
-            {
-                "description": "shorter is valid",
-                "data": "f",
-                "valid": true
-            },
-            {
-                "description": "too long is invalid",
-                "data": "foo",
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft7/maxProperties.json b/json/tests/draft7/maxProperties.json
deleted file mode 100644
index acec142..0000000
--- a/json/tests/draft7/maxProperties.json
+++ /dev/null
@@ -1,70 +0,0 @@
-[
-    {
-        "description": "maxProperties validation",
-        "schema": {"maxProperties": 2},
-        "tests": [
-            {
-                "description": "shorter is valid",
-                "data": {"foo": 1},
-                "valid": true
-            },
-            {
-                "description": "exact length is valid",
-                "data": {"foo": 1, "bar": 2},
-                "valid": true
-            },
-            {
-                "description": "too long is invalid",
-                "data": {"foo": 1, "bar": 2, "baz": 3},
-                "valid": false
-            },
-            {
-                "description": "ignores arrays",
-                "data": [1, 2, 3],
-                "valid": true
-            },
-            {
-                "description": "ignores strings",
-                "data": "foobar",
-                "valid": true
-            },
-            {
-                "description": "ignores other non-objects",
-                "data": 12,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "maxProperties validation with a decimal",
-        "schema": {"maxProperties": 2.0},
-        "tests": [
-            {
-                "description": "shorter is valid",
-                "data": {"foo": 1},
-                "valid": true
-            },
-            {
-                "description": "too long is invalid",
-                "data": {"foo": 1, "bar": 2, "baz": 3},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "maxProperties = 0 means the object is empty",
-        "schema": { "maxProperties": 0 },
-        "tests": [
-            {
-                "description": "no properties is valid",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "one property is invalid",
-                "data": { "foo": 1 },
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft7/maximum.json b/json/tests/draft7/maximum.json
deleted file mode 100644
index 6844a39..0000000
--- a/json/tests/draft7/maximum.json
+++ /dev/null
@@ -1,54 +0,0 @@
-[
-    {
-        "description": "maximum validation",
-        "schema": {"maximum": 3.0},
-        "tests": [
-            {
-                "description": "below the maximum is valid",
-                "data": 2.6,
-                "valid": true
-            },
-            {
-                "description": "boundary point is valid",
-                "data": 3.0,
-                "valid": true
-            },
-            {
-                "description": "above the maximum is invalid",
-                "data": 3.5,
-                "valid": false
-            },
-            {
-                "description": "ignores non-numbers",
-                "data": "x",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "maximum validation with unsigned integer",
-        "schema": {"maximum": 300},
-        "tests":  [
-            {
-                "description": "below the maximum is invalid",
-                "data": 299.97,
-                "valid": true
-            },
-            {
-                "description": "boundary point integer is valid",
-                "data": 300,
-                "valid": true
-            },
-            {
-                "description": "boundary point float is valid",
-                "data": 300.00,
-                "valid": true
-            },
-            {
-                "description": "above the maximum is invalid",
-                "data": 300.5,
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft7/minItems.json b/json/tests/draft7/minItems.json
deleted file mode 100644
index d3b1872..0000000
--- a/json/tests/draft7/minItems.json
+++ /dev/null
@@ -1,44 +0,0 @@
-[
-    {
-        "description": "minItems validation",
-        "schema": {"minItems": 1},
-        "tests": [
-            {
-                "description": "longer is valid",
-                "data": [1, 2],
-                "valid": true
-            },
-            {
-                "description": "exact length is valid",
-                "data": [1],
-                "valid": true
-            },
-            {
-                "description": "too short is invalid",
-                "data": [],
-                "valid": false
-            },
-            {
-                "description": "ignores non-arrays",
-                "data": "",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "minItems validation with a decimal",
-        "schema": {"minItems": 1.0},
-        "tests": [
-            {
-                "description": "longer is valid",
-                "data": [1, 2],
-                "valid": true
-            },
-            {
-                "description": "too short is invalid",
-                "data": [],
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft7/minLength.json b/json/tests/draft7/minLength.json
deleted file mode 100644
index 64db948..0000000
--- a/json/tests/draft7/minLength.json
+++ /dev/null
@@ -1,49 +0,0 @@
-[
-    {
-        "description": "minLength validation",
-        "schema": {"minLength": 2},
-        "tests": [
-            {
-                "description": "longer is valid",
-                "data": "foo",
-                "valid": true
-            },
-            {
-                "description": "exact length is valid",
-                "data": "fo",
-                "valid": true
-            },
-            {
-                "description": "too short is invalid",
-                "data": "f",
-                "valid": false
-            },
-            {
-                "description": "ignores non-strings",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "one supplementary Unicode code point is not long enough",
-                "data": "\uD83D\uDCA9",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "minLength validation with a decimal",
-        "schema": {"minLength": 2.0},
-        "tests": [
-            {
-                "description": "longer is valid",
-                "data": "foo",
-                "valid": true
-            },
-            {
-                "description": "too short is invalid",
-                "data": "f",
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft7/minProperties.json b/json/tests/draft7/minProperties.json
deleted file mode 100644
index 9f74f78..0000000
--- a/json/tests/draft7/minProperties.json
+++ /dev/null
@@ -1,54 +0,0 @@
-[
-    {
-        "description": "minProperties validation",
-        "schema": {"minProperties": 1},
-        "tests": [
-            {
-                "description": "longer is valid",
-                "data": {"foo": 1, "bar": 2},
-                "valid": true
-            },
-            {
-                "description": "exact length is valid",
-                "data": {"foo": 1},
-                "valid": true
-            },
-            {
-                "description": "too short is invalid",
-                "data": {},
-                "valid": false
-            },
-            {
-                "description": "ignores arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "ignores strings",
-                "data": "",
-                "valid": true
-            },
-            {
-                "description": "ignores other non-objects",
-                "data": 12,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "minProperties validation with a decimal",
-        "schema": {"minProperties": 1.0},
-        "tests": [
-            {
-                "description": "longer is valid",
-                "data": {"foo": 1, "bar": 2},
-                "valid": true
-            },
-            {
-                "description": "too short is invalid",
-                "data": {},
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft7/minimum.json b/json/tests/draft7/minimum.json
deleted file mode 100644
index 21ae50e..0000000
--- a/json/tests/draft7/minimum.json
+++ /dev/null
@@ -1,69 +0,0 @@
-[
-    {
-        "description": "minimum validation",
-        "schema": {"minimum": 1.1},
-        "tests": [
-            {
-                "description": "above the minimum is valid",
-                "data": 2.6,
-                "valid": true
-            },
-            {
-                "description": "boundary point is valid",
-                "data": 1.1,
-                "valid": true
-            },
-            {
-                "description": "below the minimum is invalid",
-                "data": 0.6,
-                "valid": false
-            },
-            {
-                "description": "ignores non-numbers",
-                "data": "x",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "minimum validation with signed integer",
-        "schema": {"minimum": -2},
-        "tests": [
-            {
-                "description": "negative above the minimum is valid",
-                "data": -1,
-                "valid": true
-            },
-            {
-                "description": "positive above the minimum is valid",
-                "data": 0,
-                "valid": true
-            },
-            {
-                "description": "boundary point is valid",
-                "data": -2,
-                "valid": true
-            },
-            {
-                "description": "boundary point with float is valid",
-                "data": -2.0,
-                "valid": true
-            },
-            {
-                "description": "float below the minimum is invalid",
-                "data": -2.0001,
-                "valid": false
-            },
-            {
-                "description": "int below the minimum is invalid",
-                "data": -3,
-                "valid": false
-            },
-            {
-                "description": "ignores non-numbers",
-                "data": "x",
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft7/multipleOf.json b/json/tests/draft7/multipleOf.json
deleted file mode 100644
index 25c25a9..0000000
--- a/json/tests/draft7/multipleOf.json
+++ /dev/null
@@ -1,71 +0,0 @@
-[
-    {
-        "description": "by int",
-        "schema": {"multipleOf": 2},
-        "tests": [
-            {
-                "description": "int by int",
-                "data": 10,
-                "valid": true
-            },
-            {
-                "description": "int by int fail",
-                "data": 7,
-                "valid": false
-            },
-            {
-                "description": "ignores non-numbers",
-                "data": "foo",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "by number",
-        "schema": {"multipleOf": 1.5},
-        "tests": [
-            {
-                "description": "zero is multiple of anything",
-                "data": 0,
-                "valid": true
-            },
-            {
-                "description": "4.5 is multiple of 1.5",
-                "data": 4.5,
-                "valid": true
-            },
-            {
-                "description": "35 is not multiple of 1.5",
-                "data": 35,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "by small number",
-        "schema": {"multipleOf": 0.0001},
-        "tests": [
-            {
-                "description": "0.0075 is multiple of 0.0001",
-                "data": 0.0075,
-                "valid": true
-            },
-            {
-                "description": "0.00751 is not multiple of 0.0001",
-                "data": 0.00751,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "float division = inf",
-        "schema": {"type": "integer", "multipleOf": 0.123456789},
-        "tests": [
-            {
-                "description": "always invalid, but naive implementations may raise an overflow error",
-                "data": 1e308,
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft7/not.json b/json/tests/draft7/not.json
deleted file mode 100644
index 98de0ed..0000000
--- a/json/tests/draft7/not.json
+++ /dev/null
@@ -1,117 +0,0 @@
-[
-    {
-        "description": "not",
-        "schema": {
-            "not": {"type": "integer"}
-        },
-        "tests": [
-            {
-                "description": "allowed",
-                "data": "foo",
-                "valid": true
-            },
-            {
-                "description": "disallowed",
-                "data": 1,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "not multiple types",
-        "schema": {
-            "not": {"type": ["integer", "boolean"]}
-        },
-        "tests": [
-            {
-                "description": "valid",
-                "data": "foo",
-                "valid": true
-            },
-            {
-                "description": "mismatch",
-                "data": 1,
-                "valid": false
-            },
-            {
-                "description": "other mismatch",
-                "data": true,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "not more complex schema",
-        "schema": {
-            "not": {
-                "type": "object",
-                "properties": {
-                    "foo": {
-                        "type": "string"
-                    }
-                }
-             }
-        },
-        "tests": [
-            {
-                "description": "match",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "other match",
-                "data": {"foo": 1},
-                "valid": true
-            },
-            {
-                "description": "mismatch",
-                "data": {"foo": "bar"},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "forbidden property",
-        "schema": {
-            "properties": {
-                "foo": { 
-                    "not": {}
-                }
-            }
-        },
-        "tests": [
-            {
-                "description": "property present",
-                "data": {"foo": 1, "bar": 2},
-                "valid": false
-            },
-            {
-                "description": "property absent",
-                "data": {"bar": 1, "baz": 2},
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "not with boolean schema true",
-        "schema": {"not": true},
-        "tests": [
-            {
-                "description": "any value is invalid",
-                "data": "foo",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "not with boolean schema false",
-        "schema": {"not": false},
-        "tests": [
-            {
-                "description": "any value is valid",
-                "data": "foo",
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft7/oneOf.json b/json/tests/draft7/oneOf.json
deleted file mode 100644
index eeb7ae8..0000000
--- a/json/tests/draft7/oneOf.json
+++ /dev/null
@@ -1,274 +0,0 @@
-[
-    {
-        "description": "oneOf",
-        "schema": {
-            "oneOf": [
-                {
-                    "type": "integer"
-                },
-                {
-                    "minimum": 2
-                }
-            ]
-        },
-        "tests": [
-            {
-                "description": "first oneOf valid",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "second oneOf valid",
-                "data": 2.5,
-                "valid": true
-            },
-            {
-                "description": "both oneOf valid",
-                "data": 3,
-                "valid": false
-            },
-            {
-                "description": "neither oneOf valid",
-                "data": 1.5,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "oneOf with base schema",
-        "schema": {
-            "type": "string",
-            "oneOf" : [
-                {
-                    "minLength": 2
-                },
-                {
-                    "maxLength": 4
-                }
-            ]
-        },
-        "tests": [
-            {
-                "description": "mismatch base schema",
-                "data": 3,
-                "valid": false
-            },
-            {
-                "description": "one oneOf valid",
-                "data": "foobar",
-                "valid": true
-            },
-            {
-                "description": "both oneOf valid",
-                "data": "foo",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "oneOf with boolean schemas, all true",
-        "schema": {"oneOf": [true, true, true]},
-        "tests": [
-            {
-                "description": "any value is invalid",
-                "data": "foo",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "oneOf with boolean schemas, one true",
-        "schema": {"oneOf": [true, false, false]},
-        "tests": [
-            {
-                "description": "any value is valid",
-                "data": "foo",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "oneOf with boolean schemas, more than one true",
-        "schema": {"oneOf": [true, true, false]},
-        "tests": [
-            {
-                "description": "any value is invalid",
-                "data": "foo",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "oneOf with boolean schemas, all false",
-        "schema": {"oneOf": [false, false, false]},
-        "tests": [
-            {
-                "description": "any value is invalid",
-                "data": "foo",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "oneOf complex types",
-        "schema": {
-            "oneOf": [
-                {
-                    "properties": {
-                        "bar": {"type": "integer"}
-                    },
-                    "required": ["bar"]
-                },
-                {
-                    "properties": {
-                        "foo": {"type": "string"}
-                    },
-                    "required": ["foo"]
-                }
-            ]
-        },
-        "tests": [
-            {
-                "description": "first oneOf valid (complex)",
-                "data": {"bar": 2},
-                "valid": true
-            },
-            {
-                "description": "second oneOf valid (complex)",
-                "data": {"foo": "baz"},
-                "valid": true
-            },
-            {
-                "description": "both oneOf valid (complex)",
-                "data": {"foo": "baz", "bar": 2},
-                "valid": false
-            },
-            {
-                "description": "neither oneOf valid (complex)",
-                "data": {"foo": 2, "bar": "quux"},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "oneOf with empty schema",
-        "schema": {
-            "oneOf": [
-                { "type": "number" },
-                {}
-            ]
-        },
-        "tests": [
-            {
-                "description": "one valid - valid",
-                "data": "foo",
-                "valid": true
-            },
-            {
-                "description": "both valid - invalid",
-                "data": 123,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "oneOf with required",
-        "schema": {
-            "type": "object",
-            "oneOf": [
-                { "required": ["foo", "bar"] },
-                { "required": ["foo", "baz"] }
-            ]
-        },
-        "tests": [
-            {
-                "description": "both invalid - invalid",
-                "data": {"bar": 2},
-                "valid": false
-            },
-            {
-                "description": "first valid - valid",
-                "data": {"foo": 1, "bar": 2},
-                "valid": true
-            },
-            {
-                "description": "second valid - valid",
-                "data": {"foo": 1, "baz": 3},
-                "valid": true
-            },
-            {
-                "description": "both valid - invalid",
-                "data": {"foo": 1, "bar": 2, "baz" : 3},
-                "valid": false
-            }
-        ]
-    },
-	{
-        "description": "oneOf with missing optional property",
-        "schema": {
-            "oneOf": [
-                {
-                    "properties": {
-                        "bar": true,
-                        "baz": true
-                    },
-                    "required": ["bar"]
-                },
-                {
-                    "properties": {
-                        "foo": true
-                    },
-                    "required": ["foo"]
-                }
-            ]
-        },
-        "tests": [
-            {
-                "description": "first oneOf valid",
-                "data": {"bar": 8},
-                "valid": true
-            },
-            {
-                "description": "second oneOf valid",
-                "data": {"foo": "foo"},
-                "valid": true
-            },
-            {
-                "description": "both oneOf valid",
-                "data": {"foo": "foo", "bar": 8},
-                "valid": false
-            },
-            {
-                "description": "neither oneOf valid",
-                "data": {"baz": "quux"},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "nested oneOf, to check validation semantics",
-        "schema": {
-            "oneOf": [
-                {
-                    "oneOf": [
-                        {
-                            "type": "null"
-                        }
-                    ]
-                }
-            ]
-        },
-        "tests": [
-            {
-                "description": "null is valid",
-                "data": null,
-                "valid": true
-            },
-            {
-                "description": "anything non-null is invalid",
-                "data": 123,
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft7/optional/bignum.json b/json/tests/draft7/optional/bignum.json
deleted file mode 100644
index 94b4a4e..0000000
--- a/json/tests/draft7/optional/bignum.json
+++ /dev/null
@@ -1,93 +0,0 @@
-[
-    {
-        "description": "integer",
-        "schema": { "type": "integer" },
-        "tests": [
-            {
-                "description": "a bignum is an integer",
-                "data": 12345678910111213141516171819202122232425262728293031,
-                "valid": true
-            },
-            {
-                "description": "a negative bignum is an integer",
-                "data": -12345678910111213141516171819202122232425262728293031,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "number",
-        "schema": { "type": "number" },
-        "tests": [
-            {
-                "description": "a bignum is a number",
-                "data": 98249283749234923498293171823948729348710298301928331,
-                "valid": true
-            },
-            {
-                "description": "a negative bignum is a number",
-                "data": -98249283749234923498293171823948729348710298301928331,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "string",
-        "schema": { "type": "string" },
-        "tests": [
-            {
-                "description": "a bignum is not a string",
-                "data": 98249283749234923498293171823948729348710298301928331,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "maximum integer comparison",
-        "schema": { "maximum": 18446744073709551615 },
-        "tests": [
-            {
-                "description": "comparison works for high numbers",
-                "data": 18446744073709551600,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "float comparison with high precision",
-        "schema": {
-            "exclusiveMaximum": 972783798187987123879878123.18878137
-        },
-        "tests": [
-            {
-                "description": "comparison works for high numbers",
-                "data": 972783798187987123879878123.188781371,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "minimum integer comparison",
-        "schema": { "minimum": -18446744073709551615 },
-        "tests": [
-            {
-                "description": "comparison works for very negative numbers",
-                "data": -18446744073709551600,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "float comparison with high precision on negative numbers",
-        "schema": {
-            "exclusiveMinimum": -972783798187987123879878123.18878137
-        },
-        "tests": [
-            {
-                "description": "comparison works for very negative numbers",
-                "data": -972783798187987123879878123.188781371,
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft7/optional/content.json b/json/tests/draft7/optional/content.json
deleted file mode 100644
index 3f5a743..0000000
--- a/json/tests/draft7/optional/content.json
+++ /dev/null
@@ -1,77 +0,0 @@
-[
-    {
-        "description": "validation of string-encoded content based on media type",
-        "schema": {
-            "contentMediaType": "application/json"
-        },
-        "tests": [
-            {
-                "description": "a valid JSON document",
-                "data": "{\"foo\": \"bar\"}",
-                "valid": true
-            },
-            {
-                "description": "an invalid JSON document",
-                "data": "{:}",
-                "valid": false
-            },
-            {
-                "description": "ignores non-strings",
-                "data": 100,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "validation of binary string-encoding",
-        "schema": {
-            "contentEncoding": "base64"
-        },
-        "tests": [
-            {
-                "description": "a valid base64 string",
-                "data": "eyJmb28iOiAiYmFyIn0K",
-                "valid": true
-            },
-            {
-                "description": "an invalid base64 string (% is not a valid character)",
-                "data": "eyJmb28iOi%iYmFyIn0K",
-                "valid": false
-            },
-            {
-                "description": "ignores non-strings",
-                "data": 100,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "validation of binary-encoded media type documents",
-        "schema": {
-            "contentMediaType": "application/json",
-            "contentEncoding": "base64"
-        },
-        "tests": [
-            {
-                "description": "a valid base64-encoded JSON document",
-                "data": "eyJmb28iOiAiYmFyIn0K",
-                "valid": true
-            },
-            {
-                "description": "a validly-encoded invalid JSON document",
-                "data": "ezp9Cg==",
-                "valid": false
-            },
-            {
-                "description": "an invalid base64 string that is valid JSON",
-                "data": "{}",
-                "valid": false
-            },
-            {
-                "description": "ignores non-strings",
-                "data": 100,
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft7/optional/cross-draft.json b/json/tests/draft7/optional/cross-draft.json
deleted file mode 100644
index 8ff5373..0000000
--- a/json/tests/draft7/optional/cross-draft.json
+++ /dev/null
@@ -1,25 +0,0 @@
-[
-    {
-        "description": "refs to future drafts are processed as future drafts",
-        "schema": {
-            "type": "object",
-            "allOf": [
-                { "properties": { "foo": true } },
-                { "$ref": "http://localhost:1234/draft2019-09/dependentRequired.json" }
-            ]
-        },
-        "tests": [
-            {
-                "description": "missing bar is invalid",
-                "comment": "if the implementation is not processing the $ref as a 2019-09 schema, this test will fail",
-                "data": {"foo": "any value"},
-                "valid": false
-            },
-            {
-                "description": "present bar is valid",
-                "data": {"foo": "any value", "bar": "also any value"},
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft7/optional/ecmascript-regex.json b/json/tests/draft7/optional/ecmascript-regex.json
deleted file mode 100644
index c4886aa..0000000
--- a/json/tests/draft7/optional/ecmascript-regex.json
+++ /dev/null
@@ -1,552 +0,0 @@
-[
-    {
-        "description": "ECMA 262 regex $ does not match trailing newline",
-        "schema": {
-            "type": "string",
-            "pattern": "^abc$"
-        },
-        "tests": [
-            {
-                "description": "matches in Python, but not in ECMA 262",
-                "data": "abc\\n",
-                "valid": false
-            },
-            {
-                "description": "matches",
-                "data": "abc",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "ECMA 262 regex converts \\t to horizontal tab",
-        "schema": {
-            "type": "string",
-            "pattern": "^\\t$"
-        },
-        "tests": [
-            {
-                "description": "does not match",
-                "data": "\\t",
-                "valid": false
-            },
-            {
-                "description": "matches",
-                "data": "\u0009",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "ECMA 262 regex escapes control codes with \\c and upper letter",
-        "schema": {
-            "type": "string",
-            "pattern": "^\\cC$"
-        },
-        "tests": [
-            {
-                "description": "does not match",
-                "data": "\\cC",
-                "valid": false
-            },
-            {
-                "description": "matches",
-                "data": "\u0003",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "ECMA 262 regex escapes control codes with \\c and lower letter",
-        "schema": {
-            "type": "string",
-            "pattern": "^\\cc$"
-        },
-        "tests": [
-            {
-                "description": "does not match",
-                "data": "\\cc",
-                "valid": false
-            },
-            {
-                "description": "matches",
-                "data": "\u0003",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "ECMA 262 \\d matches ascii digits only",
-        "schema": {
-            "type": "string",
-            "pattern": "^\\d$"
-        },
-        "tests": [
-            {
-                "description": "ASCII zero matches",
-                "data": "0",
-                "valid": true
-            },
-            {
-                "description": "NKO DIGIT ZERO does not match (unlike e.g. Python)",
-                "data": "߀",
-                "valid": false
-            },
-            {
-                "description": "NKO DIGIT ZERO (as \\u escape) does not match",
-                "data": "\u07c0",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "ECMA 262 \\D matches everything but ascii digits",
-        "schema": {
-            "type": "string",
-            "pattern": "^\\D$"
-        },
-        "tests": [
-            {
-                "description": "ASCII zero does not match",
-                "data": "0",
-                "valid": false
-            },
-            {
-                "description": "NKO DIGIT ZERO matches (unlike e.g. Python)",
-                "data": "߀",
-                "valid": true
-            },
-            {
-                "description": "NKO DIGIT ZERO (as \\u escape) matches",
-                "data": "\u07c0",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "ECMA 262 \\w matches ascii letters only",
-        "schema": {
-            "type": "string",
-            "pattern": "^\\w$"
-        },
-        "tests": [
-            {
-                "description": "ASCII 'a' matches",
-                "data": "a",
-                "valid": true
-            },
-            {
-                "description": "latin-1 e-acute does not match (unlike e.g. Python)",
-                "data": "é",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "ECMA 262 \\W matches everything but ascii letters",
-        "schema": {
-            "type": "string",
-            "pattern": "^\\W$"
-        },
-        "tests": [
-            {
-                "description": "ASCII 'a' does not match",
-                "data": "a",
-                "valid": false
-            },
-            {
-                "description": "latin-1 e-acute matches (unlike e.g. Python)",
-                "data": "é",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "ECMA 262 \\s matches whitespace",
-        "schema": {
-            "type": "string",
-            "pattern": "^\\s$"
-        },
-        "tests": [
-            {
-                "description": "ASCII space matches",
-                "data": " ",
-                "valid": true
-            },
-            {
-                "description": "Character tabulation matches",
-                "data": "\t",
-                "valid": true
-            },
-            {
-                "description": "Line tabulation matches",
-                "data": "\u000b",
-                "valid": true
-            },
-            {
-                "description": "Form feed matches",
-                "data": "\u000c",
-                "valid": true
-            },
-            {
-                "description": "latin-1 non-breaking-space matches",
-                "data": "\u00a0",
-                "valid": true
-            },
-            {
-                "description": "zero-width whitespace matches",
-                "data": "\ufeff",
-                "valid": true
-            },
-            {
-                "description": "line feed matches (line terminator)",
-                "data": "\u000a",
-                "valid": true
-            },
-            {
-                "description": "paragraph separator matches (line terminator)",
-                "data": "\u2029",
-                "valid": true
-            },
-            {
-                "description": "EM SPACE matches (Space_Separator)",
-                "data": "\u2003",
-                "valid": true
-            },
-            {
-                "description": "Non-whitespace control does not match",
-                "data": "\u0001",
-                "valid": false
-            },
-            {
-                "description": "Non-whitespace does not match",
-                "data": "\u2013",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "ECMA 262 \\S matches everything but whitespace",
-        "schema": {
-            "type": "string",
-            "pattern": "^\\S$"
-        },
-        "tests": [
-            {
-                "description": "ASCII space does not match",
-                "data": " ",
-                "valid": false
-            },
-            {
-                "description": "Character tabulation does not match",
-                "data": "\t",
-                "valid": false
-            },
-            {
-                "description": "Line tabulation does not match",
-                "data": "\u000b",
-                "valid": false
-            },
-            {
-                "description": "Form feed does not match",
-                "data": "\u000c",
-                "valid": false
-            },
-            {
-                "description": "latin-1 non-breaking-space does not match",
-                "data": "\u00a0",
-                "valid": false
-            },
-            {
-                "description": "zero-width whitespace does not match",
-                "data": "\ufeff",
-                "valid": false
-            },
-            {
-                "description": "line feed does not match (line terminator)",
-                "data": "\u000a",
-                "valid": false
-            },
-            {
-                "description": "paragraph separator does not match (line terminator)",
-                "data": "\u2029",
-                "valid": false
-            },
-            {
-                "description": "EM SPACE does not match (Space_Separator)",
-                "data": "\u2003",
-                "valid": false
-            },
-            {
-                "description": "Non-whitespace control matches",
-                "data": "\u0001",
-                "valid": true
-            },
-            {
-                "description": "Non-whitespace matches",
-                "data": "\u2013",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "patterns always use unicode semantics with pattern",
-        "schema": { "pattern": "\\p{Letter}cole" },
-        "tests": [
-            {
-                "description": "ascii character in json string",
-                "data": "Les hivers de mon enfance etaient des saisons longues, longues. Nous vivions en trois lieux: l'ecole, l'eglise et la patinoire; mais la vraie vie etait sur la patinoire.",
-                "valid": true
-            },
-            {
-                "description": "literal unicode character in json string",
-                "data": "Les hivers de mon enfance étaient des saisons longues, longues. Nous vivions en trois lieux: l'école, l'église et la patinoire; mais la vraie vie était sur la patinoire.",
-                "valid": true
-            },
-            {
-                "description": "unicode character in hex format in string",
-                "data": "Les hivers de mon enfance étaient des saisons longues, longues. Nous vivions en trois lieux: l'\u00e9cole, l'église et la patinoire; mais la vraie vie était sur la patinoire.",
-                "valid": true
-            },
-            {
-                "description": "unicode matching is case-sensitive",
-                "data": "LES HIVERS DE MON ENFANCE ÉTAIENT DES SAISONS LONGUES, LONGUES. NOUS VIVIONS EN TROIS LIEUX: L'ÉCOLE, L'ÉGLISE ET LA PATINOIRE; MAIS LA VRAIE VIE ÉTAIT SUR LA PATINOIRE.",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "\\w in patterns matches [A-Za-z0-9_], not unicode letters",
-        "schema": { "pattern": "\\wcole" },
-        "tests": [
-            {
-                "description": "ascii character in json string",
-                "data": "Les hivers de mon enfance etaient des saisons longues, longues. Nous vivions en trois lieux: l'ecole, l'eglise et la patinoire; mais la vraie vie etait sur la patinoire.",
-                "valid": true
-            },
-            {
-                "description": "literal unicode character in json string",
-                "data": "Les hivers de mon enfance étaient des saisons longues, longues. Nous vivions en trois lieux: l'école, l'église et la patinoire; mais la vraie vie était sur la patinoire.",
-                "valid": false
-            },
-            {
-                "description": "unicode character in hex format in string",
-                "data": "Les hivers de mon enfance étaient des saisons longues, longues. Nous vivions en trois lieux: l'\u00e9cole, l'église et la patinoire; mais la vraie vie était sur la patinoire.",
-                "valid": false
-            },
-            {
-                "description": "unicode matching is case-sensitive",
-                "data": "LES HIVERS DE MON ENFANCE ÉTAIENT DES SAISONS LONGUES, LONGUES. NOUS VIVIONS EN TROIS LIEUX: L'ÉCOLE, L'ÉGLISE ET LA PATINOIRE; MAIS LA VRAIE VIE ÉTAIT SUR LA PATINOIRE.",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "pattern with ASCII ranges",
-        "schema": { "pattern": "[a-z]cole" },
-        "tests": [
-            {
-                "description": "literal unicode character in json string",
-                "data": "Les hivers de mon enfance étaient des saisons longues, longues. Nous vivions en trois lieux: l'école, l'église et la patinoire; mais la vraie vie était sur la patinoire.",
-                "valid": false
-            },
-            {
-                "description": "unicode character in hex format in string",
-                "data": "Les hivers de mon enfance étaient des saisons longues, longues. Nous vivions en trois lieux: l'\u00e9cole, l'église et la patinoire; mais la vraie vie était sur la patinoire.",
-                "valid": false
-            },
-            {
-                "description": "ascii characters match",
-                "data": "Les hivers de mon enfance etaient des saisons longues, longues. Nous vivions en trois lieux: l'ecole, l'eglise et la patinoire; mais la vraie vie etait sur la patinoire.",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "\\d in pattern matches [0-9], not unicode digits",
-        "schema": { "pattern": "^\\d+$" },
-        "tests": [
-            {
-                "description": "ascii digits",
-                "data": "42",
-                "valid": true
-            },
-            {
-                "description": "ascii non-digits",
-                "data": "-%#",
-                "valid": false
-            },
-            {
-                "description": "non-ascii digits (BENGALI DIGIT FOUR, BENGALI DIGIT TWO)",
-                "data": "৪২",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "pattern with non-ASCII digits",
-        "schema": { "pattern": "^\\p{digit}+$" },
-        "tests": [
-            {
-                "description": "ascii digits",
-                "data": "42",
-                "valid": true
-            },
-            {
-                "description": "ascii non-digits",
-                "data": "-%#",
-                "valid": false
-            },
-            {
-                "description": "non-ascii digits (BENGALI DIGIT FOUR, BENGALI DIGIT TWO)",
-                "data": "৪২",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "patterns always use unicode semantics with patternProperties",
-        "schema": {
-            "type": "object",
-            "patternProperties": {
-                "\\p{Letter}cole": true
-            },
-            "additionalProperties": false
-        },
-        "tests": [
-            {
-                "description": "ascii character in json string",
-                "data": { "l'ecole": "pas de vraie vie" },
-                "valid": true
-            },
-            {
-                "description": "literal unicode character in json string",
-                "data": { "l'école": "pas de vraie vie" },
-                "valid": true
-            },
-            {
-                "description": "unicode character in hex format in string",
-                "data": { "l'\u00e9cole": "pas de vraie vie" },
-                "valid": true
-            },
-            {
-                "description": "unicode matching is case-sensitive",
-                "data": { "L'ÉCOLE": "PAS DE VRAIE VIE" },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "\\w in patternProperties matches [A-Za-z0-9_], not unicode letters",
-        "schema": {
-            "type": "object",
-            "patternProperties": {
-                "\\wcole": true
-            },
-            "additionalProperties": false
-        },
-        "tests": [
-            {
-                "description": "ascii character in json string",
-                "data": { "l'ecole": "pas de vraie vie" },
-                "valid": true
-            },
-            {
-                "description": "literal unicode character in json string",
-                "data": { "l'école": "pas de vraie vie" },
-                "valid": false
-            },
-            {
-                "description": "unicode character in hex format in string",
-                "data": { "l'\u00e9cole": "pas de vraie vie" },
-                "valid": false
-            },
-            {
-                "description": "unicode matching is case-sensitive",
-                "data": { "L'ÉCOLE": "PAS DE VRAIE VIE" },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "patternProperties with ASCII ranges",
-        "schema": {
-            "type": "object",
-            "patternProperties": {
-                "[a-z]cole": true
-            },
-            "additionalProperties": false
-        },
-        "tests": [
-            {
-                "description": "literal unicode character in json string",
-                "data": { "l'école": "pas de vraie vie" },
-                "valid": false
-            },
-            {
-                "description": "unicode character in hex format in string",
-                "data": { "l'\u00e9cole": "pas de vraie vie" },
-                "valid": false
-            },
-            {
-                "description": "ascii characters match",
-                "data": { "l'ecole": "pas de vraie vie" },
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "\\d in patternProperties matches [0-9], not unicode digits",
-        "schema": {
-            "type": "object",
-            "patternProperties": {
-                "^\\d+$": true
-            },
-            "additionalProperties": false
-        },
-        "tests": [
-            {
-                "description": "ascii digits",
-                "data": { "42": "life, the universe, and everything" },
-                "valid": true
-            },
-            {
-                "description": "ascii non-digits",
-                "data": { "-%#": "spending the year dead for tax reasons" },
-                "valid": false
-            },
-            {
-                "description": "non-ascii digits (BENGALI DIGIT FOUR, BENGALI DIGIT TWO)",
-                "data": { "৪২": "khajit has wares if you have coin" },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "patternProperties with non-ASCII digits",
-        "schema": {
-            "type": "object",
-            "patternProperties": {
-                "^\\p{digit}+$": true
-            },
-            "additionalProperties": false
-        },
-        "tests": [
-            {
-                "description": "ascii digits",
-                "data": { "42": "life, the universe, and everything" },
-                "valid": true
-            },
-            {
-                "description": "ascii non-digits",
-                "data": { "-%#": "spending the year dead for tax reasons" },
-                "valid": false
-            },
-            {
-                "description": "non-ascii digits (BENGALI DIGIT FOUR, BENGALI DIGIT TWO)",
-                "data": { "৪২": "khajit has wares if you have coin" },
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft7/optional/float-overflow.json b/json/tests/draft7/optional/float-overflow.json
deleted file mode 100644
index 52ff982..0000000
--- a/json/tests/draft7/optional/float-overflow.json
+++ /dev/null
@@ -1,13 +0,0 @@
-[
-    {
-        "description": "all integers are multiples of 0.5, if overflow is handled",
-        "schema": {"type": "integer", "multipleOf": 0.5},
-        "tests": [
-            {
-                "description": "valid if optional overflow handling is implemented",
-                "data": 1e308,
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft7/optional/format/date-time.json b/json/tests/draft7/optional/format/date-time.json
deleted file mode 100644
index 0911273..0000000
--- a/json/tests/draft7/optional/format/date-time.json
+++ /dev/null
@@ -1,133 +0,0 @@
-[
-    {
-        "description": "validation of date-time strings",
-        "schema": { "format": "date-time" },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            },
-            {
-                "description": "a valid date-time string",
-                "data": "1963-06-19T08:30:06.283185Z",
-                "valid": true
-            },
-            {
-                "description": "a valid date-time string without second fraction",
-                "data": "1963-06-19T08:30:06Z",
-                "valid": true
-            },
-            {
-                "description": "a valid date-time string with plus offset",
-                "data": "1937-01-01T12:00:27.87+00:20",
-                "valid": true
-            },
-            {
-                "description": "a valid date-time string with minus offset",
-                "data": "1990-12-31T15:59:50.123-08:00",
-                "valid": true
-            },
-            {
-                "description": "a valid date-time with a leap second, UTC",
-                "data": "1998-12-31T23:59:60Z",
-                "valid": true
-            },
-            {
-                "description": "a valid date-time with a leap second, with minus offset",
-                "data": "1998-12-31T15:59:60.123-08:00",
-                "valid": true
-            },
-            {
-                "description": "an invalid date-time past leap second, UTC",
-                "data": "1998-12-31T23:59:61Z",
-                "valid": false
-            },
-            {
-                "description": "an invalid date-time with leap second on a wrong minute, UTC",
-                "data": "1998-12-31T23:58:60Z",
-                "valid": false
-            },
-            {
-                "description": "an invalid date-time with leap second on a wrong hour, UTC",
-                "data": "1998-12-31T22:59:60Z",
-                "valid": false
-            },
-            {
-                "description": "an invalid day in date-time string",
-                "data": "1990-02-31T15:59:59.123-08:00",
-                "valid": false
-            },
-            {
-                "description": "an invalid offset in date-time string",
-                "data": "1990-12-31T15:59:59-24:00",
-                "valid": false
-            },
-            {
-                "description": "an invalid closing Z after time-zone offset",
-                "data": "1963-06-19T08:30:06.28123+01:00Z",
-                "valid": false
-            },
-            {
-                "description": "an invalid date-time string",
-                "data": "06/19/1963 08:30:06 PST",
-                "valid": false
-            },
-            {
-                "description": "case-insensitive T and Z",
-                "data": "1963-06-19t08:30:06.283185z",
-                "valid": true
-            },
-            {
-                "description": "only RFC3339 not all of ISO 8601 are valid",
-                "data": "2013-350T01:01:01",
-                "valid": false
-            },
-            {
-                "description": "invalid non-padded month dates",
-                "data": "1963-6-19T08:30:06.283185Z",
-                "valid": false
-            },
-            {
-                "description": "invalid non-padded day dates",
-                "data": "1963-06-1T08:30:06.283185Z",
-                "valid": false
-            },
-            {
-                "description": "invalid non-ASCII '৪' (a Bengali 4) in date portion",
-                "data": "1963-06-1৪T00:00:00Z",
-                "valid": false
-            },
-            {
-                "description": "invalid non-ASCII '৪' (a Bengali 4) in time portion",
-                "data": "1963-06-11T0৪:00:00Z",
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft7/optional/format/date.json b/json/tests/draft7/optional/format/date.json
deleted file mode 100644
index 06c9ea0..0000000
--- a/json/tests/draft7/optional/format/date.json
+++ /dev/null
@@ -1,223 +0,0 @@
-[
-    {
-        "description": "validation of date strings",
-        "schema": { "format": "date" },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            },
-            {
-                "description": "a valid date string",
-                "data": "1963-06-19",
-                "valid": true
-            },
-            {
-                "description": "a valid date string with 31 days in January",
-                "data": "2020-01-31",
-                "valid": true
-            },
-            {
-                "description": "a invalid date string with 32 days in January",
-                "data": "2020-01-32",
-                "valid": false
-            },
-            {
-                "description": "a valid date string with 28 days in February (normal)",
-                "data": "2021-02-28",
-                "valid": true
-            },
-            {
-                "description": "a invalid date string with 29 days in February (normal)",
-                "data": "2021-02-29",
-                "valid": false
-            },
-            {
-                "description": "a valid date string with 29 days in February (leap)",
-                "data": "2020-02-29",
-                "valid": true
-            },
-            {
-                "description": "a invalid date string with 30 days in February (leap)",
-                "data": "2020-02-30",
-                "valid": false
-            },
-            {
-                "description": "a valid date string with 31 days in March",
-                "data": "2020-03-31",
-                "valid": true
-            },
-            {
-                "description": "a invalid date string with 32 days in March",
-                "data": "2020-03-32",
-                "valid": false
-            },
-            {
-                "description": "a valid date string with 30 days in April",
-                "data": "2020-04-30",
-                "valid": true
-            },
-            {
-                "description": "a invalid date string with 31 days in April",
-                "data": "2020-04-31",
-                "valid": false
-            },
-            {
-                "description": "a valid date string with 31 days in May",
-                "data": "2020-05-31",
-                "valid": true
-            },
-            {
-                "description": "a invalid date string with 32 days in May",
-                "data": "2020-05-32",
-                "valid": false
-            },
-            {
-                "description": "a valid date string with 30 days in June",
-                "data": "2020-06-30",
-                "valid": true
-            },
-            {
-                "description": "a invalid date string with 31 days in June",
-                "data": "2020-06-31",
-                "valid": false
-            },
-            {
-                "description": "a valid date string with 31 days in July",
-                "data": "2020-07-31",
-                "valid": true
-            },
-            {
-                "description": "a invalid date string with 32 days in July",
-                "data": "2020-07-32",
-                "valid": false
-            },
-            {
-                "description": "a valid date string with 31 days in August",
-                "data": "2020-08-31",
-                "valid": true
-            },
-            {
-                "description": "a invalid date string with 32 days in August",
-                "data": "2020-08-32",
-                "valid": false
-            },
-            {
-                "description": "a valid date string with 30 days in September",
-                "data": "2020-09-30",
-                "valid": true
-            },
-            {
-                "description": "a invalid date string with 31 days in September",
-                "data": "2020-09-31",
-                "valid": false
-            },
-            {
-                "description": "a valid date string with 31 days in October",
-                "data": "2020-10-31",
-                "valid": true
-            },
-            {
-                "description": "a invalid date string with 32 days in October",
-                "data": "2020-10-32",
-                "valid": false
-            },
-            {
-                "description": "a valid date string with 30 days in November",
-                "data": "2020-11-30",
-                "valid": true
-            },
-            {
-                "description": "a invalid date string with 31 days in November",
-                "data": "2020-11-31",
-                "valid": false
-            },
-            {
-                "description": "a valid date string with 31 days in December",
-                "data": "2020-12-31",
-                "valid": true
-            },
-            {
-                "description": "a invalid date string with 32 days in December",
-                "data": "2020-12-32",
-                "valid": false
-            },
-            {
-                "description": "a invalid date string with invalid month",
-                "data": "2020-13-01",
-                "valid": false
-            },
-            {
-                "description": "an invalid date string",
-                "data": "06/19/1963",
-                "valid": false
-            },
-            {
-                "description": "only RFC3339 not all of ISO 8601 are valid",
-                "data": "2013-350",
-                "valid": false
-            },
-            {
-                "description": "non-padded month dates are not valid",
-                "data": "1998-1-20",
-                "valid": false
-            },
-            {
-                "description": "non-padded day dates are not valid",
-                "data": "1998-01-1",
-                "valid": false
-            },
-            {
-                "description": "invalid month",
-                "data": "1998-13-01",
-                "valid": false
-            },
-            {
-                "description": "invalid month-day combination",
-                "data": "1998-04-31",
-                "valid": false
-            },
-            {
-                "description": "2021 is not a leap year",
-                "data": "2021-02-29",
-                "valid": false
-            },
-            {
-                "description": "2020 is a leap year",
-                "data": "2020-02-29",
-                "valid": true
-            },
-            {
-                "description": "invalid non-ASCII '৪' (a Bengali 4)",
-                "data": "1963-06-1৪",
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft7/optional/format/email.json b/json/tests/draft7/optional/format/email.json
deleted file mode 100644
index d6761a4..0000000
--- a/json/tests/draft7/optional/format/email.json
+++ /dev/null
@@ -1,83 +0,0 @@
-[
-    {
-        "description": "validation of e-mail addresses",
-        "schema": { "format": "email" },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            },
-            {
-                "description": "a valid e-mail address",
-                "data": "joe.bloggs@example.com",
-                "valid": true
-            },
-            {
-                "description": "an invalid e-mail address",
-                "data": "2962",
-                "valid": false
-            },
-            {
-                "description": "tilde in local part is valid",
-                "data": "te~st@example.com",
-                "valid": true
-            },
-            {
-                "description": "tilde before local part is valid",
-                "data": "~test@example.com",
-                "valid": true
-            },
-            {
-                "description": "tilde after local part is valid",
-                "data": "test~@example.com",
-                "valid": true
-            },
-            {
-                "description": "dot before local part is not valid",
-                "data": ".test@example.com",
-                "valid": false
-            },
-            {
-                "description": "dot after local part is not valid",
-                "data": "test.@example.com",
-                "valid": false
-            },
-            {
-                "description": "two separated dots inside local part are valid",
-                "data": "te.s.t@example.com",
-                "valid": true
-            },
-            {
-                "description": "two subsequent dots inside local part are not valid",
-                "data": "te..st@example.com",
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft7/optional/format/hostname.json b/json/tests/draft7/optional/format/hostname.json
deleted file mode 100644
index 8a67fda..0000000
--- a/json/tests/draft7/optional/format/hostname.json
+++ /dev/null
@@ -1,98 +0,0 @@
-[
-    {
-        "description": "validation of host names",
-        "schema": { "format": "hostname" },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            },
-            {
-                "description": "a valid host name",
-                "data": "www.example.com",
-                "valid": true
-            },
-            {
-                "description": "a valid punycoded IDN hostname",
-                "data": "xn--4gbwdl.xn--wgbh1c",
-                "valid": true
-            },
-            {
-                "description": "a host name starting with an illegal character",
-                "data": "-a-host-name-that-starts-with--",
-                "valid": false
-            },
-            {
-                "description": "a host name containing illegal characters",
-                "data": "not_a_valid_host_name",
-                "valid": false
-            },
-            {
-                "description": "a host name with a component too long",
-                "data": "a-vvvvvvvvvvvvvvvveeeeeeeeeeeeeeeerrrrrrrrrrrrrrrryyyyyyyyyyyyyyyy-long-host-name-component",
-                "valid": false
-            },
-            {
-                "description": "starts with hyphen",
-                "data": "-hostname",
-                "valid": false
-            },
-            {
-                "description": "ends with hyphen",
-                "data": "hostname-",
-                "valid": false
-            },
-            {
-                "description": "starts with underscore",
-                "data": "_hostname",
-                "valid": false
-            },
-            {
-                "description": "ends with underscore",
-                "data": "hostname_",
-                "valid": false
-            },
-            {
-                "description": "contains underscore",
-                "data": "host_name",
-                "valid": false
-            },
-            {
-                "description": "maximum label length",
-                "data": "abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijk.com",
-                "valid": true
-            },
-            {
-                "description": "exceeds maximum label length",
-                "data": "abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijkl.com",
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft7/optional/format/idn-email.json b/json/tests/draft7/optional/format/idn-email.json
deleted file mode 100644
index 6e21374..0000000
--- a/json/tests/draft7/optional/format/idn-email.json
+++ /dev/null
@@ -1,58 +0,0 @@
-[
-    {
-        "description": "validation of an internationalized e-mail addresses",
-        "schema": { "format": "idn-email" },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            },
-            {
-                "description": "a valid idn e-mail (example@example.test in Hangul)",
-                "data": "실례@실례.테스트",
-                "valid": true
-            },
-            {
-                "description": "an invalid idn e-mail address",
-                "data": "2962",
-                "valid": false
-            },
-            {
-                "description": "a valid e-mail address",
-                "data": "joe.bloggs@example.com",
-                "valid": true
-            },
-            {
-                "description": "an invalid e-mail address",
-                "data": "2962",
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft7/optional/format/idn-hostname.json b/json/tests/draft7/optional/format/idn-hostname.json
deleted file mode 100644
index 6c8f86a..0000000
--- a/json/tests/draft7/optional/format/idn-hostname.json
+++ /dev/null
@@ -1,304 +0,0 @@
-[
-    {
-        "description": "validation of internationalized host names",
-        "schema": { "format": "idn-hostname" },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            },
-            {
-                "description": "a valid host name (example.test in Hangul)",
-                "data": "실례.테스트",
-                "valid": true
-            },
-            {
-                "description": "illegal first char U+302E Hangul single dot tone mark",
-                "data": "〮실례.테스트",
-                "valid": false
-            },
-            {
-                "description": "contains illegal char U+302E Hangul single dot tone mark",
-                "data": "실〮례.테스트",
-                "valid": false
-            },
-            {
-                "description": "a host name with a component too long",
-                "data": "실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실례례테스트례례례례례례례례례례례례례례례례례테스트례례례례례례례례례례례례례례례례례례례테스트례례례례례례례례례례례례테스트례례실례.테스트",
-                "valid": false
-            },
-            {
-                "description": "invalid label, correct Punycode",
-                "comment": "https://tools.ietf.org/html/rfc5890#section-2.3.2.1 https://tools.ietf.org/html/rfc5891#section-4.4 https://tools.ietf.org/html/rfc3492#section-7.1",
-                "data": "-> $1.00 <--",
-                "valid": false
-            },
-            {
-                "description": "valid Chinese Punycode",
-                "comment": "https://tools.ietf.org/html/rfc5890#section-2.3.2.1 https://tools.ietf.org/html/rfc5891#section-4.4",
-                "data": "xn--ihqwcrb4cv8a8dqg056pqjye",
-                "valid": true
-            },
-            {
-                "description": "invalid Punycode",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.4 https://tools.ietf.org/html/rfc5890#section-2.3.2.1",
-                "data": "xn--X",
-                "valid": false
-            },
-            {
-                "description": "U-label contains \"--\" in the 3rd and 4th position",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.2.3.1 https://tools.ietf.org/html/rfc5890#section-2.3.2.1",
-                "data": "XN--aa---o47jg78q",
-                "valid": false
-            },
-            {
-                "description": "U-label starts with a dash",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.2.3.1",
-                "data": "-hello",
-                "valid": false
-            },
-            {
-                "description": "U-label ends with a dash",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.2.3.1",
-                "data": "hello-",
-                "valid": false
-            },
-            {
-                "description": "U-label starts and ends with a dash",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.2.3.1",
-                "data": "-hello-",
-                "valid": false
-            },
-            {
-                "description": "Begins with a Spacing Combining Mark",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.2.3.2",
-                "data": "\u0903hello",
-                "valid": false
-            },
-            {
-                "description": "Begins with a Nonspacing Mark",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.2.3.2",
-                "data": "\u0300hello",
-                "valid": false
-            },
-            {
-                "description": "Begins with an Enclosing Mark",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.2.3.2",
-                "data": "\u0488hello",
-                "valid": false
-            },
-            {
-                "description": "Exceptions that are PVALID, left-to-right chars",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.2.2 https://tools.ietf.org/html/rfc5892#section-2.6",
-                "data": "\u00df\u03c2\u0f0b\u3007",
-                "valid": true
-            },
-            {
-                "description": "Exceptions that are PVALID, right-to-left chars",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.2.2 https://tools.ietf.org/html/rfc5892#section-2.6",
-                "data": "\u06fd\u06fe",
-                "valid": true
-            },
-            {
-                "description": "Exceptions that are DISALLOWED, right-to-left chars",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.2.2 https://tools.ietf.org/html/rfc5892#section-2.6",
-                "data": "\u0640\u07fa",
-                "valid": false
-            },
-            {
-                "description": "Exceptions that are DISALLOWED, left-to-right chars",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.2.2 https://tools.ietf.org/html/rfc5892#section-2.6 Note: The two combining marks (U+302E and U+302F) are in the middle and not at the start",
-                "data": "\u3031\u3032\u3033\u3034\u3035\u302e\u302f\u303b",
-                "valid": false
-            },
-            {
-                "description": "MIDDLE DOT with no preceding 'l'",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.2.3.3 https://tools.ietf.org/html/rfc5892#appendix-A.3",
-                "data": "a\u00b7l",
-                "valid": false
-            },
-            {
-                "description": "MIDDLE DOT with nothing preceding",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.2.3.3 https://tools.ietf.org/html/rfc5892#appendix-A.3",
-                "data": "\u00b7l",
-                "valid": false
-            },
-            {
-                "description": "MIDDLE DOT with no following 'l'",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.2.3.3 https://tools.ietf.org/html/rfc5892#appendix-A.3",
-                "data": "l\u00b7a",
-                "valid": false
-            },
-            {
-                "description": "MIDDLE DOT with nothing following",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.2.3.3 https://tools.ietf.org/html/rfc5892#appendix-A.3",
-                "data": "l\u00b7",
-                "valid": false
-            },
-            {
-                "description": "MIDDLE DOT with surrounding 'l's",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.2.3.3 https://tools.ietf.org/html/rfc5892#appendix-A.3",
-                "data": "l\u00b7l",
-                "valid": true
-            },
-            {
-                "description": "Greek KERAIA not followed by Greek",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.2.3.3 https://tools.ietf.org/html/rfc5892#appendix-A.4",
-                "data": "\u03b1\u0375S",
-                "valid": false
-            },
-            {
-                "description": "Greek KERAIA not followed by anything",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.2.3.3 https://tools.ietf.org/html/rfc5892#appendix-A.4",
-                "data": "\u03b1\u0375",
-                "valid": false
-            },
-            {
-                "description": "Greek KERAIA followed by Greek",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.2.3.3 https://tools.ietf.org/html/rfc5892#appendix-A.4",
-                "data": "\u03b1\u0375\u03b2",
-                "valid": true
-            },
-            {
-                "description": "Hebrew GERESH not preceded by Hebrew",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.2.3.3 https://tools.ietf.org/html/rfc5892#appendix-A.5",
-                "data": "A\u05f3\u05d1",
-                "valid": false
-            },
-            {
-                "description": "Hebrew GERESH not preceded by anything",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.2.3.3 https://tools.ietf.org/html/rfc5892#appendix-A.5",
-                "data": "\u05f3\u05d1",
-                "valid": false
-            },
-            {
-                "description": "Hebrew GERESH preceded by Hebrew",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.2.3.3 https://tools.ietf.org/html/rfc5892#appendix-A.5",
-                "data": "\u05d0\u05f3\u05d1",
-                "valid": true
-            },
-            {
-                "description": "Hebrew GERSHAYIM not preceded by Hebrew",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.2.3.3 https://tools.ietf.org/html/rfc5892#appendix-A.6",
-                "data": "A\u05f4\u05d1",
-                "valid": false
-            },
-            {
-                "description": "Hebrew GERSHAYIM not preceded by anything",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.2.3.3 https://tools.ietf.org/html/rfc5892#appendix-A.6",
-                "data": "\u05f4\u05d1",
-                "valid": false
-            },
-            {
-                "description": "Hebrew GERSHAYIM preceded by Hebrew",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.2.3.3 https://tools.ietf.org/html/rfc5892#appendix-A.6",
-                "data": "\u05d0\u05f4\u05d1",
-                "valid": true
-            },
-            {
-                "description": "KATAKANA MIDDLE DOT with no Hiragana, Katakana, or Han",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.2.3.3 https://tools.ietf.org/html/rfc5892#appendix-A.7",
-                "data": "def\u30fbabc",
-                "valid": false
-            },
-            {
-                "description": "KATAKANA MIDDLE DOT with no other characters",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.2.3.3 https://tools.ietf.org/html/rfc5892#appendix-A.7",
-                "data": "\u30fb",
-                "valid": false
-            },
-            {
-                "description": "KATAKANA MIDDLE DOT with Hiragana",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.2.3.3 https://tools.ietf.org/html/rfc5892#appendix-A.7",
-                "data": "\u30fb\u3041",
-                "valid": true
-            },
-            {
-                "description": "KATAKANA MIDDLE DOT with Katakana",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.2.3.3 https://tools.ietf.org/html/rfc5892#appendix-A.7",
-                "data": "\u30fb\u30a1",
-                "valid": true
-            },
-            {
-                "description": "KATAKANA MIDDLE DOT with Han",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.2.3.3 https://tools.ietf.org/html/rfc5892#appendix-A.7",
-                "data": "\u30fb\u4e08",
-                "valid": true
-            },
-            {
-                "description": "Arabic-Indic digits mixed with Extended Arabic-Indic digits",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.2.3.3 https://tools.ietf.org/html/rfc5892#appendix-A.8",
-                "data": "\u0660\u06f0",
-                "valid": false
-            },
-            {
-                "description": "Arabic-Indic digits not mixed with Extended Arabic-Indic digits",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.2.3.3 https://tools.ietf.org/html/rfc5892#appendix-A.8",
-                "data": "\u0628\u0660\u0628",
-                "valid": true
-            },
-            {
-                "description": "Extended Arabic-Indic digits not mixed with Arabic-Indic digits",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.2.3.3 https://tools.ietf.org/html/rfc5892#appendix-A.9",
-                "data": "\u06f00",
-                "valid": true
-            },
-            {
-                "description": "ZERO WIDTH JOINER not preceded by Virama",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.2.3.3 https://tools.ietf.org/html/rfc5892#appendix-A.2 https://www.unicode.org/review/pr-37.pdf",
-                "data": "\u0915\u200d\u0937",
-                "valid": false
-            },
-            {
-                "description": "ZERO WIDTH JOINER not preceded by anything",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.2.3.3 https://tools.ietf.org/html/rfc5892#appendix-A.2 https://www.unicode.org/review/pr-37.pdf",
-                "data": "\u200d\u0937",
-                "valid": false
-            },
-            {
-                "description": "ZERO WIDTH JOINER preceded by Virama",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.2.3.3 https://tools.ietf.org/html/rfc5892#appendix-A.2 https://www.unicode.org/review/pr-37.pdf",
-                "data": "\u0915\u094d\u200d\u0937",
-                "valid": true
-            },
-            {
-                "description": "ZERO WIDTH NON-JOINER preceded by Virama",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.2.3.3 https://tools.ietf.org/html/rfc5892#appendix-A.1",
-                "data": "\u0915\u094d\u200c\u0937",
-                "valid": true
-            },
-            {
-                "description": "ZERO WIDTH NON-JOINER not preceded by Virama but matches regexp",
-                "comment": "https://tools.ietf.org/html/rfc5891#section-4.2.3.3 https://tools.ietf.org/html/rfc5892#appendix-A.1 https://www.w3.org/TR/alreq/#h_disjoining_enforcement",
-                "data": "\u0628\u064a\u200c\u0628\u064a",
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft7/optional/format/ipv4.json b/json/tests/draft7/optional/format/ipv4.json
deleted file mode 100644
index 4706581..0000000
--- a/json/tests/draft7/optional/format/ipv4.json
+++ /dev/null
@@ -1,84 +0,0 @@
-[
-    {
-        "description": "validation of IP addresses",
-        "schema": { "format": "ipv4" },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            },
-            {
-                "description": "a valid IP address",
-                "data": "192.168.0.1",
-                "valid": true
-            },
-            {
-                "description": "an IP address with too many components",
-                "data": "127.0.0.0.1",
-                "valid": false
-            },
-            {
-                "description": "an IP address with out-of-range values",
-                "data": "256.256.256.256",
-                "valid": false
-            },
-            {
-                "description": "an IP address without 4 components",
-                "data": "127.0",
-                "valid": false
-            },
-            {
-                "description": "an IP address as an integer",
-                "data": "0x7f000001",
-                "valid": false
-            },
-            {
-                "description": "an IP address as an integer (decimal)",
-                "data": "2130706433",
-                "valid": false
-            },
-            {
-                "description": "invalid leading zeroes, as they are treated as octals",
-                "comment": "see https://sick.codes/universal-netmask-npm-package-used-by-270000-projects-vulnerable-to-octal-input-data-server-side-request-forgery-remote-file-inclusion-local-file-inclusion-and-more-cve-2021-28918/",
-                "data": "087.10.0.1",
-                "valid": false
-            },
-            {
-                "description": "value without leading zero is valid",
-                "data": "87.10.0.1",
-                "valid": true
-            },
-            {
-                "description": "invalid non-ASCII '২' (a Bengali 2)",
-                "data": "1২7.0.0.1",
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft7/optional/format/ipv6.json b/json/tests/draft7/optional/format/ipv6.json
deleted file mode 100644
index 94368f2..0000000
--- a/json/tests/draft7/optional/format/ipv6.json
+++ /dev/null
@@ -1,208 +0,0 @@
-[
-    {
-        "description": "validation of IPv6 addresses",
-        "schema": { "format": "ipv6" },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            },
-            {
-                "description": "a valid IPv6 address",
-                "data": "::1",
-                "valid": true
-            },
-            {
-                "description": "an IPv6 address with out-of-range values",
-                "data": "12345::",
-                "valid": false
-            },
-            {
-                "description": "trailing 4 hex symbols is valid",
-                "data": "::abef",
-                "valid": true
-            },
-            {
-                "description": "trailing 5 hex symbols is invalid",
-                "data": "::abcef",
-                "valid": false
-            },
-            {
-                "description": "an IPv6 address with too many components",
-                "data": "1:1:1:1:1:1:1:1:1:1:1:1:1:1:1:1",
-                "valid": false
-            },
-            {
-                "description": "an IPv6 address containing illegal characters",
-                "data": "::laptop",
-                "valid": false
-            },
-            {
-                "description": "no digits is valid",
-                "data": "::",
-                "valid": true
-            },
-            {
-                "description": "leading colons is valid",
-                "data": "::42:ff:1",
-                "valid": true
-            },
-            {
-                "description": "trailing colons is valid",
-                "data": "d6::",
-                "valid": true
-            },
-            {
-                "description": "missing leading octet is invalid",
-                "data": ":2:3:4:5:6:7:8",
-                "valid": false
-            },
-            {
-                "description": "missing trailing octet is invalid",
-                "data": "1:2:3:4:5:6:7:",
-                "valid": false
-            },
-            {
-                "description": "missing leading octet with omitted octets later",
-                "data": ":2:3:4::8",
-                "valid": false
-            },
-            {
-                "description": "single set of double colons in the middle is valid",
-                "data": "1:d6::42",
-                "valid": true
-            },
-            {
-                "description": "two sets of double colons is invalid",
-                "data": "1::d6::42",
-                "valid": false
-            },
-            {
-                "description": "mixed format with the ipv4 section as decimal octets",
-                "data": "1::d6:192.168.0.1",
-                "valid": true
-            },
-            {
-                "description": "mixed format with double colons between the sections",
-                "data": "1:2::192.168.0.1",
-                "valid": true
-            },
-            {
-                "description": "mixed format with ipv4 section with octet out of range",
-                "data": "1::2:192.168.256.1",
-                "valid": false
-            },
-            {
-                "description": "mixed format with ipv4 section with a hex octet",
-                "data": "1::2:192.168.ff.1",
-                "valid": false
-            },
-            {
-                "description": "mixed format with leading double colons (ipv4-mapped ipv6 address)",
-                "data": "::ffff:192.168.0.1",
-                "valid": true
-            },
-            {
-                "description": "triple colons is invalid",
-                "data": "1:2:3:4:5:::8",
-                "valid": false
-            },
-            {
-                "description": "8 octets",
-                "data": "1:2:3:4:5:6:7:8",
-                "valid": true
-            },
-            {
-                "description": "insufficient octets without double colons",
-                "data": "1:2:3:4:5:6:7",
-                "valid": false
-            },
-            {
-                "description": "no colons is invalid",
-                "data": "1",
-                "valid": false
-            },
-            {
-                "description": "ipv4 is not ipv6",
-                "data": "127.0.0.1",
-                "valid": false
-            },
-            {
-                "description": "ipv4 segment must have 4 octets",
-                "data": "1:2:3:4:1.2.3",
-                "valid": false
-            },
-            {
-                "description": "leading whitespace is invalid",
-                "data": "  ::1",
-                "valid": false
-            },
-            {
-                "description": "trailing whitespace is invalid",
-                "data": "::1  ",
-                "valid": false
-            },
-            {
-                "description": "netmask is not a part of ipv6 address",
-                "data": "fe80::/64",
-                "valid": false
-            },
-            {
-                "description": "zone id is not a part of ipv6 address",
-                "data": "fe80::a%eth1",
-                "valid": false
-            },
-            {
-                "description": "a long valid ipv6",
-                "data": "1000:1000:1000:1000:1000:1000:255.255.255.255",
-                "valid": true
-            },
-            {
-                "description": "a long invalid ipv6, below length limit, first",
-                "data": "100:100:100:100:100:100:255.255.255.255.255",
-                "valid": false
-            },
-            {
-                "description": "a long invalid ipv6, below length limit, second",
-                "data": "100:100:100:100:100:100:100:255.255.255.255",
-                "valid": false
-            },
-            {
-                "description": "invalid non-ASCII '৪' (a Bengali 4)",
-                "data": "1:2:3:4:5:6:7:৪",
-                "valid": false
-            },
-            {
-                "description": "invalid non-ASCII '৪' (a Bengali 4) in the IPv4 portion",
-                "data": "1:2::192.16৪.0.1",
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft7/optional/format/iri-reference.json b/json/tests/draft7/optional/format/iri-reference.json
deleted file mode 100644
index c6b4c22..0000000
--- a/json/tests/draft7/optional/format/iri-reference.json
+++ /dev/null
@@ -1,73 +0,0 @@
-[
-    {
-        "description": "validation of IRI References",
-        "schema": { "format": "iri-reference" },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            },
-            {
-                "description": "a valid IRI",
-                "data": "http://ƒøø.ßår/?∂éœ=πîx#πîüx",
-                "valid": true
-            },
-            {
-                "description": "a valid protocol-relative IRI Reference",
-                "data": "//ƒøø.ßår/?∂éœ=πîx#πîüx",
-                "valid": true
-            },
-            {
-                "description": "a valid relative IRI Reference",
-                "data": "/âππ",
-                "valid": true
-            },
-            {
-                "description": "an invalid IRI Reference",
-                "data": "\\\\WINDOWS\\filëßåré",
-                "valid": false
-            },
-            {
-                "description": "a valid IRI Reference",
-                "data": "âππ",
-                "valid": true
-            },
-            {
-                "description": "a valid IRI fragment",
-                "data": "#ƒrägmênt",
-                "valid": true
-            },
-            {
-                "description": "an invalid IRI fragment",
-                "data": "#ƒräg\\mênt",
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft7/optional/format/iri.json b/json/tests/draft7/optional/format/iri.json
deleted file mode 100644
index a0d12ae..0000000
--- a/json/tests/draft7/optional/format/iri.json
+++ /dev/null
@@ -1,83 +0,0 @@
-[
-    {
-        "description": "validation of IRIs",
-        "schema": { "format": "iri" },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            },
-            {
-                "description": "a valid IRI with anchor tag",
-                "data": "http://ƒøø.ßår/?∂éœ=πîx#πîüx",
-                "valid": true
-            },
-            {
-                "description": "a valid IRI with anchor tag and parentheses",
-                "data": "http://ƒøø.com/blah_(wîkïpédiå)_blah#ßité-1",
-                "valid": true
-            },
-            {
-                "description": "a valid IRI with URL-encoded stuff",
-                "data": "http://ƒøø.ßår/?q=Test%20URL-encoded%20stuff",
-                "valid": true
-            },
-            {
-                "description": "a valid IRI with many special characters",
-                "data": "http://-.~_!$&'()*+,;=:%40:80%2f::::::@example.com",
-                "valid": true
-            },
-            {
-                "description": "a valid IRI based on IPv6",
-                "data": "http://[2001:0db8:85a3:0000:0000:8a2e:0370:7334]",
-                "valid": true
-            },
-            {
-                "description": "an invalid IRI based on IPv6",
-                "data": "http://2001:0db8:85a3:0000:0000:8a2e:0370:7334",
-                "valid": false
-            },
-            {
-                "description": "an invalid relative IRI Reference",
-                "data": "/abc",
-                "valid": false
-            },
-            {
-                "description": "an invalid IRI",
-                "data": "\\\\WINDOWS\\filëßåré",
-                "valid": false
-            },
-            {
-                "description": "an invalid IRI though valid IRI reference",
-                "data": "âππ",
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft7/optional/format/json-pointer.json b/json/tests/draft7/optional/format/json-pointer.json
deleted file mode 100644
index a0346b5..0000000
--- a/json/tests/draft7/optional/format/json-pointer.json
+++ /dev/null
@@ -1,198 +0,0 @@
-[
-    {
-        "description": "validation of JSON-pointers (JSON String Representation)",
-        "schema": { "format": "json-pointer" },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            },
-            {
-                "description": "a valid JSON-pointer",
-                "data": "/foo/bar~0/baz~1/%a",
-                "valid": true
-            },
-            {
-                "description": "not a valid JSON-pointer (~ not escaped)",
-                "data": "/foo/bar~",
-                "valid": false
-            },
-            {
-                "description": "valid JSON-pointer with empty segment",
-                "data": "/foo//bar",
-                "valid": true
-            },
-            {
-                "description": "valid JSON-pointer with the last empty segment",
-                "data": "/foo/bar/",
-                "valid": true
-            },
-            {
-                "description": "valid JSON-pointer as stated in RFC 6901 #1",
-                "data": "",
-                "valid": true
-            },
-            {
-                "description": "valid JSON-pointer as stated in RFC 6901 #2",
-                "data": "/foo",
-                "valid": true
-            },
-            {
-                "description": "valid JSON-pointer as stated in RFC 6901 #3",
-                "data": "/foo/0",
-                "valid": true
-            },
-            {
-                "description": "valid JSON-pointer as stated in RFC 6901 #4",
-                "data": "/",
-                "valid": true
-            },
-            {
-                "description": "valid JSON-pointer as stated in RFC 6901 #5",
-                "data": "/a~1b",
-                "valid": true
-            },
-            {
-                "description": "valid JSON-pointer as stated in RFC 6901 #6",
-                "data": "/c%d",
-                "valid": true
-            },
-            {
-                "description": "valid JSON-pointer as stated in RFC 6901 #7",
-                "data": "/e^f",
-                "valid": true
-            },
-            {
-                "description": "valid JSON-pointer as stated in RFC 6901 #8",
-                "data": "/g|h",
-                "valid": true
-            },
-            {
-                "description": "valid JSON-pointer as stated in RFC 6901 #9",
-                "data": "/i\\j",
-                "valid": true
-            },
-            {
-                "description": "valid JSON-pointer as stated in RFC 6901 #10",
-                "data": "/k\"l",
-                "valid": true
-            },
-            {
-                "description": "valid JSON-pointer as stated in RFC 6901 #11",
-                "data": "/ ",
-                "valid": true
-            },
-            {
-                "description": "valid JSON-pointer as stated in RFC 6901 #12",
-                "data": "/m~0n",
-                "valid": true
-            },
-            {
-                "description": "valid JSON-pointer used adding to the last array position",
-                "data": "/foo/-",
-                "valid": true
-            },
-            {
-                "description": "valid JSON-pointer (- used as object member name)",
-                "data": "/foo/-/bar",
-                "valid": true
-            },
-            {
-                "description": "valid JSON-pointer (multiple escaped characters)",
-                "data": "/~1~0~0~1~1",
-                "valid": true
-            },
-            {
-                "description": "valid JSON-pointer (escaped with fraction part) #1",
-                "data": "/~1.1",
-                "valid": true
-            },
-            {
-                "description": "valid JSON-pointer (escaped with fraction part) #2",
-                "data": "/~0.1",
-                "valid": true
-            },
-            {
-                "description": "not a valid JSON-pointer (URI Fragment Identifier) #1",
-                "data": "#",
-                "valid": false
-            },
-            {
-                "description": "not a valid JSON-pointer (URI Fragment Identifier) #2",
-                "data": "#/",
-                "valid": false
-            },
-            {
-                "description": "not a valid JSON-pointer (URI Fragment Identifier) #3",
-                "data": "#a",
-                "valid": false
-            },
-            {
-                "description": "not a valid JSON-pointer (some escaped, but not all) #1",
-                "data": "/~0~",
-                "valid": false
-            },
-            {
-                "description": "not a valid JSON-pointer (some escaped, but not all) #2",
-                "data": "/~0/~",
-                "valid": false
-            },
-            {
-                "description": "not a valid JSON-pointer (wrong escape character) #1",
-                "data": "/~2",
-                "valid": false
-            },
-            {
-                "description": "not a valid JSON-pointer (wrong escape character) #2",
-                "data": "/~-1",
-                "valid": false
-            },
-            {
-                "description": "not a valid JSON-pointer (multiple characters not escaped)",
-                "data": "/~~",
-                "valid": false
-            },
-            {
-                "description": "not a valid JSON-pointer (isn't empty nor starts with /) #1",
-                "data": "a",
-                "valid": false
-            },
-            {
-                "description": "not a valid JSON-pointer (isn't empty nor starts with /) #2",
-                "data": "0",
-                "valid": false
-            },
-            {
-                "description": "not a valid JSON-pointer (isn't empty nor starts with /) #3",
-                "data": "a/a",
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft7/optional/format/regex.json b/json/tests/draft7/optional/format/regex.json
deleted file mode 100644
index 3449177..0000000
--- a/json/tests/draft7/optional/format/regex.json
+++ /dev/null
@@ -1,48 +0,0 @@
-[
-    {
-        "description": "validation of regular expressions",
-        "schema": { "format": "regex" },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            },
-            {
-                "description": "a valid regular expression",
-                "data": "([abc])+\\s+$",
-                "valid": true
-            },
-            {
-                "description": "a regular expression with unclosed parens is invalid",
-                "data": "^(abc]",
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft7/optional/format/relative-json-pointer.json b/json/tests/draft7/optional/format/relative-json-pointer.json
deleted file mode 100644
index e50e505..0000000
--- a/json/tests/draft7/optional/format/relative-json-pointer.json
+++ /dev/null
@@ -1,98 +0,0 @@
-[
-    {
-        "description": "validation of Relative JSON Pointers (RJP)",
-        "schema": { "format": "relative-json-pointer" },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            },
-            {
-                "description": "a valid upwards RJP",
-                "data": "1",
-                "valid": true
-            },
-            {
-                "description": "a valid downwards RJP",
-                "data": "0/foo/bar",
-                "valid": true
-            },
-            {
-                "description": "a valid up and then down RJP, with array index",
-                "data": "2/0/baz/1/zip",
-                "valid": true
-            },
-            {
-                "description": "a valid RJP taking the member or index name",
-                "data": "0#",
-                "valid": true
-            },
-            {
-                "description": "an invalid RJP that is a valid JSON Pointer",
-                "data": "/foo/bar",
-                "valid": false
-            },
-            {
-                "description": "negative prefix",
-                "data": "-1/foo/bar",
-                "valid": false
-            },
-            {
-                "description": "explicit positive prefix",
-                "data": "+1/foo/bar",
-                "valid": false
-            },
-            {
-                "description": "## is not a valid json-pointer",
-                "data": "0##",
-                "valid": false
-            },
-            {
-                "description": "zero cannot be followed by other digits, plus json-pointer",
-                "data": "01/a",
-                "valid": false
-            },
-            {
-                "description": "zero cannot be followed by other digits, plus octothorpe",
-                "data": "01#",
-                "valid": false
-            },
-            {
-                "description": "empty string",
-                "data": "",
-                "valid": false
-            },
-            {
-                "description": "multi-digit integer prefix",
-                "data": "120/foo/bar",
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft7/optional/format/time.json b/json/tests/draft7/optional/format/time.json
deleted file mode 100644
index 920db61..0000000
--- a/json/tests/draft7/optional/format/time.json
+++ /dev/null
@@ -1,213 +0,0 @@
-[
-    {
-        "description": "validation of time strings",
-        "schema": { "format": "time" },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            },
-            {
-                "description": "a valid time string",
-                "data": "08:30:06Z",
-                "valid": true
-            },
-            {
-                "description": "a valid time string with leap second, Zulu",
-                "data": "23:59:60Z",
-                "valid": true
-            },
-            {
-                "description": "invalid leap second, Zulu (wrong hour)",
-                "data": "22:59:60Z",
-                "valid": false
-            },
-            {
-                "description": "invalid leap second, Zulu (wrong minute)",
-                "data": "23:58:60Z",
-                "valid": false
-            },
-            {
-                "description": "valid leap second, zero time-offset",
-                "data": "23:59:60+00:00",
-                "valid": true
-            },
-            {
-                "description": "invalid leap second, zero time-offset (wrong hour)",
-                "data": "22:59:60+00:00",
-                "valid": false
-            },
-            {
-                "description": "invalid leap second, zero time-offset (wrong minute)",
-                "data": "23:58:60+00:00",
-                "valid": false
-            },
-            {
-                "description": "valid leap second, positive time-offset",
-                "data": "01:29:60+01:30",
-                "valid": true
-            },
-            {
-                "description": "valid leap second, large positive time-offset",
-                "data": "23:29:60+23:30",
-                "valid": true
-            },
-            {
-                "description": "invalid leap second, positive time-offset (wrong hour)",
-                "data": "23:59:60+01:00",
-                "valid": false
-            },
-            {
-                "description": "invalid leap second, positive time-offset (wrong minute)",
-                "data": "23:59:60+00:30",
-                "valid": false
-            },
-            {
-                "description": "valid leap second, negative time-offset",
-                "data": "15:59:60-08:00",
-                "valid": true
-            },
-            {
-                "description": "valid leap second, large negative time-offset",
-                "data": "00:29:60-23:30",
-                "valid": true
-            },
-            {
-                "description": "invalid leap second, negative time-offset (wrong hour)",
-                "data": "23:59:60-01:00",
-                "valid": false
-            },
-            {
-                "description": "invalid leap second, negative time-offset (wrong minute)",
-                "data": "23:59:60-00:30",
-                "valid": false
-            },
-            {
-                "description": "a valid time string with second fraction",
-                "data": "23:20:50.52Z",
-                "valid": true
-            },
-            {
-                "description": "a valid time string with precise second fraction",
-                "data": "08:30:06.283185Z",
-                "valid": true
-            },
-            {
-                "description": "a valid time string with plus offset",
-                "data": "08:30:06+00:20",
-                "valid": true
-            },
-            {
-                "description": "a valid time string with minus offset",
-                "data": "08:30:06-08:00",
-                "valid": true
-            },
-            {
-                "description": "a valid time string with case-insensitive Z",
-                "data": "08:30:06z",
-                "valid": true
-            },
-            {
-                "description": "an invalid time string with invalid hour",
-                "data": "24:00:00Z",
-                "valid": false
-            },
-            {
-                "description": "an invalid time string with invalid minute",
-                "data": "00:60:00Z",
-                "valid": false
-            },
-            {
-                "description": "an invalid time string with invalid second",
-                "data": "00:00:61Z",
-                "valid": false
-            },
-            {
-                "description": "an invalid time string with invalid leap second (wrong hour)",
-                "data": "22:59:60Z",
-                "valid": false
-            },
-            {
-                "description": "an invalid time string with invalid leap second (wrong minute)",
-                "data": "23:58:60Z",
-                "valid": false
-            },
-            {
-                "description": "an invalid time string with invalid time numoffset hour",
-                "data": "01:02:03+24:00",
-                "valid": false
-            },
-            {
-                "description": "an invalid time string with invalid time numoffset minute",
-                "data": "01:02:03+00:60",
-                "valid": false
-            },
-            {
-                "description": "an invalid time string with invalid time with both Z and numoffset",
-                "data": "01:02:03Z+00:30",
-                "valid": false
-            },
-            {
-                "description": "an invalid offset indicator",
-                "data": "08:30:06 PST",
-                "valid": false
-            },
-            {
-                "description": "only RFC3339 not all of ISO 8601 are valid",
-                "data": "01:01:01,1111",
-                "valid": false
-            },
-            {
-                "description": "no time offset",
-                "data": "12:00:00",
-                "valid": false
-            },
-            {
-                "description": "no time offset with second fraction",
-                "data": "12:00:00.52",
-                "valid": false
-            },
-            {
-                "description": "invalid non-ASCII '২' (a Bengali 2)",
-                "data": "1২:00:00Z",
-                "valid": false
-            },
-            {
-                "description": "offset not starting with plus or minus",
-                "data": "08:30:06#00:20",
-                "valid": false
-            },
-            {
-                "description": "contains letters",
-                "data": "ab:cd:ef",
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft7/optional/format/unknown.json b/json/tests/draft7/optional/format/unknown.json
deleted file mode 100644
index 12339ae..0000000
--- a/json/tests/draft7/optional/format/unknown.json
+++ /dev/null
@@ -1,43 +0,0 @@
-[
-    {
-        "description": "unknown format",
-        "schema": { "format": "unknown" },
-        "tests": [
-            {
-                "description": "unknown formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "unknown formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "unknown formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "unknown formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "unknown formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "unknown formats ignore nulls",
-                "data": null,
-                "valid": true
-            },
-            {
-                "description": "unknown formats ignore strings",
-                "data": "string",
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft7/optional/format/uri-reference.json b/json/tests/draft7/optional/format/uri-reference.json
deleted file mode 100644
index 7cdf228..0000000
--- a/json/tests/draft7/optional/format/uri-reference.json
+++ /dev/null
@@ -1,73 +0,0 @@
-[
-    {
-        "description": "validation of URI References",
-        "schema": { "format": "uri-reference" },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            },
-            {
-                "description": "a valid URI",
-                "data": "http://foo.bar/?baz=qux#quux",
-                "valid": true
-            },
-            {
-                "description": "a valid protocol-relative URI Reference",
-                "data": "//foo.bar/?baz=qux#quux",
-                "valid": true
-            },
-            {
-                "description": "a valid relative URI Reference",
-                "data": "/abc",
-                "valid": true
-            },
-            {
-                "description": "an invalid URI Reference",
-                "data": "\\\\WINDOWS\\fileshare",
-                "valid": false
-            },
-            {
-                "description": "a valid URI Reference",
-                "data": "abc",
-                "valid": true
-            },
-            {
-                "description": "a valid URI fragment",
-                "data": "#fragment",
-                "valid": true
-            },
-            {
-                "description": "an invalid URI fragment",
-                "data": "#frag\\ment",
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft7/optional/format/uri-template.json b/json/tests/draft7/optional/format/uri-template.json
deleted file mode 100644
index df355c5..0000000
--- a/json/tests/draft7/optional/format/uri-template.json
+++ /dev/null
@@ -1,58 +0,0 @@
-[
-    {
-        "description": "format: uri-template",
-        "schema": { "format": "uri-template" },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            },
-            {
-                "description": "a valid uri-template",
-                "data": "http://example.com/dictionary/{term:1}/{term}",
-                "valid": true
-            },
-            {
-                "description": "an invalid uri-template",
-                "data": "http://example.com/dictionary/{term:1}/{term",
-                "valid": false
-            },
-            {
-                "description": "a valid uri-template without variables",
-                "data": "http://example.com/dictionary",
-                "valid": true
-            },
-            {
-                "description": "a valid relative uri-template",
-                "data": "dictionary/{term:1}/{term}",
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft7/optional/format/uri.json b/json/tests/draft7/optional/format/uri.json
deleted file mode 100644
index 4b48d40..0000000
--- a/json/tests/draft7/optional/format/uri.json
+++ /dev/null
@@ -1,138 +0,0 @@
-[
-    {
-        "description": "validation of URIs",
-        "schema": { "format": "uri" },
-        "tests": [
-            {
-                "description": "all string formats ignore integers",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore floats",
-                "data": 13.7,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore booleans",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "all string formats ignore nulls",
-                "data": null,
-                "valid": true
-            },
-            {
-                "description": "a valid URL with anchor tag",
-                "data": "http://foo.bar/?baz=qux#quux",
-                "valid": true
-            },
-            {
-                "description": "a valid URL with anchor tag and parentheses",
-                "data": "http://foo.com/blah_(wikipedia)_blah#cite-1",
-                "valid": true
-            },
-            {
-                "description": "a valid URL with URL-encoded stuff",
-                "data": "http://foo.bar/?q=Test%20URL-encoded%20stuff",
-                "valid": true
-            },
-            {
-                "description": "a valid puny-coded URL ",
-                "data": "http://xn--nw2a.xn--j6w193g/",
-                "valid": true
-            },
-            {
-                "description": "a valid URL with many special characters",
-                "data": "http://-.~_!$&'()*+,;=:%40:80%2f::::::@example.com",
-                "valid": true
-            },
-            {
-                "description": "a valid URL based on IPv4",
-                "data": "http://223.255.255.254",
-                "valid": true
-            },
-            {
-                "description": "a valid URL with ftp scheme",
-                "data": "ftp://ftp.is.co.za/rfc/rfc1808.txt",
-                "valid": true
-            },
-            {
-                "description": "a valid URL for a simple text file",
-                "data": "http://www.ietf.org/rfc/rfc2396.txt",
-                "valid": true
-            },
-            {
-                "description": "a valid URL ",
-                "data": "ldap://[2001:db8::7]/c=GB?objectClass?one",
-                "valid": true
-            },
-            {
-                "description": "a valid mailto URI",
-                "data": "mailto:John.Doe@example.com",
-                "valid": true
-            },
-            {
-                "description": "a valid newsgroup URI",
-                "data": "news:comp.infosystems.www.servers.unix",
-                "valid": true
-            },
-            {
-                "description": "a valid tel URI",
-                "data": "tel:+1-816-555-1212",
-                "valid": true
-            },
-            {
-                "description": "a valid URN",
-                "data": "urn:oasis:names:specification:docbook:dtd:xml:4.1.2",
-                "valid": true
-            },
-            {
-                "description": "an invalid protocol-relative URI Reference",
-                "data": "//foo.bar/?baz=qux#quux",
-                "valid": false
-            },
-            {
-                "description": "an invalid relative URI Reference",
-                "data": "/abc",
-                "valid": false
-            },
-            {
-                "description": "an invalid URI",
-                "data": "\\\\WINDOWS\\fileshare",
-                "valid": false
-            },
-            {
-                "description": "an invalid URI though valid URI reference",
-                "data": "abc",
-                "valid": false
-            },
-            {
-                "description": "an invalid URI with spaces",
-                "data": "http:// shouldfail.com",
-                "valid": false
-            },
-            {
-                "description": "an invalid URI with spaces and missing scheme",
-                "data": ":// should fail",
-                "valid": false
-            },
-            {
-                "description": "an invalid URI with comma in scheme",
-                "data": "bar,baz:foo",
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft7/optional/non-bmp-regex.json b/json/tests/draft7/optional/non-bmp-regex.json
deleted file mode 100644
index dd67af2..0000000
--- a/json/tests/draft7/optional/non-bmp-regex.json
+++ /dev/null
@@ -1,82 +0,0 @@
-[
-    {
-        "description": "Proper UTF-16 surrogate pair handling: pattern",
-        "comment": "Optional because .Net doesn't correctly handle 32-bit Unicode characters",
-        "schema": { "pattern": "^🐲*$" },
-        "tests": [
-            {
-                "description": "matches empty",
-                "data": "",
-                "valid": true
-            },
-            {
-                "description": "matches single",
-                "data": "🐲",
-                "valid": true
-            },
-            {
-                "description": "matches two",
-                "data": "🐲🐲",
-                "valid": true
-            },
-            {
-                "description": "doesn't match one",
-                "data": "🐉",
-                "valid": false
-            },
-            {
-                "description": "doesn't match two",
-                "data": "🐉🐉",
-                "valid": false
-            },
-            {
-                "description": "doesn't match one ASCII",
-                "data": "D",
-                "valid": false
-            },
-            {
-                "description": "doesn't match two ASCII",
-                "data": "DD",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "Proper UTF-16 surrogate pair handling: patternProperties",
-        "comment": "Optional because .Net doesn't correctly handle 32-bit Unicode characters",
-        "schema": {
-            "patternProperties": {
-                "^🐲*$": {
-                    "type": "integer"
-                }
-            }
-        },
-        "tests": [
-            {
-                "description": "matches empty",
-                "data": { "": 1 },
-                "valid": true
-            },
-            {
-                "description": "matches single",
-                "data": { "🐲": 1 },
-                "valid": true
-            },
-            {
-                "description": "matches two",
-                "data": { "🐲🐲": 1 },
-                "valid": true
-            },
-            {
-                "description": "doesn't match one",
-                "data": { "🐲": "hello" },
-                "valid": false
-            },
-            {
-                "description": "doesn't match two",
-                "data": { "🐲🐲": "hello" },
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft7/pattern.json b/json/tests/draft7/pattern.json
deleted file mode 100644
index 92db0f9..0000000
--- a/json/tests/draft7/pattern.json
+++ /dev/null
@@ -1,59 +0,0 @@
-[
-    {
-        "description": "pattern validation",
-        "schema": {"pattern": "^a*$"},
-        "tests": [
-            {
-                "description": "a matching pattern is valid",
-                "data": "aaa",
-                "valid": true
-            },
-            {
-                "description": "a non-matching pattern is invalid",
-                "data": "abc",
-                "valid": false
-            },
-            {
-                "description": "ignores booleans",
-                "data": true,
-                "valid": true
-            },
-            {
-                "description": "ignores integers",
-                "data": 123,
-                "valid": true
-            },
-            {
-                "description": "ignores floats",
-                "data": 1.0,
-                "valid": true
-            },
-            {
-                "description": "ignores objects",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "ignores arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "ignores null",
-                "data": null,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "pattern is not anchored",
-        "schema": {"pattern": "a+"},
-        "tests": [
-            {
-                "description": "matches a substring",
-                "data": "xxaayy",
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft7/patternProperties.json b/json/tests/draft7/patternProperties.json
deleted file mode 100644
index c276e64..0000000
--- a/json/tests/draft7/patternProperties.json
+++ /dev/null
@@ -1,171 +0,0 @@
-[
-    {
-        "description":
-            "patternProperties validates properties matching a regex",
-        "schema": {
-            "patternProperties": {
-                "f.*o": {"type": "integer"}
-            }
-        },
-        "tests": [
-            {
-                "description": "a single valid match is valid",
-                "data": {"foo": 1},
-                "valid": true
-            },
-            {
-                "description": "multiple valid matches is valid",
-                "data": {"foo": 1, "foooooo" : 2},
-                "valid": true
-            },
-            {
-                "description": "a single invalid match is invalid",
-                "data": {"foo": "bar", "fooooo": 2},
-                "valid": false
-            },
-            {
-                "description": "multiple invalid matches is invalid",
-                "data": {"foo": "bar", "foooooo" : "baz"},
-                "valid": false
-            },
-            {
-                "description": "ignores arrays",
-                "data": ["foo"],
-                "valid": true
-            },
-            {
-                "description": "ignores strings",
-                "data": "foo",
-                "valid": true
-            },
-            {
-                "description": "ignores other non-objects",
-                "data": 12,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "multiple simultaneous patternProperties are validated",
-        "schema": {
-            "patternProperties": {
-                "a*": {"type": "integer"},
-                "aaa*": {"maximum": 20}
-            }
-        },
-        "tests": [
-            {
-                "description": "a single valid match is valid",
-                "data": {"a": 21},
-                "valid": true
-            },
-            {
-                "description": "a simultaneous match is valid",
-                "data": {"aaaa": 18},
-                "valid": true
-            },
-            {
-                "description": "multiple matches is valid",
-                "data": {"a": 21, "aaaa": 18},
-                "valid": true
-            },
-            {
-                "description": "an invalid due to one is invalid",
-                "data": {"a": "bar"},
-                "valid": false
-            },
-            {
-                "description": "an invalid due to the other is invalid",
-                "data": {"aaaa": 31},
-                "valid": false
-            },
-            {
-                "description": "an invalid due to both is invalid",
-                "data": {"aaa": "foo", "aaaa": 31},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "regexes are not anchored by default and are case sensitive",
-        "schema": {
-            "patternProperties": {
-                "[0-9]{2,}": { "type": "boolean" },
-                "X_": { "type": "string" }
-            }
-        },
-        "tests": [
-            {
-                "description": "non recognized members are ignored",
-                "data": { "answer 1": "42" },
-                "valid": true
-            },
-            {
-                "description": "recognized members are accounted for",
-                "data": { "a31b": null },
-                "valid": false
-            },
-            {
-                "description": "regexes are case sensitive",
-                "data": { "a_x_3": 3 },
-                "valid": true
-            },
-            {
-                "description": "regexes are case sensitive, 2",
-                "data": { "a_X_3": 3 },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "patternProperties with boolean schemas",
-        "schema": {
-            "patternProperties": {
-                "f.*": true,
-                "b.*": false
-            }
-        },
-        "tests": [
-            {
-                "description": "object with property matching schema true is valid",
-                "data": {"foo": 1},
-                "valid": true
-            },
-            {
-                "description": "object with property matching schema false is invalid",
-                "data": {"bar": 2},
-                "valid": false
-            },
-            {
-                "description": "object with both properties is invalid",
-                "data": {"foo": 1, "bar": 2},
-                "valid": false
-            },
-            {
-                "description": "object with a property matching both true and false is invalid",
-                "data": {"foobar":1},
-                "valid": false
-            },
-            {
-                "description": "empty object is valid",
-                "data": {},
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "patternProperties with null valued instance properties",
-        "schema": {
-            "patternProperties": {
-                "^.*bar$": {"type": "null"}
-            }
-        },
-        "tests": [
-            {
-                "description": "allows null values",
-                "data": {"foobar": null},
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft7/properties.json b/json/tests/draft7/properties.json
deleted file mode 100644
index 5b971ca..0000000
--- a/json/tests/draft7/properties.json
+++ /dev/null
@@ -1,236 +0,0 @@
-[
-    {
-        "description": "object properties validation",
-        "schema": {
-            "properties": {
-                "foo": {"type": "integer"},
-                "bar": {"type": "string"}
-            }
-        },
-        "tests": [
-            {
-                "description": "both properties present and valid is valid",
-                "data": {"foo": 1, "bar": "baz"},
-                "valid": true
-            },
-            {
-                "description": "one property invalid is invalid",
-                "data": {"foo": 1, "bar": {}},
-                "valid": false
-            },
-            {
-                "description": "both properties invalid is invalid",
-                "data": {"foo": [], "bar": {}},
-                "valid": false
-            },
-            {
-                "description": "doesn't invalidate other properties",
-                "data": {"quux": []},
-                "valid": true
-            },
-            {
-                "description": "ignores arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "ignores other non-objects",
-                "data": 12,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description":
-            "properties, patternProperties, additionalProperties interaction",
-        "schema": {
-            "properties": {
-                "foo": {"type": "array", "maxItems": 3},
-                "bar": {"type": "array"}
-            },
-            "patternProperties": {"f.o": {"minItems": 2}},
-            "additionalProperties": {"type": "integer"}
-        },
-        "tests": [
-            {
-                "description": "property validates property",
-                "data": {"foo": [1, 2]},
-                "valid": true
-            },
-            {
-                "description": "property invalidates property",
-                "data": {"foo": [1, 2, 3, 4]},
-                "valid": false
-            },
-            {
-                "description": "patternProperty invalidates property",
-                "data": {"foo": []},
-                "valid": false
-            },
-            {
-                "description": "patternProperty validates nonproperty",
-                "data": {"fxo": [1, 2]},
-                "valid": true
-            },
-            {
-                "description": "patternProperty invalidates nonproperty",
-                "data": {"fxo": []},
-                "valid": false
-            },
-            {
-                "description": "additionalProperty ignores property",
-                "data": {"bar": []},
-                "valid": true
-            },
-            {
-                "description": "additionalProperty validates others",
-                "data": {"quux": 3},
-                "valid": true
-            },
-            {
-                "description": "additionalProperty invalidates others",
-                "data": {"quux": "foo"},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "properties with boolean schema",
-        "schema": {
-            "properties": {
-                "foo": true,
-                "bar": false
-            }
-        },
-        "tests": [
-            {
-                "description": "no property present is valid",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "only 'true' property present is valid",
-                "data": {"foo": 1},
-                "valid": true
-            },
-            {
-                "description": "only 'false' property present is invalid",
-                "data": {"bar": 2},
-                "valid": false
-            },
-            {
-                "description": "both properties present is invalid",
-                "data": {"foo": 1, "bar": 2},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "properties with escaped characters",
-        "schema": {
-            "properties": {
-                "foo\nbar": {"type": "number"},
-                "foo\"bar": {"type": "number"},
-                "foo\\bar": {"type": "number"},
-                "foo\rbar": {"type": "number"},
-                "foo\tbar": {"type": "number"},
-                "foo\fbar": {"type": "number"}
-            }
-        },
-        "tests": [
-            {
-                "description": "object with all numbers is valid",
-                "data": {
-                    "foo\nbar": 1,
-                    "foo\"bar": 1,
-                    "foo\\bar": 1,
-                    "foo\rbar": 1,
-                    "foo\tbar": 1,
-                    "foo\fbar": 1
-                },
-                "valid": true
-            },
-            {
-                "description": "object with strings is invalid",
-                "data": {
-                    "foo\nbar": "1",
-                    "foo\"bar": "1",
-                    "foo\\bar": "1",
-                    "foo\rbar": "1",
-                    "foo\tbar": "1",
-                    "foo\fbar": "1"
-                },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "properties with null valued instance properties",
-        "schema": {
-            "properties": {
-                "foo": {"type": "null"}
-            }
-        },
-        "tests": [
-            {
-                "description": "allows null values",
-                "data": {"foo": null},
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "properties whose names are Javascript object property names",
-        "comment": "Ensure JS implementations don't universally consider e.g. __proto__ to always be present in an object.",
-        "schema": {
-            "properties": {
-                "__proto__": {"type": "number"},
-                "toString": {
-                    "properties": { "length": { "type": "string" } }
-                },
-                "constructor": {"type": "number"}
-            }
-        },
-        "tests": [
-            {
-                "description": "ignores arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "ignores other non-objects",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "none of the properties mentioned",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "__proto__ not valid",
-                "data": { "__proto__": "foo" },
-                "valid": false
-            },
-            {
-                "description": "toString not valid",
-                "data": { "toString": { "length": 37 } },
-                "valid": false
-            },
-            {
-                "description": "constructor not valid",
-                "data": { "constructor": { "length": 37 } },
-                "valid": false
-            },
-            {
-                "description": "all present and valid",
-                "data": { 
-                    "__proto__": 12,
-                    "toString": { "length": "foo" },
-                    "constructor": 37
-                },
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft7/propertyNames.json b/json/tests/draft7/propertyNames.json
deleted file mode 100644
index f0788e6..0000000
--- a/json/tests/draft7/propertyNames.json
+++ /dev/null
@@ -1,107 +0,0 @@
-[
-    {
-        "description": "propertyNames validation",
-        "schema": {
-            "propertyNames": {"maxLength": 3}
-        },
-        "tests": [
-            {
-                "description": "all property names valid",
-                "data": {
-                    "f": {},
-                    "foo": {}
-                },
-                "valid": true
-            },
-            {
-                "description": "some property names invalid",
-                "data": {
-                    "foo": {},
-                    "foobar": {}
-                },
-                "valid": false
-            },
-            {
-                "description": "object without properties is valid",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "ignores arrays",
-                "data": [1, 2, 3, 4],
-                "valid": true
-            },
-            {
-                "description": "ignores strings",
-                "data": "foobar",
-                "valid": true
-            },
-            {
-                "description": "ignores other non-objects",
-                "data": 12,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "propertyNames validation with pattern",
-        "schema": {
-            "propertyNames": { "pattern": "^a+$" }
-        },
-        "tests": [
-            {
-                "description": "matching property names valid",
-                "data": {
-                    "a": {},
-                    "aa": {},
-                    "aaa": {}
-                },
-                "valid": true
-            },
-            {
-                "description": "non-matching property name is invalid",
-                "data": {
-                    "aaA": {}
-                },
-                "valid": false
-            },
-            {
-                "description": "object without properties is valid",
-                "data": {},
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "propertyNames with boolean schema true",
-        "schema": {"propertyNames": true},
-        "tests": [
-            {
-                "description": "object with any properties is valid",
-                "data": {"foo": 1},
-                "valid": true
-            },
-            {
-                "description": "empty object is valid",
-                "data": {},
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "propertyNames with boolean schema false",
-        "schema": {"propertyNames": false},
-        "tests": [
-            {
-                "description": "object with any properties is invalid",
-                "data": {"foo": 1},
-                "valid": false
-            },
-            {
-                "description": "empty object is valid",
-                "data": {},
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft7/ref.json b/json/tests/draft7/ref.json
deleted file mode 100644
index ab67f0e..0000000
--- a/json/tests/draft7/ref.json
+++ /dev/null
@@ -1,822 +0,0 @@
-[
-    {
-        "description": "root pointer ref",
-        "schema": {
-            "properties": {
-                "foo": {"$ref": "#"}
-            },
-            "additionalProperties": false
-        },
-        "tests": [
-            {
-                "description": "match",
-                "data": {"foo": false},
-                "valid": true
-            },
-            {
-                "description": "recursive match",
-                "data": {"foo": {"foo": false}},
-                "valid": true
-            },
-            {
-                "description": "mismatch",
-                "data": {"bar": false},
-                "valid": false
-            },
-            {
-                "description": "recursive mismatch",
-                "data": {"foo": {"bar": false}},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "relative pointer ref to object",
-        "schema": {
-            "properties": {
-                "foo": {"type": "integer"},
-                "bar": {"$ref": "#/properties/foo"}
-            }
-        },
-        "tests": [
-            {
-                "description": "match",
-                "data": {"bar": 3},
-                "valid": true
-            },
-            {
-                "description": "mismatch",
-                "data": {"bar": true},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "relative pointer ref to array",
-        "schema": {
-            "items": [
-                {"type": "integer"},
-                {"$ref": "#/items/0"}
-            ]
-        },
-        "tests": [
-            {
-                "description": "match array",
-                "data": [1, 2],
-                "valid": true
-            },
-            {
-                "description": "mismatch array",
-                "data": [1, "foo"],
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "escaped pointer ref",
-        "schema": {
-            "definitions": {
-                "tilde~field": {"type": "integer"},
-                "slash/field": {"type": "integer"},
-                "percent%field": {"type": "integer"}
-            },
-            "properties": {
-                "tilde": {"$ref": "#/definitions/tilde~0field"},
-                "slash": {"$ref": "#/definitions/slash~1field"},
-                "percent": {"$ref": "#/definitions/percent%25field"}
-            }
-        },
-        "tests": [
-            {
-                "description": "slash invalid",
-                "data": {"slash": "aoeu"},
-                "valid": false
-            },
-            {
-                "description": "tilde invalid",
-                "data": {"tilde": "aoeu"},
-                "valid": false
-            },
-            {
-                "description": "percent invalid",
-                "data": {"percent": "aoeu"},
-                "valid": false
-            },
-            {
-                "description": "slash valid",
-                "data": {"slash": 123},
-                "valid": true
-            },
-            {
-                "description": "tilde valid",
-                "data": {"tilde": 123},
-                "valid": true
-            },
-            {
-                "description": "percent valid",
-                "data": {"percent": 123},
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "nested refs",
-        "schema": {
-            "definitions": {
-                "a": {"type": "integer"},
-                "b": {"$ref": "#/definitions/a"},
-                "c": {"$ref": "#/definitions/b"}
-            },
-            "allOf": [{ "$ref": "#/definitions/c" }]
-        },
-        "tests": [
-            {
-                "description": "nested ref valid",
-                "data": 5,
-                "valid": true
-            },
-            {
-                "description": "nested ref invalid",
-                "data": "a",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "ref overrides any sibling keywords",
-        "schema": {
-            "definitions": {
-                "reffed": {
-                    "type": "array"
-                }
-            },
-            "properties": {
-                "foo": {
-                    "$ref": "#/definitions/reffed",
-                    "maxItems": 2
-                }
-            }
-        },
-        "tests": [
-            {
-                "description": "ref valid",
-                "data": { "foo": [] },
-                "valid": true
-            },
-            {
-                "description": "ref valid, maxItems ignored",
-                "data": { "foo": [ 1, 2, 3] },
-                "valid": true
-            },
-            {
-                "description": "ref invalid",
-                "data": { "foo": "string" },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "$ref prevents a sibling $id from changing the base uri",
-        "schema": {
-            "$id": "http://localhost:1234/sibling_id/base/",
-            "definitions": {
-                "foo": {
-                    "$id": "http://localhost:1234/sibling_id/foo.json",
-                    "type": "string"
-                },
-                "base_foo": {
-                    "$comment": "this canonical uri is http://localhost:1234/sibling_id/base/foo.json",
-                    "$id": "foo.json",
-                    "type": "number"
-                }
-            },
-            "allOf": [
-                {
-                    "$comment": "$ref resolves to http://localhost:1234/sibling_id/base/foo.json, not http://localhost:1234/sibling_id/foo.json",
-                    "$id": "http://localhost:1234/sibling_id/",
-                    "$ref": "foo.json"
-                }
-            ]
-        },
-        "tests": [
-            {
-                "description": "$ref resolves to /definitions/base_foo, data does not validate",
-                "data": "a",
-                "valid": false
-            },
-            {
-                "description": "$ref resolves to /definitions/base_foo, data validates",
-                "data": 1,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "remote ref, containing refs itself",
-        "schema": {"$ref": "http://json-schema.org/draft-07/schema#"},
-        "tests": [
-            {
-                "description": "remote ref valid",
-                "data": {"minLength": 1},
-                "valid": true
-            },
-            {
-                "description": "remote ref invalid",
-                "data": {"minLength": -1},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "property named $ref that is not a reference",
-        "schema": {
-            "properties": {
-                "$ref": {"type": "string"}
-            }
-        },
-        "tests": [
-            {
-                "description": "property named $ref valid",
-                "data": {"$ref": "a"},
-                "valid": true
-            },
-            {
-                "description": "property named $ref invalid",
-                "data": {"$ref": 2},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "property named $ref, containing an actual $ref",
-        "schema": {
-            "properties": {
-                "$ref": {"$ref": "#/definitions/is-string"}
-            },
-            "definitions": {
-                "is-string": {
-                    "type": "string"
-                }
-            }
-        },
-        "tests": [
-            {
-                "description": "property named $ref valid",
-                "data": {"$ref": "a"},
-                "valid": true
-            },
-            {
-                "description": "property named $ref invalid",
-                "data": {"$ref": 2},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "$ref to boolean schema true",
-        "schema": {
-            "allOf": [{ "$ref": "#/definitions/bool" }],
-            "definitions": {
-                "bool": true
-            }
-        },
-        "tests": [
-            {
-                "description": "any value is valid",
-                "data": "foo",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "$ref to boolean schema false",
-        "schema": {
-            "allOf": [{ "$ref": "#/definitions/bool" }],
-            "definitions": {
-                "bool": false
-            }
-        },
-        "tests": [
-            {
-                "description": "any value is invalid",
-                "data": "foo",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "Recursive references between schemas",
-        "schema": {
-            "$id": "http://localhost:1234/tree",
-            "description": "tree of nodes",
-            "type": "object",
-            "properties": {
-                "meta": {"type": "string"},
-                "nodes": {
-                    "type": "array",
-                    "items": {"$ref": "node"}
-                }
-            },
-            "required": ["meta", "nodes"],
-            "definitions": {
-                "node": {
-                    "$id": "http://localhost:1234/node",
-                    "description": "node",
-                    "type": "object",
-                    "properties": {
-                        "value": {"type": "number"},
-                        "subtree": {"$ref": "tree"}
-                    },
-                    "required": ["value"]
-                }
-            }
-        },
-        "tests": [
-            {
-                "description": "valid tree",
-                "data": { 
-                    "meta": "root",
-                    "nodes": [
-                        {
-                            "value": 1,
-                            "subtree": {
-                                "meta": "child",
-                                "nodes": [
-                                    {"value": 1.1},
-                                    {"value": 1.2}
-                                ]
-                            }
-                        },
-                        {
-                            "value": 2,
-                            "subtree": {
-                                "meta": "child",
-                                "nodes": [
-                                    {"value": 2.1},
-                                    {"value": 2.2}
-                                ]
-                            }
-                        }
-                    ]
-                },
-                "valid": true
-            },
-            {
-                "description": "invalid tree",
-                "data": { 
-                    "meta": "root",
-                    "nodes": [
-                        {
-                            "value": 1,
-                            "subtree": {
-                                "meta": "child",
-                                "nodes": [
-                                    {"value": "string is invalid"},
-                                    {"value": 1.2}
-                                ]
-                            }
-                        },
-                        {
-                            "value": 2,
-                            "subtree": {
-                                "meta": "child",
-                                "nodes": [
-                                    {"value": 2.1},
-                                    {"value": 2.2}
-                                ]
-                            }
-                        }
-                    ]
-                },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "refs with quote",
-        "schema": {
-            "properties": {
-                "foo\"bar": {"$ref": "#/definitions/foo%22bar"}
-            },
-            "definitions": {
-                "foo\"bar": {"type": "number"}
-            }
-        },
-        "tests": [
-            {
-                "description": "object with numbers is valid",
-                "data": {
-                    "foo\"bar": 1
-                },
-                "valid": true
-            },
-            {
-                "description": "object with strings is invalid",
-                "data": {
-                    "foo\"bar": "1"
-                },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "Location-independent identifier",
-        "schema": {
-            "allOf": [{
-                "$ref": "#foo"
-            }],
-            "definitions": {
-                "A": {
-                    "$id": "#foo",
-                    "type": "integer"
-                }
-            }
-        },
-        "tests": [
-            {
-                "data": 1,
-                "description": "match",
-                "valid": true
-            },
-            {
-                "data": "a",
-                "description": "mismatch",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "Location-independent identifier with base URI change in subschema",
-        "schema": {
-            "$id": "http://localhost:1234/root",
-            "allOf": [{
-                "$ref": "http://localhost:1234/nested.json#foo"
-            }],
-            "definitions": {
-                "A": {
-                    "$id": "nested.json",
-                    "definitions": {
-                        "B": {
-                            "$id": "#foo",
-                            "type": "integer"
-                        }
-                    }
-                }
-            }
-        },
-        "tests": [
-            {
-                "data": 1,
-                "description": "match",
-                "valid": true
-            },
-            {
-                "data": "a",
-                "description": "mismatch",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "naive replacement of $ref with its destination is not correct",
-        "schema": {
-            "definitions": {
-                "a_string": { "type": "string" }
-            },
-            "enum": [
-                { "$ref": "#/definitions/a_string" }
-            ]
-        },
-        "tests": [
-            {
-                "description": "do not evaluate the $ref inside the enum, matching any string",
-                "data": "this is a string",
-                "valid": false
-            },
-            {
-                "description": "do not evaluate the $ref inside the enum, definition exact match",
-                "data": { "type": "string" },
-                "valid": false
-            },
-            {
-                "description": "match the enum exactly",
-                "data": { "$ref": "#/definitions/a_string" },
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "refs with relative uris and defs",
-        "schema": {
-            "$id": "http://example.com/schema-relative-uri-defs1.json",
-            "properties": {
-                "foo": {
-                    "$id": "schema-relative-uri-defs2.json",
-                    "definitions": {
-                        "inner": {
-                            "properties": {
-                                "bar": { "type": "string" }
-                            }
-                        }
-                    },
-                    "allOf": [ { "$ref": "#/definitions/inner" } ]
-                }
-            },
-            "allOf": [ { "$ref": "schema-relative-uri-defs2.json" } ]
-        },
-        "tests": [
-            {
-                "description": "invalid on inner field",
-                "data": {
-                    "foo": {
-                        "bar": 1
-                    },
-                    "bar": "a"
-                },
-                "valid": false
-            },
-            {
-                "description": "invalid on outer field",
-                "data": {
-                    "foo": {
-                        "bar": "a"
-                    },
-                    "bar": 1
-                },
-                "valid": false
-            },
-            {
-                "description": "valid on both fields",
-                "data": {
-                    "foo": {
-                        "bar": "a"
-                    },
-                    "bar": "a"
-                },
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "relative refs with absolute uris and defs",
-        "schema": {
-            "$id": "http://example.com/schema-refs-absolute-uris-defs1.json",
-            "properties": {
-                "foo": {
-                    "$id": "http://example.com/schema-refs-absolute-uris-defs2.json",
-                    "definitions": {
-                        "inner": {
-                            "properties": {
-                                "bar": { "type": "string" }
-                            }
-                        }
-                    },
-                    "allOf": [ { "$ref": "#/definitions/inner" } ]
-                }
-            },
-            "allOf": [ { "$ref": "schema-refs-absolute-uris-defs2.json" } ]
-        },
-        "tests": [
-            {
-                "description": "invalid on inner field",
-                "data": {
-                    "foo": {
-                        "bar": 1
-                    },
-                    "bar": "a"
-                },
-                "valid": false
-            },
-            {
-                "description": "invalid on outer field",
-                "data": {
-                    "foo": {
-                        "bar": "a"
-                    },
-                    "bar": 1
-                },
-                "valid": false
-            },
-            {
-                "description": "valid on both fields",
-                "data": {
-                    "foo": {
-                        "bar": "a"
-                    },
-                    "bar": "a"
-                },
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "$id must be resolved against nearest parent, not just immediate parent",
-        "schema": {
-            "$id": "http://example.com/a.json",
-            "definitions": {
-                "x": {
-                    "$id": "http://example.com/b/c.json",
-                    "not": {
-                        "definitions": {
-                            "y": {
-                                "$id": "d.json",
-                                "type": "number"
-                            }
-                        }
-                    }
-                }
-            },
-            "allOf": [
-                {
-                    "$ref": "http://example.com/b/d.json"
-                }
-            ]
-        },
-        "tests": [
-            {
-                "description": "number is valid",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "non-number is invalid",
-                "data": "a",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "simple URN base URI with $ref via the URN",
-        "schema": {
-            "$comment": "URIs do not have to have HTTP(s) schemes",
-            "$id": "urn:uuid:deadbeef-1234-ffff-ffff-4321feebdaed",
-            "minimum": 30,
-            "properties": {
-                "foo": {"$ref": "urn:uuid:deadbeef-1234-ffff-ffff-4321feebdaed"}
-            }
-        },
-        "tests": [
-            {
-                "description": "valid under the URN IDed schema",
-                "data": {"foo": 37},
-                "valid": true
-            },
-            {
-                "description": "invalid under the URN IDed schema",
-                "data": {"foo": 12},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "simple URN base URI with JSON pointer",
-        "schema": {
-            "$comment": "URIs do not have to have HTTP(s) schemes",
-            "$id": "urn:uuid:deadbeef-1234-00ff-ff00-4321feebdaed",
-            "properties": {
-                "foo": {"$ref": "#/definitions/bar"}
-            },
-            "definitions": {
-                "bar": {"type": "string"}
-            }
-        },
-        "tests": [
-            {
-                "description": "a string is valid",
-                "data": {"foo": "bar"},
-                "valid": true
-            },
-            {
-                "description": "a non-string is invalid",
-                "data": {"foo": 12},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "URN base URI with NSS",
-        "schema": {
-            "$comment": "RFC 8141 §2.2",
-            "$id": "urn:example:1/406/47452/2",
-            "properties": {
-                "foo": {"$ref": "#/definitions/bar"}
-            },
-            "definitions": {
-                "bar": {"type": "string"}
-            }
-        },
-        "tests": [
-            {
-                "description": "a string is valid",
-                "data": {"foo": "bar"},
-                "valid": true
-            },
-            {
-                "description": "a non-string is invalid",
-                "data": {"foo": 12},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "URN base URI with r-component",
-        "schema": {
-            "$comment": "RFC 8141 §2.3.1",
-            "$id": "urn:example:foo-bar-baz-qux?+CCResolve:cc=uk",
-            "properties": {
-                "foo": {"$ref": "#/definitions/bar"}
-            },
-            "definitions": {
-                "bar": {"type": "string"}
-            }
-        },
-        "tests": [
-            {
-                "description": "a string is valid",
-                "data": {"foo": "bar"},
-                "valid": true
-            },
-            {
-                "description": "a non-string is invalid",
-                "data": {"foo": 12},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "URN base URI with q-component",
-        "schema": {
-            "$comment": "RFC 8141 §2.3.2",
-            "$id": "urn:example:weather?=op=map&lat=39.56&lon=-104.85&datetime=1969-07-21T02:56:15Z",
-            "properties": {
-                "foo": {"$ref": "#/definitions/bar"}
-            },
-            "definitions": {
-                "bar": {"type": "string"}
-            }
-        },
-        "tests": [
-            {
-                "description": "a string is valid",
-                "data": {"foo": "bar"},
-                "valid": true
-            },
-            {
-                "description": "a non-string is invalid",
-                "data": {"foo": 12},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "URN base URI with URN and JSON pointer ref",
-        "schema": {
-            "$id": "urn:uuid:deadbeef-1234-0000-0000-4321feebdaed",
-            "properties": {
-                "foo": {"$ref": "urn:uuid:deadbeef-1234-0000-0000-4321feebdaed#/definitions/bar"}
-            },
-            "definitions": {
-                "bar": {"type": "string"}
-            }
-        },
-        "tests": [
-            {
-                "description": "a string is valid",
-                "data": {"foo": "bar"},
-                "valid": true
-            },
-            {
-                "description": "a non-string is invalid",
-                "data": {"foo": 12},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "URN base URI with URN and anchor ref",
-        "schema": {
-            "$id": "urn:uuid:deadbeef-1234-ff00-00ff-4321feebdaed",
-            "properties": {
-                "foo": {"$ref": "urn:uuid:deadbeef-1234-ff00-00ff-4321feebdaed#something"}
-            },
-            "definitions": {
-                "bar": {
-                    "$id": "#something",
-                    "type": "string"
-                }
-            }
-        },
-        "tests": [
-            {
-                "description": "a string is valid",
-                "data": {"foo": "bar"},
-                "valid": true
-            },
-            {
-                "description": "a non-string is invalid",
-                "data": {"foo": 12},
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft7/refRemote.json b/json/tests/draft7/refRemote.json
deleted file mode 100644
index c2b2002..0000000
--- a/json/tests/draft7/refRemote.json
+++ /dev/null
@@ -1,239 +0,0 @@
-[
-    {
-        "description": "remote ref",
-        "schema": {"$ref": "http://localhost:1234/integer.json"},
-        "tests": [
-            {
-                "description": "remote ref valid",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "remote ref invalid",
-                "data": "a",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "fragment within remote ref",
-        "schema": {"$ref": "http://localhost:1234/subSchemas.json#/integer"},
-        "tests": [
-            {
-                "description": "remote fragment valid",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "remote fragment invalid",
-                "data": "a",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "ref within remote ref",
-        "schema": {
-            "$ref": "http://localhost:1234/subSchemas.json#/refToInteger"
-        },
-        "tests": [
-            {
-                "description": "ref within ref valid",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "ref within ref invalid",
-                "data": "a",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "base URI change",
-        "schema": {
-            "$id": "http://localhost:1234/",
-            "items": {
-                "$id": "baseUriChange/",
-                "items": {"$ref": "folderInteger.json"}
-            }
-        },
-        "tests": [
-            {
-                "description": "base URI change ref valid",
-                "data": [[1]],
-                "valid": true
-            },
-            {
-                "description": "base URI change ref invalid",
-                "data": [["a"]],
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "base URI change - change folder",
-        "schema": {
-            "$id": "http://localhost:1234/scope_change_defs1.json",
-            "type" : "object",
-            "properties": {
-                "list": {"$ref": "#/definitions/baz"}
-            },
-            "definitions": {
-                "baz": {
-                    "$id": "baseUriChangeFolder/",
-                    "type": "array",
-                    "items": {"$ref": "folderInteger.json"}
-                }
-            }
-        },
-        "tests": [
-            {
-                "description": "number is valid",
-                "data": {"list": [1]},
-                "valid": true
-            },
-            {
-                "description": "string is invalid",
-                "data": {"list": ["a"]},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "base URI change - change folder in subschema",
-        "schema": {
-            "$id": "http://localhost:1234/scope_change_defs2.json",
-            "type" : "object",
-            "properties": {
-                "list": {"$ref": "#/definitions/baz/definitions/bar"}
-            },
-            "definitions": {
-                "baz": {
-                    "$id": "baseUriChangeFolderInSubschema/",
-                    "definitions": {
-                        "bar": {
-                            "type": "array",
-                            "items": {"$ref": "folderInteger.json"}
-                        }
-                    }
-                }
-            }
-        },
-        "tests": [
-            {
-                "description": "number is valid",
-                "data": {"list": [1]},
-                "valid": true
-            },
-            {
-                "description": "string is invalid",
-                "data": {"list": ["a"]},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "root ref in remote ref",
-        "schema": {
-            "$id": "http://localhost:1234/object",
-            "type": "object",
-            "properties": {
-                "name": {"$ref": "name.json#/definitions/orNull"}
-            }
-        },
-        "tests": [
-            {
-                "description": "string is valid",
-                "data": {
-                    "name": "foo"
-                },
-                "valid": true
-            },
-            {
-                "description": "null is valid",
-                "data": {
-                    "name": null
-                },
-                "valid": true
-            },
-            {
-                "description": "object is invalid",
-                "data": {
-                    "name": {
-                        "name": null
-                    }
-                },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "remote ref with ref to definitions",
-        "schema": {
-            "$id": "http://localhost:1234/schema-remote-ref-ref-defs1.json",
-            "allOf": [
-                { "$ref": "ref-and-definitions.json" }
-            ]
-        },
-        "tests": [
-            {
-                "description": "invalid",
-                "data": {
-                    "bar": 1
-                },
-                "valid": false
-            },
-            {
-                "description": "valid",
-                "data": {
-                    "bar": "a"
-                },
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "Location-independent identifier in remote ref",
-        "schema": {
-            "$ref": "http://localhost:1234/locationIndependentIdentifierPre2019.json#/definitions/refToInteger"
-        },
-        "tests": [
-            {
-                "description": "integer is valid",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "string is invalid",
-                "data": "foo",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "retrieved nested refs resolve relative to their URI not $id",
-        "schema": {
-            "$id": "http://localhost:1234/some-id",
-            "properties": {
-                "name": {"$ref": "nested/foo-ref-string.json"}
-            }
-        },
-        "tests": [
-            {
-                "description": "number is invalid",
-                "data": {
-                    "name": {"foo":  1}
-                },
-                "valid": false
-            },
-            {
-                "description": "string is valid",
-                "data": {
-                    "name": {"foo":  "a"}
-                },
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft7/required.json b/json/tests/draft7/required.json
deleted file mode 100644
index 8d8087a..0000000
--- a/json/tests/draft7/required.json
+++ /dev/null
@@ -1,151 +0,0 @@
-[
-    {
-        "description": "required validation",
-        "schema": {
-            "properties": {
-                "foo": {},
-                "bar": {}
-            },
-            "required": ["foo"]
-        },
-        "tests": [
-            {
-                "description": "present required property is valid",
-                "data": {"foo": 1},
-                "valid": true
-            },
-            {
-                "description": "non-present required property is invalid",
-                "data": {"bar": 1},
-                "valid": false
-            },
-            {
-                "description": "ignores arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "ignores strings",
-                "data": "",
-                "valid": true
-            },
-            {
-                "description": "ignores other non-objects",
-                "data": 12,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "required default validation",
-        "schema": {
-            "properties": {
-                "foo": {}
-            }
-        },
-        "tests": [
-            {
-                "description": "not required by default",
-                "data": {},
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "required with empty array",
-        "schema": {
-            "properties": {
-                "foo": {}
-            },
-            "required": []
-        },
-        "tests": [
-            {
-                "description": "property not required",
-                "data": {},
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "required with escaped characters",
-        "schema": {
-            "required": [
-                "foo\nbar",
-                "foo\"bar",
-                "foo\\bar",
-                "foo\rbar",
-                "foo\tbar",
-                "foo\fbar"
-            ]
-        },
-        "tests": [
-            {
-                "description": "object with all properties present is valid",
-                "data": {
-                    "foo\nbar": 1,
-                    "foo\"bar": 1,
-                    "foo\\bar": 1,
-                    "foo\rbar": 1,
-                    "foo\tbar": 1,
-                    "foo\fbar": 1
-                },
-                "valid": true
-            },
-            {
-                "description": "object with some properties missing is invalid",
-                "data": {
-                    "foo\nbar": "1",
-                    "foo\"bar": "1"
-                },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "required properties whose names are Javascript object property names",
-        "comment": "Ensure JS implementations don't universally consider e.g. __proto__ to always be present in an object.",
-        "schema": { "required": ["__proto__", "toString", "constructor"] },
-        "tests": [
-            {
-                "description": "ignores arrays",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "ignores other non-objects",
-                "data": 12,
-                "valid": true
-            },
-            {
-                "description": "none of the properties mentioned",
-                "data": {},
-                "valid": false
-            },
-            {
-                "description": "__proto__ present",
-                "data": { "__proto__": "foo" },
-                "valid": false
-            },
-            {
-                "description": "toString present",
-                "data": { "toString": { "length": 37 } },
-                "valid": false
-            },
-            {
-                "description": "constructor present",
-                "data": { "constructor": { "length": 37 } },
-                "valid": false
-            },
-            {
-                "description": "all present",
-                "data": { 
-                    "__proto__": 12,
-                    "toString": { "length": "foo" },
-                    "constructor": 37
-                },
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft7/type.json b/json/tests/draft7/type.json
deleted file mode 100644
index 8304647..0000000
--- a/json/tests/draft7/type.json
+++ /dev/null
@@ -1,474 +0,0 @@
-[
-    {
-        "description": "integer type matches integers",
-        "schema": {"type": "integer"},
-        "tests": [
-            {
-                "description": "an integer is an integer",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "a float with zero fractional part is an integer",
-                "data": 1.0,
-                "valid": true
-            },
-            {
-                "description": "a float is not an integer",
-                "data": 1.1,
-                "valid": false
-            },
-            {
-                "description": "a string is not an integer",
-                "data": "foo",
-                "valid": false
-            },
-            {
-                "description": "a string is still not an integer, even if it looks like one",
-                "data": "1",
-                "valid": false
-            },
-            {
-                "description": "an object is not an integer",
-                "data": {},
-                "valid": false
-            },
-            {
-                "description": "an array is not an integer",
-                "data": [],
-                "valid": false
-            },
-            {
-                "description": "a boolean is not an integer",
-                "data": true,
-                "valid": false
-            },
-            {
-                "description": "null is not an integer",
-                "data": null,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "number type matches numbers",
-        "schema": {"type": "number"},
-        "tests": [
-            {
-                "description": "an integer is a number",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "a float with zero fractional part is a number (and an integer)",
-                "data": 1.0,
-                "valid": true
-            },
-            {
-                "description": "a float is a number",
-                "data": 1.1,
-                "valid": true
-            },
-            {
-                "description": "a string is not a number",
-                "data": "foo",
-                "valid": false
-            },
-            {
-                "description": "a string is still not a number, even if it looks like one",
-                "data": "1",
-                "valid": false
-            },
-            {
-                "description": "an object is not a number",
-                "data": {},
-                "valid": false
-            },
-            {
-                "description": "an array is not a number",
-                "data": [],
-                "valid": false
-            },
-            {
-                "description": "a boolean is not a number",
-                "data": true,
-                "valid": false
-            },
-            {
-                "description": "null is not a number",
-                "data": null,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "string type matches strings",
-        "schema": {"type": "string"},
-        "tests": [
-            {
-                "description": "1 is not a string",
-                "data": 1,
-                "valid": false
-            },
-            {
-                "description": "a float is not a string",
-                "data": 1.1,
-                "valid": false
-            },
-            {
-                "description": "a string is a string",
-                "data": "foo",
-                "valid": true
-            },
-            {
-                "description": "a string is still a string, even if it looks like a number",
-                "data": "1",
-                "valid": true
-            },
-            {
-                "description": "an empty string is still a string",
-                "data": "",
-                "valid": true
-            },
-            {
-                "description": "an object is not a string",
-                "data": {},
-                "valid": false
-            },
-            {
-                "description": "an array is not a string",
-                "data": [],
-                "valid": false
-            },
-            {
-                "description": "a boolean is not a string",
-                "data": true,
-                "valid": false
-            },
-            {
-                "description": "null is not a string",
-                "data": null,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "object type matches objects",
-        "schema": {"type": "object"},
-        "tests": [
-            {
-                "description": "an integer is not an object",
-                "data": 1,
-                "valid": false
-            },
-            {
-                "description": "a float is not an object",
-                "data": 1.1,
-                "valid": false
-            },
-            {
-                "description": "a string is not an object",
-                "data": "foo",
-                "valid": false
-            },
-            {
-                "description": "an object is an object",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "an array is not an object",
-                "data": [],
-                "valid": false
-            },
-            {
-                "description": "a boolean is not an object",
-                "data": true,
-                "valid": false
-            },
-            {
-                "description": "null is not an object",
-                "data": null,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "array type matches arrays",
-        "schema": {"type": "array"},
-        "tests": [
-            {
-                "description": "an integer is not an array",
-                "data": 1,
-                "valid": false
-            },
-            {
-                "description": "a float is not an array",
-                "data": 1.1,
-                "valid": false
-            },
-            {
-                "description": "a string is not an array",
-                "data": "foo",
-                "valid": false
-            },
-            {
-                "description": "an object is not an array",
-                "data": {},
-                "valid": false
-            },
-            {
-                "description": "an array is an array",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "a boolean is not an array",
-                "data": true,
-                "valid": false
-            },
-            {
-                "description": "null is not an array",
-                "data": null,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "boolean type matches booleans",
-        "schema": {"type": "boolean"},
-        "tests": [
-            {
-                "description": "an integer is not a boolean",
-                "data": 1,
-                "valid": false
-            },
-            {
-                "description": "zero is not a boolean",
-                "data": 0,
-                "valid": false
-            },
-            {
-                "description": "a float is not a boolean",
-                "data": 1.1,
-                "valid": false
-            },
-            {
-                "description": "a string is not a boolean",
-                "data": "foo",
-                "valid": false
-            },
-            {
-                "description": "an empty string is not a boolean",
-                "data": "",
-                "valid": false
-            },
-            {
-                "description": "an object is not a boolean",
-                "data": {},
-                "valid": false
-            },
-            {
-                "description": "an array is not a boolean",
-                "data": [],
-                "valid": false
-            },
-            {
-                "description": "true is a boolean",
-                "data": true,
-                "valid": true
-            },
-            {
-                "description": "false is a boolean",
-                "data": false,
-                "valid": true
-            },
-            {
-                "description": "null is not a boolean",
-                "data": null,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "null type matches only the null object",
-        "schema": {"type": "null"},
-        "tests": [
-            {
-                "description": "an integer is not null",
-                "data": 1,
-                "valid": false
-            },
-            {
-                "description": "a float is not null",
-                "data": 1.1,
-                "valid": false
-            },
-            {
-                "description": "zero is not null",
-                "data": 0,
-                "valid": false
-            },
-            {
-                "description": "a string is not null",
-                "data": "foo",
-                "valid": false
-            },
-            {
-                "description": "an empty string is not null",
-                "data": "",
-                "valid": false
-            },
-            {
-                "description": "an object is not null",
-                "data": {},
-                "valid": false
-            },
-            {
-                "description": "an array is not null",
-                "data": [],
-                "valid": false
-            },
-            {
-                "description": "true is not null",
-                "data": true,
-                "valid": false
-            },
-            {
-                "description": "false is not null",
-                "data": false,
-                "valid": false
-            },
-            {
-                "description": "null is null",
-                "data": null,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "multiple types can be specified in an array",
-        "schema": {"type": ["integer", "string"]},
-        "tests": [
-            {
-                "description": "an integer is valid",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "a string is valid",
-                "data": "foo",
-                "valid": true
-            },
-            {
-                "description": "a float is invalid",
-                "data": 1.1,
-                "valid": false
-            },
-            {
-                "description": "an object is invalid",
-                "data": {},
-                "valid": false
-            },
-            {
-                "description": "an array is invalid",
-                "data": [],
-                "valid": false
-            },
-            {
-                "description": "a boolean is invalid",
-                "data": true,
-                "valid": false
-            },
-            {
-                "description": "null is invalid",
-                "data": null,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "type as array with one item",
-        "schema": {
-            "type": ["string"]
-        },
-        "tests": [
-            {
-                "description": "string is valid",
-                "data": "foo",
-                "valid": true
-            },
-            {
-                "description": "number is invalid",
-                "data": 123,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "type: array or object",
-        "schema": {
-            "type": ["array", "object"]
-        },
-        "tests": [
-            {
-                "description": "array is valid",
-                "data": [1,2,3],
-                "valid": true
-            },
-            {
-                "description": "object is valid",
-                "data": {"foo": 123},
-                "valid": true
-            },
-            {
-                "description": "number is invalid",
-                "data": 123,
-                "valid": false
-            },
-            {
-                "description": "string is invalid",
-                "data": "foo",
-                "valid": false
-            },
-            {
-                "description": "null is invalid",
-                "data": null,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "type: array, object or null",
-        "schema": {
-            "type": ["array", "object", "null"]
-        },
-        "tests": [
-            {
-                "description": "array is valid",
-                "data": [1,2,3],
-                "valid": true
-            },
-            {
-                "description": "object is valid",
-                "data": {"foo": 123},
-                "valid": true
-            },
-            {
-                "description": "null is valid",
-                "data": null,
-                "valid": true
-            },
-            {
-                "description": "number is invalid",
-                "data": 123,
-                "valid": false
-            },
-            {
-                "description": "string is invalid",
-                "data": "foo",
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft7/uniqueItems.json b/json/tests/draft7/uniqueItems.json
deleted file mode 100644
index 2ccf666..0000000
--- a/json/tests/draft7/uniqueItems.json
+++ /dev/null
@@ -1,404 +0,0 @@
-[
-    {
-        "description": "uniqueItems validation",
-        "schema": {"uniqueItems": true},
-        "tests": [
-            {
-                "description": "unique array of integers is valid",
-                "data": [1, 2],
-                "valid": true
-            },
-            {
-                "description": "non-unique array of integers is invalid",
-                "data": [1, 1],
-                "valid": false
-            },
-            {
-                "description": "non-unique array of more than two integers is invalid",
-                "data": [1, 2, 1],
-                "valid": false
-            },
-            {
-                "description": "numbers are unique if mathematically unequal",
-                "data": [1.0, 1.00, 1],
-                "valid": false
-            },
-            {
-                "description": "false is not equal to zero",
-                "data": [0, false],
-                "valid": true
-            },
-            {
-                "description": "true is not equal to one",
-                "data": [1, true],
-                "valid": true
-            },
-            {
-                "description": "unique array of strings is valid",
-                "data": ["foo", "bar", "baz"],
-                "valid": true
-            },
-            {
-                "description": "non-unique array of strings is invalid",
-                "data": ["foo", "bar", "foo"],
-                "valid": false
-            },
-            {
-                "description": "unique array of objects is valid",
-                "data": [{"foo": "bar"}, {"foo": "baz"}],
-                "valid": true
-            },
-            {
-                "description": "non-unique array of objects is invalid",
-                "data": [{"foo": "bar"}, {"foo": "bar"}],
-                "valid": false
-            },
-            {
-                "description": "unique array of nested objects is valid",
-                "data": [
-                    {"foo": {"bar" : {"baz" : true}}},
-                    {"foo": {"bar" : {"baz" : false}}}
-                ],
-                "valid": true
-            },
-            {
-                "description": "non-unique array of nested objects is invalid",
-                "data": [
-                    {"foo": {"bar" : {"baz" : true}}},
-                    {"foo": {"bar" : {"baz" : true}}}
-                ],
-                "valid": false
-            },
-            {
-                "description": "unique array of arrays is valid",
-                "data": [["foo"], ["bar"]],
-                "valid": true
-            },
-            {
-                "description": "non-unique array of arrays is invalid",
-                "data": [["foo"], ["foo"]],
-                "valid": false
-            },
-            {
-                "description": "non-unique array of more than two arrays is invalid",
-                "data": [["foo"], ["bar"], ["foo"]],
-                "valid": false
-            },
-            {
-                "description": "1 and true are unique",
-                "data": [1, true],
-                "valid": true
-            },
-            {
-                "description": "0 and false are unique",
-                "data": [0, false],
-                "valid": true
-            },
-            {
-                "description": "[1] and [true] are unique",
-                "data": [[1], [true]],
-                "valid": true
-            },
-            {
-                "description": "[0] and [false] are unique",
-                "data": [[0], [false]],
-                "valid": true
-            },
-            {
-                "description": "nested [1] and [true] are unique",
-                "data": [[[1], "foo"], [[true], "foo"]],
-                "valid": true
-            },
-            {
-                "description": "nested [0] and [false] are unique",
-                "data": [[[0], "foo"], [[false], "foo"]],
-                "valid": true
-            },
-            {
-                "description": "unique heterogeneous types are valid",
-                "data": [{}, [1], true, null, 1, "{}"],
-                "valid": true
-            },
-            {
-                "description": "non-unique heterogeneous types are invalid",
-                "data": [{}, [1], true, null, {}, 1],
-                "valid": false
-            },
-            {
-                "description": "different objects are unique",
-                "data": [{"a": 1, "b": 2}, {"a": 2, "b": 1}],
-                "valid": true
-            },
-            {
-                "description": "objects are non-unique despite key order",
-                "data": [{"a": 1, "b": 2}, {"b": 2, "a": 1}],
-                "valid": false
-            },
-            {
-                "description": "{\"a\": false} and {\"a\": 0} are unique",
-                "data": [{"a": false}, {"a": 0}],
-                "valid": true
-            },
-            {
-                "description": "{\"a\": true} and {\"a\": 1} are unique",
-                "data": [{"a": true}, {"a": 1}],
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "uniqueItems with an array of items",
-        "schema": {
-            "items": [{"type": "boolean"}, {"type": "boolean"}],
-            "uniqueItems": true
-        },
-        "tests": [
-            {
-                "description": "[false, true] from items array is valid",
-                "data": [false, true],
-                "valid": true
-            },
-            {
-                "description": "[true, false] from items array is valid",
-                "data": [true, false],
-                "valid": true
-            },
-            {
-                "description": "[false, false] from items array is not valid",
-                "data": [false, false],
-                "valid": false
-            },
-            {
-                "description": "[true, true] from items array is not valid",
-                "data": [true, true],
-                "valid": false
-            },
-            {
-                "description": "unique array extended from [false, true] is valid",
-                "data": [false, true, "foo", "bar"],
-                "valid": true
-            },
-            {
-                "description": "unique array extended from [true, false] is valid",
-                "data": [true, false, "foo", "bar"],
-                "valid": true
-            },
-            {
-                "description": "non-unique array extended from [false, true] is not valid",
-                "data": [false, true, "foo", "foo"],
-                "valid": false
-            },
-            {
-                "description": "non-unique array extended from [true, false] is not valid",
-                "data": [true, false, "foo", "foo"],
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "uniqueItems with an array of items and additionalItems=false",
-        "schema": {
-            "items": [{"type": "boolean"}, {"type": "boolean"}],
-            "uniqueItems": true,
-            "additionalItems": false
-        },
-        "tests": [
-            {
-                "description": "[false, true] from items array is valid",
-                "data": [false, true],
-                "valid": true
-            },
-            {
-                "description": "[true, false] from items array is valid",
-                "data": [true, false],
-                "valid": true
-            },
-            {
-                "description": "[false, false] from items array is not valid",
-                "data": [false, false],
-                "valid": false
-            },
-            {
-                "description": "[true, true] from items array is not valid",
-                "data": [true, true],
-                "valid": false
-            },
-            {
-                "description": "extra items are invalid even if unique",
-                "data": [false, true, null],
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "uniqueItems=false validation",
-        "schema": { "uniqueItems": false },
-        "tests": [
-            {
-                "description": "unique array of integers is valid",
-                "data": [1, 2],
-                "valid": true
-            },
-            {
-                "description": "non-unique array of integers is valid",
-                "data": [1, 1],
-                "valid": true
-            },
-            {
-                "description": "numbers are unique if mathematically unequal",
-                "data": [1.0, 1.00, 1],
-                "valid": true
-            },
-            {
-                "description": "false is not equal to zero",
-                "data": [0, false],
-                "valid": true
-            },
-            {
-                "description": "true is not equal to one",
-                "data": [1, true],
-                "valid": true
-            },
-            {
-                "description": "unique array of objects is valid",
-                "data": [{"foo": "bar"}, {"foo": "baz"}],
-                "valid": true
-            },
-            {
-                "description": "non-unique array of objects is valid",
-                "data": [{"foo": "bar"}, {"foo": "bar"}],
-                "valid": true
-            },
-            {
-                "description": "unique array of nested objects is valid",
-                "data": [
-                    {"foo": {"bar" : {"baz" : true}}},
-                    {"foo": {"bar" : {"baz" : false}}}
-                ],
-                "valid": true
-            },
-            {
-                "description": "non-unique array of nested objects is valid",
-                "data": [
-                    {"foo": {"bar" : {"baz" : true}}},
-                    {"foo": {"bar" : {"baz" : true}}}
-                ],
-                "valid": true
-            },
-            {
-                "description": "unique array of arrays is valid",
-                "data": [["foo"], ["bar"]],
-                "valid": true
-            },
-            {
-                "description": "non-unique array of arrays is valid",
-                "data": [["foo"], ["foo"]],
-                "valid": true
-            },
-            {
-                "description": "1 and true are unique",
-                "data": [1, true],
-                "valid": true
-            },
-            {
-                "description": "0 and false are unique",
-                "data": [0, false],
-                "valid": true
-            },
-            {
-                "description": "unique heterogeneous types are valid",
-                "data": [{}, [1], true, null, 1],
-                "valid": true
-            },
-            {
-                "description": "non-unique heterogeneous types are valid",
-                "data": [{}, [1], true, null, {}, 1],
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "uniqueItems=false with an array of items",
-        "schema": {
-            "items": [{"type": "boolean"}, {"type": "boolean"}],
-            "uniqueItems": false
-        },
-        "tests": [
-            {
-                "description": "[false, true] from items array is valid",
-                "data": [false, true],
-                "valid": true
-            },
-            {
-                "description": "[true, false] from items array is valid",
-                "data": [true, false],
-                "valid": true
-            },
-            {
-                "description": "[false, false] from items array is valid",
-                "data": [false, false],
-                "valid": true
-            },
-            {
-                "description": "[true, true] from items array is valid",
-                "data": [true, true],
-                "valid": true
-            },
-            {
-                "description": "unique array extended from [false, true] is valid",
-                "data": [false, true, "foo", "bar"],
-                "valid": true
-            },
-            {
-                "description": "unique array extended from [true, false] is valid",
-                "data": [true, false, "foo", "bar"],
-                "valid": true
-            },
-            {
-                "description": "non-unique array extended from [false, true] is valid",
-                "data": [false, true, "foo", "foo"],
-                "valid": true
-            },
-            {
-                "description": "non-unique array extended from [true, false] is valid",
-                "data": [true, false, "foo", "foo"],
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "uniqueItems=false with an array of items and additionalItems=false",
-        "schema": {
-            "items": [{"type": "boolean"}, {"type": "boolean"}],
-            "uniqueItems": false,
-            "additionalItems": false
-        },
-        "tests": [
-            {
-                "description": "[false, true] from items array is valid",
-                "data": [false, true],
-                "valid": true
-            },
-            {
-                "description": "[true, false] from items array is valid",
-                "data": [true, false],
-                "valid": true
-            },
-            {
-                "description": "[false, false] from items array is valid",
-                "data": [false, false],
-                "valid": true
-            },
-            {
-                "description": "[true, true] from items array is valid",
-                "data": [true, true],
-                "valid": true
-            },
-            {
-                "description": "extra items are invalid even if unique",
-                "data": [false, true, null],
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft7/unknownKeyword.json b/json/tests/draft7/unknownKeyword.json
deleted file mode 100644
index 1f58d97..0000000
--- a/json/tests/draft7/unknownKeyword.json
+++ /dev/null
@@ -1,56 +0,0 @@
-[
-    {
-        "description": "$id inside an unknown keyword is not a real identifier",
-        "comment": "the implementation must not be confused by an $id in locations we do not know how to parse",
-        "schema": {
-            "definitions": {
-                "id_in_unknown0": {
-                    "not": {
-                        "array_of_schemas": [
-                            {
-                              "$id": "https://localhost:1234/unknownKeyword/my_identifier.json",
-                              "type": "null"
-                            }
-                        ]
-                    }
-                },
-                "real_id_in_schema": {
-                    "$id": "https://localhost:1234/unknownKeyword/my_identifier.json",
-                    "type": "string"
-                },
-                "id_in_unknown1": {
-                    "not": {
-                        "object_of_schemas": {
-                            "foo": {
-                              "$id": "https://localhost:1234/unknownKeyword/my_identifier.json",
-                              "type": "integer"
-                            }
-                        }
-                    }
-                }
-            },
-            "anyOf": [
-                { "$ref": "#/definitions/id_in_unknown0" },
-                { "$ref": "#/definitions/id_in_unknown1" },
-                { "$ref": "https://localhost:1234/unknownKeyword/my_identifier.json" }
-            ]
-        },
-        "tests": [
-            {
-                "description": "type matches second anyOf, which has a real schema in it",
-                "data": "a string",
-                "valid": true
-            },
-            {
-                "description": "type matches non-schema in first anyOf",
-                "data": null,
-                "valid": false
-            },
-            {
-                "description": "type matches non-schema in third anyOf",
-                "data": 1,
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/json/tests/latest b/json/tests/latest
deleted file mode 120000
index 9a4784d..0000000
--- a/json/tests/latest
+++ /dev/null
@@ -1 +0,0 @@
-draft2020-12
\ No newline at end of file
diff --git a/json/tox.ini b/json/tox.ini
deleted file mode 100644
index 7ca9de9..0000000
--- a/json/tox.ini
+++ /dev/null
@@ -1,9 +0,0 @@
-[tox]
-minversion = 1.6
-envlist = sanity
-skipsdist = True
-
-[testenv:sanity]
-# used just for validating the structure of the test case files themselves
-deps = jsonschema==4.17.3
-commands = {envpython} bin/jsonschema_suite check