diff --git a/.evergreen/config.yml b/.evergreen/config.yml index c7e2e5765..fb68dea9d 100644 --- a/.evergreen/config.yml +++ b/.evergreen/config.yml @@ -1186,7 +1186,7 @@ tasks: - func: "build static test tarball" vars: BUILD_FEATURES: "--features azure-oidc" - TEST_FILES: "${PROJECT_DIRECTORY}/src/test/spec/json/auth/unified" + TEST_FILES: "${PROJECT_DIRECTORY}/spec/auth/unified" - command: subprocess.exec type: test params: @@ -1203,7 +1203,7 @@ tasks: - func: "build static test tarball" vars: BUILD_FEATURES: "--features gcp-oidc" - TEST_FILES: "${PROJECT_DIRECTORY}/src/test/spec/json/auth/unified" + TEST_FILES: "${PROJECT_DIRECTORY}/spec/auth/unified" - command: subprocess.exec type: test params: @@ -1219,7 +1219,7 @@ tasks: commands: - func: "build static test tarball" vars: - TEST_FILES: "${PROJECT_DIRECTORY}/src/test/spec/json/auth/unified" + TEST_FILES: "${PROJECT_DIRECTORY}/spec/auth/unified" - command: ec2.assume_role params: role_arn: ${aws_test_secrets_role} diff --git a/etc/update-spec-tests.sh b/etc/update-spec-tests.sh index 69f970f88..bb6e7ede4 100755 --- a/etc/update-spec-tests.sh +++ b/etc/update-spec-tests.sh @@ -5,7 +5,7 @@ # The second argument is the branch/commit hash that the tests should be synced to. If it # is omitted, it will default to "master". # -# This script puts the tests in the directory $reporoot/src/test/spec/json/$specname. It +# This script puts the tests in the directory $reporoot/spec/$specname. It # must be run from the root of the repository. set -o errexit @@ -22,22 +22,23 @@ if [ "$#" -eq 0 ]; then fi REF="${2:-master}" +DEST="spec" tmpdir=`perl -MFile::Temp=tempdir -wle 'print tempdir(TMPDIR => 1, CLEANUP => 0)'` curl -sL "https://github.com/mongodb/specifications/archive/$REF.zip" -o "$tmpdir/specs.zip" unzip -q -d "$tmpdir" "$tmpdir/specs.zip" -mkdir -p "src/test/spec/json/$1" -rsync -ah "$tmpdir/specifications-$REF"*"/source/$1/tests/" "src/test/spec/json/$1" --delete +mkdir -p "${DEST}/$1" +rsync -ah "$tmpdir/specifications-$REF"*"/source/$1/tests/" "${DEST}/$1" --delete if [ "$1" = "client-side-encryption" ]; then - mkdir -p "src/test/spec/json/testdata/$1/data" - rsync -ah "$tmpdir/specifications-$REF"*"/source/$1/etc/data/" "src/test/spec/json/testdata/$1/data" --delete - mkdir -p "src/test/spec/json/testdata/$1/corpus" - rsync -ah "$tmpdir/specifications-$REF"*"/source/$1/corpus/" "src/test/spec/json/testdata/$1/corpus" --delete - mkdir -p "src/test/spec/json/testdata/$1/external" - rsync -ah "$tmpdir/specifications-$REF"*"/source/$1/external/" "src/test/spec/json/testdata/$1/external" --delete - mkdir -p "src/test/spec/json/testdata/$1/limits" - rsync -ah "$tmpdir/specifications-$REF"*"/source/$1/limits/" "src/test/spec/json/testdata/$1/limits" --delete + mkdir -p "${DEST}/testdata/$1/data" + rsync -ah "$tmpdir/specifications-$REF"*"/source/$1/etc/data/" "${DEST}/testdata/$1/data" --delete + mkdir -p "${DEST}/testdata/$1/corpus" + rsync -ah "$tmpdir/specifications-$REF"*"/source/$1/corpus/" "${DEST}/testdata/$1/corpus" --delete + mkdir -p "${DEST}/testdata/$1/external" + rsync -ah "$tmpdir/specifications-$REF"*"/source/$1/external/" "${DEST}/testdata/$1/external" --delete + mkdir -p "${DEST}/testdata/$1/limits" + rsync -ah "$tmpdir/specifications-$REF"*"/source/$1/limits/" "${DEST}/testdata/$1/limits" --delete fi rm -rf "$tmpdir" diff --git a/src/test/spec/json/auth/README.md b/spec/auth/README.md similarity index 100% rename from src/test/spec/json/auth/README.md rename to spec/auth/README.md diff --git a/src/test/spec/json/auth/legacy/connection-string.json b/spec/auth/legacy/connection-string.json similarity index 100% rename from src/test/spec/json/auth/legacy/connection-string.json rename to spec/auth/legacy/connection-string.json diff --git a/src/test/spec/json/auth/legacy/connection-string.yml b/spec/auth/legacy/connection-string.yml similarity index 100% rename from src/test/spec/json/auth/legacy/connection-string.yml rename to spec/auth/legacy/connection-string.yml diff --git a/src/test/spec/json/auth/mongodb-aws.md b/spec/auth/mongodb-aws.md similarity index 100% rename from src/test/spec/json/auth/mongodb-aws.md rename to spec/auth/mongodb-aws.md diff --git a/src/test/spec/json/auth/mongodb-oidc.md b/spec/auth/mongodb-oidc.md similarity index 100% rename from src/test/spec/json/auth/mongodb-oidc.md rename to spec/auth/mongodb-oidc.md diff --git a/src/test/spec/json/auth/unified/mongodb-oidc-no-retry.json b/spec/auth/unified/mongodb-oidc-no-retry.json similarity index 100% rename from src/test/spec/json/auth/unified/mongodb-oidc-no-retry.json rename to spec/auth/unified/mongodb-oidc-no-retry.json diff --git a/src/test/spec/json/auth/unified/mongodb-oidc-no-retry.yml b/spec/auth/unified/mongodb-oidc-no-retry.yml similarity index 100% rename from src/test/spec/json/auth/unified/mongodb-oidc-no-retry.yml rename to spec/auth/unified/mongodb-oidc-no-retry.yml diff --git a/src/test/spec/json/change-streams/README.md b/spec/change-streams/README.md similarity index 100% rename from src/test/spec/json/change-streams/README.md rename to spec/change-streams/README.md diff --git a/src/test/spec/json/change-streams/unified/change-streams-clusterTime.json b/spec/change-streams/unified/change-streams-clusterTime.json similarity index 100% rename from src/test/spec/json/change-streams/unified/change-streams-clusterTime.json rename to spec/change-streams/unified/change-streams-clusterTime.json diff --git a/src/test/spec/json/change-streams/unified/change-streams-clusterTime.yml b/spec/change-streams/unified/change-streams-clusterTime.yml similarity index 100% rename from src/test/spec/json/change-streams/unified/change-streams-clusterTime.yml rename to spec/change-streams/unified/change-streams-clusterTime.yml diff --git a/src/test/spec/json/change-streams/unified/change-streams-disambiguatedPaths.json b/spec/change-streams/unified/change-streams-disambiguatedPaths.json similarity index 100% rename from src/test/spec/json/change-streams/unified/change-streams-disambiguatedPaths.json rename to spec/change-streams/unified/change-streams-disambiguatedPaths.json diff --git a/src/test/spec/json/change-streams/unified/change-streams-disambiguatedPaths.yml b/spec/change-streams/unified/change-streams-disambiguatedPaths.yml similarity index 100% rename from src/test/spec/json/change-streams/unified/change-streams-disambiguatedPaths.yml rename to spec/change-streams/unified/change-streams-disambiguatedPaths.yml diff --git a/src/test/spec/json/change-streams/unified/change-streams-errors.json b/spec/change-streams/unified/change-streams-errors.json similarity index 100% rename from src/test/spec/json/change-streams/unified/change-streams-errors.json rename to spec/change-streams/unified/change-streams-errors.json diff --git a/src/test/spec/json/change-streams/unified/change-streams-errors.yml b/spec/change-streams/unified/change-streams-errors.yml similarity index 100% rename from src/test/spec/json/change-streams/unified/change-streams-errors.yml rename to spec/change-streams/unified/change-streams-errors.yml diff --git a/src/test/spec/json/change-streams/unified/change-streams-nsType.json b/spec/change-streams/unified/change-streams-nsType.json similarity index 100% rename from src/test/spec/json/change-streams/unified/change-streams-nsType.json rename to spec/change-streams/unified/change-streams-nsType.json diff --git a/src/test/spec/json/change-streams/unified/change-streams-nsType.yml b/spec/change-streams/unified/change-streams-nsType.yml similarity index 100% rename from src/test/spec/json/change-streams/unified/change-streams-nsType.yml rename to spec/change-streams/unified/change-streams-nsType.yml diff --git a/src/test/spec/json/change-streams/unified/change-streams-pre_and_post_images.json b/spec/change-streams/unified/change-streams-pre_and_post_images.json similarity index 100% rename from src/test/spec/json/change-streams/unified/change-streams-pre_and_post_images.json rename to spec/change-streams/unified/change-streams-pre_and_post_images.json diff --git a/src/test/spec/json/change-streams/unified/change-streams-pre_and_post_images.yml b/spec/change-streams/unified/change-streams-pre_and_post_images.yml similarity index 100% rename from src/test/spec/json/change-streams/unified/change-streams-pre_and_post_images.yml rename to spec/change-streams/unified/change-streams-pre_and_post_images.yml diff --git a/src/test/spec/json/change-streams/unified/change-streams-resume-allowlist.json b/spec/change-streams/unified/change-streams-resume-allowlist.json similarity index 100% rename from src/test/spec/json/change-streams/unified/change-streams-resume-allowlist.json rename to spec/change-streams/unified/change-streams-resume-allowlist.json diff --git a/src/test/spec/json/change-streams/unified/change-streams-resume-allowlist.yml b/spec/change-streams/unified/change-streams-resume-allowlist.yml similarity index 100% rename from src/test/spec/json/change-streams/unified/change-streams-resume-allowlist.yml rename to spec/change-streams/unified/change-streams-resume-allowlist.yml diff --git a/src/test/spec/json/change-streams/unified/change-streams-resume-errorLabels.json b/spec/change-streams/unified/change-streams-resume-errorLabels.json similarity index 100% rename from src/test/spec/json/change-streams/unified/change-streams-resume-errorLabels.json rename to spec/change-streams/unified/change-streams-resume-errorLabels.json diff --git a/src/test/spec/json/change-streams/unified/change-streams-resume-errorLabels.yml b/spec/change-streams/unified/change-streams-resume-errorLabels.yml similarity index 100% rename from src/test/spec/json/change-streams/unified/change-streams-resume-errorLabels.yml rename to spec/change-streams/unified/change-streams-resume-errorLabels.yml diff --git a/src/test/spec/json/change-streams/unified/change-streams-showExpandedEvents.json b/spec/change-streams/unified/change-streams-showExpandedEvents.json similarity index 100% rename from src/test/spec/json/change-streams/unified/change-streams-showExpandedEvents.json rename to spec/change-streams/unified/change-streams-showExpandedEvents.json diff --git a/src/test/spec/json/change-streams/unified/change-streams-showExpandedEvents.yml b/spec/change-streams/unified/change-streams-showExpandedEvents.yml similarity index 100% rename from src/test/spec/json/change-streams/unified/change-streams-showExpandedEvents.yml rename to spec/change-streams/unified/change-streams-showExpandedEvents.yml diff --git a/src/test/spec/json/change-streams/unified/change-streams.json b/spec/change-streams/unified/change-streams.json similarity index 100% rename from src/test/spec/json/change-streams/unified/change-streams.json rename to spec/change-streams/unified/change-streams.json diff --git a/src/test/spec/json/change-streams/unified/change-streams.yml b/spec/change-streams/unified/change-streams.yml similarity index 100% rename from src/test/spec/json/change-streams/unified/change-streams.yml rename to spec/change-streams/unified/change-streams.yml diff --git a/src/test/spec/json/client-side-encryption/README.md b/spec/client-side-encryption/README.md similarity index 100% rename from src/test/spec/json/client-side-encryption/README.md rename to spec/client-side-encryption/README.md diff --git a/src/test/spec/json/client-side-encryption/benchmarks.md b/spec/client-side-encryption/benchmarks.md similarity index 100% rename from src/test/spec/json/client-side-encryption/benchmarks.md rename to spec/client-side-encryption/benchmarks.md diff --git a/src/test/spec/json/client-side-encryption/unified/QE-Text-cleanupStructuredEncryptionData.json b/spec/client-side-encryption/unified/QE-Text-cleanupStructuredEncryptionData.json similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/QE-Text-cleanupStructuredEncryptionData.json rename to spec/client-side-encryption/unified/QE-Text-cleanupStructuredEncryptionData.json diff --git a/src/test/spec/json/client-side-encryption/unified/QE-Text-cleanupStructuredEncryptionData.yml b/spec/client-side-encryption/unified/QE-Text-cleanupStructuredEncryptionData.yml similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/QE-Text-cleanupStructuredEncryptionData.yml rename to spec/client-side-encryption/unified/QE-Text-cleanupStructuredEncryptionData.yml diff --git a/src/test/spec/json/client-side-encryption/unified/QE-Text-compactStructuredEncryptionData.json b/spec/client-side-encryption/unified/QE-Text-compactStructuredEncryptionData.json similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/QE-Text-compactStructuredEncryptionData.json rename to spec/client-side-encryption/unified/QE-Text-compactStructuredEncryptionData.json diff --git a/src/test/spec/json/client-side-encryption/unified/QE-Text-compactStructuredEncryptionData.yml b/spec/client-side-encryption/unified/QE-Text-compactStructuredEncryptionData.yml similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/QE-Text-compactStructuredEncryptionData.yml rename to spec/client-side-encryption/unified/QE-Text-compactStructuredEncryptionData.yml diff --git a/src/test/spec/json/client-side-encryption/unified/QE-Text-prefixPreview.json b/spec/client-side-encryption/unified/QE-Text-prefixPreview.json similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/QE-Text-prefixPreview.json rename to spec/client-side-encryption/unified/QE-Text-prefixPreview.json diff --git a/src/test/spec/json/client-side-encryption/unified/QE-Text-prefixPreview.yml b/spec/client-side-encryption/unified/QE-Text-prefixPreview.yml similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/QE-Text-prefixPreview.yml rename to spec/client-side-encryption/unified/QE-Text-prefixPreview.yml diff --git a/src/test/spec/json/client-side-encryption/unified/QE-Text-substringPreview.json b/spec/client-side-encryption/unified/QE-Text-substringPreview.json similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/QE-Text-substringPreview.json rename to spec/client-side-encryption/unified/QE-Text-substringPreview.json diff --git a/src/test/spec/json/client-side-encryption/unified/QE-Text-substringPreview.yml b/spec/client-side-encryption/unified/QE-Text-substringPreview.yml similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/QE-Text-substringPreview.yml rename to spec/client-side-encryption/unified/QE-Text-substringPreview.yml diff --git a/src/test/spec/json/client-side-encryption/unified/QE-Text-suffixPreview.json b/spec/client-side-encryption/unified/QE-Text-suffixPreview.json similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/QE-Text-suffixPreview.json rename to spec/client-side-encryption/unified/QE-Text-suffixPreview.json diff --git a/src/test/spec/json/client-side-encryption/unified/QE-Text-suffixPreview.yml b/spec/client-side-encryption/unified/QE-Text-suffixPreview.yml similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/QE-Text-suffixPreview.yml rename to spec/client-side-encryption/unified/QE-Text-suffixPreview.yml diff --git a/src/test/spec/json/client-side-encryption/unified/addKeyAltName.json b/spec/client-side-encryption/unified/addKeyAltName.json similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/addKeyAltName.json rename to spec/client-side-encryption/unified/addKeyAltName.json diff --git a/src/test/spec/json/client-side-encryption/unified/addKeyAltName.yml b/spec/client-side-encryption/unified/addKeyAltName.yml similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/addKeyAltName.yml rename to spec/client-side-encryption/unified/addKeyAltName.yml diff --git a/src/test/spec/json/client-side-encryption/unified/aggregate.json b/spec/client-side-encryption/unified/aggregate.json similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/aggregate.json rename to spec/client-side-encryption/unified/aggregate.json diff --git a/src/test/spec/json/client-side-encryption/unified/aggregate.yml b/spec/client-side-encryption/unified/aggregate.yml similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/aggregate.yml rename to spec/client-side-encryption/unified/aggregate.yml diff --git a/src/test/spec/json/client-side-encryption/unified/awsTemporary.json b/spec/client-side-encryption/unified/awsTemporary.json similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/awsTemporary.json rename to spec/client-side-encryption/unified/awsTemporary.json diff --git a/src/test/spec/json/client-side-encryption/unified/awsTemporary.yml b/spec/client-side-encryption/unified/awsTemporary.yml similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/awsTemporary.yml rename to spec/client-side-encryption/unified/awsTemporary.yml diff --git a/src/test/spec/json/client-side-encryption/unified/azureKMS.json b/spec/client-side-encryption/unified/azureKMS.json similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/azureKMS.json rename to spec/client-side-encryption/unified/azureKMS.json diff --git a/src/test/spec/json/client-side-encryption/unified/azureKMS.yml b/spec/client-side-encryption/unified/azureKMS.yml similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/azureKMS.yml rename to spec/client-side-encryption/unified/azureKMS.yml diff --git a/src/test/spec/json/client-side-encryption/unified/badQueries.json b/spec/client-side-encryption/unified/badQueries.json similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/badQueries.json rename to spec/client-side-encryption/unified/badQueries.json diff --git a/src/test/spec/json/client-side-encryption/unified/badQueries.yml b/spec/client-side-encryption/unified/badQueries.yml similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/badQueries.yml rename to spec/client-side-encryption/unified/badQueries.yml diff --git a/src/test/spec/json/client-side-encryption/unified/badSchema.json b/spec/client-side-encryption/unified/badSchema.json similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/badSchema.json rename to spec/client-side-encryption/unified/badSchema.json diff --git a/src/test/spec/json/client-side-encryption/unified/badSchema.yml b/spec/client-side-encryption/unified/badSchema.yml similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/badSchema.yml rename to spec/client-side-encryption/unified/badSchema.yml diff --git a/src/test/spec/json/client-side-encryption/unified/basic.json b/spec/client-side-encryption/unified/basic.json similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/basic.json rename to spec/client-side-encryption/unified/basic.json diff --git a/src/test/spec/json/client-side-encryption/unified/basic.yml b/spec/client-side-encryption/unified/basic.yml similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/basic.yml rename to spec/client-side-encryption/unified/basic.yml diff --git a/src/test/spec/json/client-side-encryption/unified/bulk.json b/spec/client-side-encryption/unified/bulk.json similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/bulk.json rename to spec/client-side-encryption/unified/bulk.json diff --git a/src/test/spec/json/client-side-encryption/unified/bulk.yml b/spec/client-side-encryption/unified/bulk.yml similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/bulk.yml rename to spec/client-side-encryption/unified/bulk.yml diff --git a/src/test/spec/json/client-side-encryption/unified/bypassAutoEncryption.json b/spec/client-side-encryption/unified/bypassAutoEncryption.json similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/bypassAutoEncryption.json rename to spec/client-side-encryption/unified/bypassAutoEncryption.json diff --git a/src/test/spec/json/client-side-encryption/unified/bypassAutoEncryption.yml b/spec/client-side-encryption/unified/bypassAutoEncryption.yml similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/bypassAutoEncryption.yml rename to spec/client-side-encryption/unified/bypassAutoEncryption.yml diff --git a/src/test/spec/json/client-side-encryption/unified/bypassedCommand.json b/spec/client-side-encryption/unified/bypassedCommand.json similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/bypassedCommand.json rename to spec/client-side-encryption/unified/bypassedCommand.json diff --git a/src/test/spec/json/client-side-encryption/unified/bypassedCommand.yml b/spec/client-side-encryption/unified/bypassedCommand.yml similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/bypassedCommand.yml rename to spec/client-side-encryption/unified/bypassedCommand.yml diff --git a/src/test/spec/json/client-side-encryption/unified/client-bulkWrite-qe.json b/spec/client-side-encryption/unified/client-bulkWrite-qe.json similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/client-bulkWrite-qe.json rename to spec/client-side-encryption/unified/client-bulkWrite-qe.json diff --git a/src/test/spec/json/client-side-encryption/unified/client-bulkWrite-qe.yml b/spec/client-side-encryption/unified/client-bulkWrite-qe.yml similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/client-bulkWrite-qe.yml rename to spec/client-side-encryption/unified/client-bulkWrite-qe.yml diff --git a/src/test/spec/json/client-side-encryption/unified/count.json b/spec/client-side-encryption/unified/count.json similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/count.json rename to spec/client-side-encryption/unified/count.json diff --git a/src/test/spec/json/client-side-encryption/unified/count.yml b/spec/client-side-encryption/unified/count.yml similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/count.yml rename to spec/client-side-encryption/unified/count.yml diff --git a/src/test/spec/json/client-side-encryption/unified/countDocuments.json b/spec/client-side-encryption/unified/countDocuments.json similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/countDocuments.json rename to spec/client-side-encryption/unified/countDocuments.json diff --git a/src/test/spec/json/client-side-encryption/unified/countDocuments.yml b/spec/client-side-encryption/unified/countDocuments.yml similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/countDocuments.yml rename to spec/client-side-encryption/unified/countDocuments.yml diff --git a/src/test/spec/json/client-side-encryption/unified/create-and-createIndexes.json b/spec/client-side-encryption/unified/create-and-createIndexes.json similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/create-and-createIndexes.json rename to spec/client-side-encryption/unified/create-and-createIndexes.json diff --git a/src/test/spec/json/client-side-encryption/unified/create-and-createIndexes.yml b/spec/client-side-encryption/unified/create-and-createIndexes.yml similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/create-and-createIndexes.yml rename to spec/client-side-encryption/unified/create-and-createIndexes.yml diff --git a/src/test/spec/json/client-side-encryption/unified/createDataKey-kms_providers-invalid.json b/spec/client-side-encryption/unified/createDataKey-kms_providers-invalid.json similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/createDataKey-kms_providers-invalid.json rename to spec/client-side-encryption/unified/createDataKey-kms_providers-invalid.json diff --git a/src/test/spec/json/client-side-encryption/unified/createDataKey-kms_providers-invalid.yml b/spec/client-side-encryption/unified/createDataKey-kms_providers-invalid.yml similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/createDataKey-kms_providers-invalid.yml rename to spec/client-side-encryption/unified/createDataKey-kms_providers-invalid.yml diff --git a/src/test/spec/json/client-side-encryption/unified/createDataKey.json b/spec/client-side-encryption/unified/createDataKey.json similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/createDataKey.json rename to spec/client-side-encryption/unified/createDataKey.json diff --git a/src/test/spec/json/client-side-encryption/unified/createDataKey.yml b/spec/client-side-encryption/unified/createDataKey.yml similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/createDataKey.yml rename to spec/client-side-encryption/unified/createDataKey.yml diff --git a/src/test/spec/json/client-side-encryption/unified/delete.json b/spec/client-side-encryption/unified/delete.json similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/delete.json rename to spec/client-side-encryption/unified/delete.json diff --git a/src/test/spec/json/client-side-encryption/unified/delete.yml b/spec/client-side-encryption/unified/delete.yml similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/delete.yml rename to spec/client-side-encryption/unified/delete.yml diff --git a/src/test/spec/json/client-side-encryption/unified/deleteKey.json b/spec/client-side-encryption/unified/deleteKey.json similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/deleteKey.json rename to spec/client-side-encryption/unified/deleteKey.json diff --git a/src/test/spec/json/client-side-encryption/unified/deleteKey.yml b/spec/client-side-encryption/unified/deleteKey.yml similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/deleteKey.yml rename to spec/client-side-encryption/unified/deleteKey.yml diff --git a/src/test/spec/json/client-side-encryption/unified/distinct.json b/spec/client-side-encryption/unified/distinct.json similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/distinct.json rename to spec/client-side-encryption/unified/distinct.json diff --git a/src/test/spec/json/client-side-encryption/unified/distinct.yml b/spec/client-side-encryption/unified/distinct.yml similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/distinct.yml rename to spec/client-side-encryption/unified/distinct.yml diff --git a/src/test/spec/json/client-side-encryption/unified/explain.json b/spec/client-side-encryption/unified/explain.json similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/explain.json rename to spec/client-side-encryption/unified/explain.json diff --git a/src/test/spec/json/client-side-encryption/unified/explain.yml b/spec/client-side-encryption/unified/explain.yml similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/explain.yml rename to spec/client-side-encryption/unified/explain.yml diff --git a/src/test/spec/json/client-side-encryption/unified/find.json b/spec/client-side-encryption/unified/find.json similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/find.json rename to spec/client-side-encryption/unified/find.json diff --git a/src/test/spec/json/client-side-encryption/unified/find.yml b/spec/client-side-encryption/unified/find.yml similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/find.yml rename to spec/client-side-encryption/unified/find.yml diff --git a/src/test/spec/json/client-side-encryption/unified/findOneAndDelete.json b/spec/client-side-encryption/unified/findOneAndDelete.json similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/findOneAndDelete.json rename to spec/client-side-encryption/unified/findOneAndDelete.json diff --git a/src/test/spec/json/client-side-encryption/unified/findOneAndDelete.yml b/spec/client-side-encryption/unified/findOneAndDelete.yml similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/findOneAndDelete.yml rename to spec/client-side-encryption/unified/findOneAndDelete.yml diff --git a/src/test/spec/json/client-side-encryption/unified/findOneAndReplace.json b/spec/client-side-encryption/unified/findOneAndReplace.json similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/findOneAndReplace.json rename to spec/client-side-encryption/unified/findOneAndReplace.json diff --git a/src/test/spec/json/client-side-encryption/unified/findOneAndReplace.yml b/spec/client-side-encryption/unified/findOneAndReplace.yml similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/findOneAndReplace.yml rename to spec/client-side-encryption/unified/findOneAndReplace.yml diff --git a/src/test/spec/json/client-side-encryption/unified/findOneAndUpdate.json b/spec/client-side-encryption/unified/findOneAndUpdate.json similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/findOneAndUpdate.json rename to spec/client-side-encryption/unified/findOneAndUpdate.json diff --git a/src/test/spec/json/client-side-encryption/unified/findOneAndUpdate.yml b/spec/client-side-encryption/unified/findOneAndUpdate.yml similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/findOneAndUpdate.yml rename to spec/client-side-encryption/unified/findOneAndUpdate.yml diff --git a/src/test/spec/json/client-side-encryption/unified/fle2v2-BypassQueryAnalysis.json b/spec/client-side-encryption/unified/fle2v2-BypassQueryAnalysis.json similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/fle2v2-BypassQueryAnalysis.json rename to spec/client-side-encryption/unified/fle2v2-BypassQueryAnalysis.json diff --git a/src/test/spec/json/client-side-encryption/unified/fle2v2-BypassQueryAnalysis.yml b/spec/client-side-encryption/unified/fle2v2-BypassQueryAnalysis.yml similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/fle2v2-BypassQueryAnalysis.yml rename to spec/client-side-encryption/unified/fle2v2-BypassQueryAnalysis.yml diff --git a/src/test/spec/json/client-side-encryption/unified/fle2v2-Compact.json b/spec/client-side-encryption/unified/fle2v2-Compact.json similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/fle2v2-Compact.json rename to spec/client-side-encryption/unified/fle2v2-Compact.json diff --git a/src/test/spec/json/client-side-encryption/unified/fle2v2-Compact.yml b/spec/client-side-encryption/unified/fle2v2-Compact.yml similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/fle2v2-Compact.yml rename to spec/client-side-encryption/unified/fle2v2-Compact.yml diff --git a/src/test/spec/json/client-side-encryption/unified/fle2v2-CreateCollection-OldServer.json b/spec/client-side-encryption/unified/fle2v2-CreateCollection-OldServer.json similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/fle2v2-CreateCollection-OldServer.json rename to spec/client-side-encryption/unified/fle2v2-CreateCollection-OldServer.json diff --git a/src/test/spec/json/client-side-encryption/unified/fle2v2-CreateCollection-OldServer.yml b/spec/client-side-encryption/unified/fle2v2-CreateCollection-OldServer.yml similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/fle2v2-CreateCollection-OldServer.yml rename to spec/client-side-encryption/unified/fle2v2-CreateCollection-OldServer.yml diff --git a/src/test/spec/json/client-side-encryption/unified/fle2v2-CreateCollection.json b/spec/client-side-encryption/unified/fle2v2-CreateCollection.json similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/fle2v2-CreateCollection.json rename to spec/client-side-encryption/unified/fle2v2-CreateCollection.json diff --git a/src/test/spec/json/client-side-encryption/unified/fle2v2-CreateCollection.yml b/spec/client-side-encryption/unified/fle2v2-CreateCollection.yml similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/fle2v2-CreateCollection.yml rename to spec/client-side-encryption/unified/fle2v2-CreateCollection.yml diff --git a/src/test/spec/json/client-side-encryption/unified/fle2v2-DecryptExistingData.json b/spec/client-side-encryption/unified/fle2v2-DecryptExistingData.json similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/fle2v2-DecryptExistingData.json rename to spec/client-side-encryption/unified/fle2v2-DecryptExistingData.json diff --git a/src/test/spec/json/client-side-encryption/unified/fle2v2-DecryptExistingData.yml b/spec/client-side-encryption/unified/fle2v2-DecryptExistingData.yml similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/fle2v2-DecryptExistingData.yml rename to spec/client-side-encryption/unified/fle2v2-DecryptExistingData.yml diff --git a/src/test/spec/json/client-side-encryption/unified/fle2v2-Delete.json b/spec/client-side-encryption/unified/fle2v2-Delete.json similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/fle2v2-Delete.json rename to spec/client-side-encryption/unified/fle2v2-Delete.json diff --git a/src/test/spec/json/client-side-encryption/unified/fle2v2-Delete.yml b/spec/client-side-encryption/unified/fle2v2-Delete.yml similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/fle2v2-Delete.yml rename to spec/client-side-encryption/unified/fle2v2-Delete.yml diff --git a/src/test/spec/json/client-side-encryption/unified/fle2v2-EncryptedFields-vs-EncryptedFieldsMap.json b/spec/client-side-encryption/unified/fle2v2-EncryptedFields-vs-EncryptedFieldsMap.json similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/fle2v2-EncryptedFields-vs-EncryptedFieldsMap.json rename to spec/client-side-encryption/unified/fle2v2-EncryptedFields-vs-EncryptedFieldsMap.json diff --git a/src/test/spec/json/client-side-encryption/unified/fle2v2-EncryptedFields-vs-EncryptedFieldsMap.yml b/spec/client-side-encryption/unified/fle2v2-EncryptedFields-vs-EncryptedFieldsMap.yml similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/fle2v2-EncryptedFields-vs-EncryptedFieldsMap.yml rename to spec/client-side-encryption/unified/fle2v2-EncryptedFields-vs-EncryptedFieldsMap.yml diff --git a/src/test/spec/json/client-side-encryption/unified/fle2v2-EncryptedFields-vs-jsonSchema.json b/spec/client-side-encryption/unified/fle2v2-EncryptedFields-vs-jsonSchema.json similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/fle2v2-EncryptedFields-vs-jsonSchema.json rename to spec/client-side-encryption/unified/fle2v2-EncryptedFields-vs-jsonSchema.json diff --git a/src/test/spec/json/client-side-encryption/unified/fle2v2-EncryptedFields-vs-jsonSchema.yml b/spec/client-side-encryption/unified/fle2v2-EncryptedFields-vs-jsonSchema.yml similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/fle2v2-EncryptedFields-vs-jsonSchema.yml rename to spec/client-side-encryption/unified/fle2v2-EncryptedFields-vs-jsonSchema.yml diff --git a/src/test/spec/json/client-side-encryption/unified/fle2v2-EncryptedFieldsMap-defaults.json b/spec/client-side-encryption/unified/fle2v2-EncryptedFieldsMap-defaults.json similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/fle2v2-EncryptedFieldsMap-defaults.json rename to spec/client-side-encryption/unified/fle2v2-EncryptedFieldsMap-defaults.json diff --git a/src/test/spec/json/client-side-encryption/unified/fle2v2-EncryptedFieldsMap-defaults.yml b/spec/client-side-encryption/unified/fle2v2-EncryptedFieldsMap-defaults.yml similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/fle2v2-EncryptedFieldsMap-defaults.yml rename to spec/client-side-encryption/unified/fle2v2-EncryptedFieldsMap-defaults.yml diff --git a/src/test/spec/json/client-side-encryption/unified/fle2v2-FindOneAndUpdate.json b/spec/client-side-encryption/unified/fle2v2-FindOneAndUpdate.json similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/fle2v2-FindOneAndUpdate.json rename to spec/client-side-encryption/unified/fle2v2-FindOneAndUpdate.json diff --git a/src/test/spec/json/client-side-encryption/unified/fle2v2-FindOneAndUpdate.yml b/spec/client-side-encryption/unified/fle2v2-FindOneAndUpdate.yml similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/fle2v2-FindOneAndUpdate.yml rename to spec/client-side-encryption/unified/fle2v2-FindOneAndUpdate.yml diff --git a/src/test/spec/json/client-side-encryption/unified/fle2v2-InsertFind-Indexed.json b/spec/client-side-encryption/unified/fle2v2-InsertFind-Indexed.json similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/fle2v2-InsertFind-Indexed.json rename to spec/client-side-encryption/unified/fle2v2-InsertFind-Indexed.json diff --git a/src/test/spec/json/client-side-encryption/unified/fle2v2-InsertFind-Indexed.yml b/spec/client-side-encryption/unified/fle2v2-InsertFind-Indexed.yml similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/fle2v2-InsertFind-Indexed.yml rename to spec/client-side-encryption/unified/fle2v2-InsertFind-Indexed.yml diff --git a/src/test/spec/json/client-side-encryption/unified/fle2v2-InsertFind-Unindexed.json b/spec/client-side-encryption/unified/fle2v2-InsertFind-Unindexed.json similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/fle2v2-InsertFind-Unindexed.json rename to spec/client-side-encryption/unified/fle2v2-InsertFind-Unindexed.json diff --git a/src/test/spec/json/client-side-encryption/unified/fle2v2-InsertFind-Unindexed.yml b/spec/client-side-encryption/unified/fle2v2-InsertFind-Unindexed.yml similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/fle2v2-InsertFind-Unindexed.yml rename to spec/client-side-encryption/unified/fle2v2-InsertFind-Unindexed.yml diff --git a/src/test/spec/json/client-side-encryption/unified/fle2v2-MissingKey.json b/spec/client-side-encryption/unified/fle2v2-MissingKey.json similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/fle2v2-MissingKey.json rename to spec/client-side-encryption/unified/fle2v2-MissingKey.json diff --git a/src/test/spec/json/client-side-encryption/unified/fle2v2-MissingKey.yml b/spec/client-side-encryption/unified/fle2v2-MissingKey.yml similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/fle2v2-MissingKey.yml rename to spec/client-side-encryption/unified/fle2v2-MissingKey.yml diff --git a/src/test/spec/json/client-side-encryption/unified/fle2v2-NoEncryption.json b/spec/client-side-encryption/unified/fle2v2-NoEncryption.json similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/fle2v2-NoEncryption.json rename to spec/client-side-encryption/unified/fle2v2-NoEncryption.json diff --git a/src/test/spec/json/client-side-encryption/unified/fle2v2-NoEncryption.yml b/spec/client-side-encryption/unified/fle2v2-NoEncryption.yml similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/fle2v2-NoEncryption.yml rename to spec/client-side-encryption/unified/fle2v2-NoEncryption.yml diff --git a/src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-Compact.json b/spec/client-side-encryption/unified/fle2v2-Rangev2-Compact.json similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-Compact.json rename to spec/client-side-encryption/unified/fle2v2-Rangev2-Compact.json diff --git a/src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-Compact.yml b/spec/client-side-encryption/unified/fle2v2-Rangev2-Compact.yml similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-Compact.yml rename to spec/client-side-encryption/unified/fle2v2-Rangev2-Compact.yml diff --git a/src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-Date-Aggregate.json b/spec/client-side-encryption/unified/fle2v2-Rangev2-Date-Aggregate.json similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-Date-Aggregate.json rename to spec/client-side-encryption/unified/fle2v2-Rangev2-Date-Aggregate.json diff --git a/src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-Date-Aggregate.yml b/spec/client-side-encryption/unified/fle2v2-Rangev2-Date-Aggregate.yml similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-Date-Aggregate.yml rename to spec/client-side-encryption/unified/fle2v2-Rangev2-Date-Aggregate.yml diff --git a/src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-Date-Correctness.json b/spec/client-side-encryption/unified/fle2v2-Rangev2-Date-Correctness.json similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-Date-Correctness.json rename to spec/client-side-encryption/unified/fle2v2-Rangev2-Date-Correctness.json diff --git a/src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-Date-Correctness.yml b/spec/client-side-encryption/unified/fle2v2-Rangev2-Date-Correctness.yml similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-Date-Correctness.yml rename to spec/client-side-encryption/unified/fle2v2-Rangev2-Date-Correctness.yml diff --git a/src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-Date-Delete.json b/spec/client-side-encryption/unified/fle2v2-Rangev2-Date-Delete.json similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-Date-Delete.json rename to spec/client-side-encryption/unified/fle2v2-Rangev2-Date-Delete.json diff --git a/src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-Date-Delete.yml b/spec/client-side-encryption/unified/fle2v2-Rangev2-Date-Delete.yml similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-Date-Delete.yml rename to spec/client-side-encryption/unified/fle2v2-Rangev2-Date-Delete.yml diff --git a/src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-Date-FindOneAndUpdate.json b/spec/client-side-encryption/unified/fle2v2-Rangev2-Date-FindOneAndUpdate.json similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-Date-FindOneAndUpdate.json rename to spec/client-side-encryption/unified/fle2v2-Rangev2-Date-FindOneAndUpdate.json diff --git a/src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-Date-FindOneAndUpdate.yml b/spec/client-side-encryption/unified/fle2v2-Rangev2-Date-FindOneAndUpdate.yml similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-Date-FindOneAndUpdate.yml rename to spec/client-side-encryption/unified/fle2v2-Rangev2-Date-FindOneAndUpdate.yml diff --git a/src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-Date-InsertFind.json b/spec/client-side-encryption/unified/fle2v2-Rangev2-Date-InsertFind.json similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-Date-InsertFind.json rename to spec/client-side-encryption/unified/fle2v2-Rangev2-Date-InsertFind.json diff --git a/src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-Date-InsertFind.yml b/spec/client-side-encryption/unified/fle2v2-Rangev2-Date-InsertFind.yml similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-Date-InsertFind.yml rename to spec/client-side-encryption/unified/fle2v2-Rangev2-Date-InsertFind.yml diff --git a/src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-Date-Update.json b/spec/client-side-encryption/unified/fle2v2-Rangev2-Date-Update.json similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-Date-Update.json rename to spec/client-side-encryption/unified/fle2v2-Rangev2-Date-Update.json diff --git a/src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-Date-Update.yml b/spec/client-side-encryption/unified/fle2v2-Rangev2-Date-Update.yml similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-Date-Update.yml rename to spec/client-side-encryption/unified/fle2v2-Rangev2-Date-Update.yml diff --git a/src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-Decimal-Aggregate.json b/spec/client-side-encryption/unified/fle2v2-Rangev2-Decimal-Aggregate.json similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-Decimal-Aggregate.json rename to spec/client-side-encryption/unified/fle2v2-Rangev2-Decimal-Aggregate.json diff --git a/src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-Decimal-Aggregate.yml b/spec/client-side-encryption/unified/fle2v2-Rangev2-Decimal-Aggregate.yml similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-Decimal-Aggregate.yml rename to spec/client-side-encryption/unified/fle2v2-Rangev2-Decimal-Aggregate.yml diff --git a/src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-Decimal-Correctness.json b/spec/client-side-encryption/unified/fle2v2-Rangev2-Decimal-Correctness.json similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-Decimal-Correctness.json rename to spec/client-side-encryption/unified/fle2v2-Rangev2-Decimal-Correctness.json diff --git a/src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-Decimal-Correctness.yml b/spec/client-side-encryption/unified/fle2v2-Rangev2-Decimal-Correctness.yml similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-Decimal-Correctness.yml rename to spec/client-side-encryption/unified/fle2v2-Rangev2-Decimal-Correctness.yml diff --git a/src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-Decimal-Delete.json b/spec/client-side-encryption/unified/fle2v2-Rangev2-Decimal-Delete.json similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-Decimal-Delete.json rename to spec/client-side-encryption/unified/fle2v2-Rangev2-Decimal-Delete.json diff --git a/src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-Decimal-Delete.yml b/spec/client-side-encryption/unified/fle2v2-Rangev2-Decimal-Delete.yml similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-Decimal-Delete.yml rename to spec/client-side-encryption/unified/fle2v2-Rangev2-Decimal-Delete.yml diff --git a/src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-Decimal-FindOneAndUpdate.json b/spec/client-side-encryption/unified/fle2v2-Rangev2-Decimal-FindOneAndUpdate.json similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-Decimal-FindOneAndUpdate.json rename to spec/client-side-encryption/unified/fle2v2-Rangev2-Decimal-FindOneAndUpdate.json diff --git a/src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-Decimal-FindOneAndUpdate.yml b/spec/client-side-encryption/unified/fle2v2-Rangev2-Decimal-FindOneAndUpdate.yml similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-Decimal-FindOneAndUpdate.yml rename to spec/client-side-encryption/unified/fle2v2-Rangev2-Decimal-FindOneAndUpdate.yml diff --git a/src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-Decimal-InsertFind.json b/spec/client-side-encryption/unified/fle2v2-Rangev2-Decimal-InsertFind.json similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-Decimal-InsertFind.json rename to spec/client-side-encryption/unified/fle2v2-Rangev2-Decimal-InsertFind.json diff --git a/src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-Decimal-InsertFind.yml b/spec/client-side-encryption/unified/fle2v2-Rangev2-Decimal-InsertFind.yml similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-Decimal-InsertFind.yml rename to spec/client-side-encryption/unified/fle2v2-Rangev2-Decimal-InsertFind.yml diff --git a/src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-Decimal-Update.json b/spec/client-side-encryption/unified/fle2v2-Rangev2-Decimal-Update.json similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-Decimal-Update.json rename to spec/client-side-encryption/unified/fle2v2-Rangev2-Decimal-Update.json diff --git a/src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-Decimal-Update.yml b/spec/client-side-encryption/unified/fle2v2-Rangev2-Decimal-Update.yml similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-Decimal-Update.yml rename to spec/client-side-encryption/unified/fle2v2-Rangev2-Decimal-Update.yml diff --git a/src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-DecimalPrecision-Aggregate.json b/spec/client-side-encryption/unified/fle2v2-Rangev2-DecimalPrecision-Aggregate.json similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-DecimalPrecision-Aggregate.json rename to spec/client-side-encryption/unified/fle2v2-Rangev2-DecimalPrecision-Aggregate.json diff --git a/src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-DecimalPrecision-Aggregate.yml b/spec/client-side-encryption/unified/fle2v2-Rangev2-DecimalPrecision-Aggregate.yml similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-DecimalPrecision-Aggregate.yml rename to spec/client-side-encryption/unified/fle2v2-Rangev2-DecimalPrecision-Aggregate.yml diff --git a/src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-DecimalPrecision-Correctness.json b/spec/client-side-encryption/unified/fle2v2-Rangev2-DecimalPrecision-Correctness.json similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-DecimalPrecision-Correctness.json rename to spec/client-side-encryption/unified/fle2v2-Rangev2-DecimalPrecision-Correctness.json diff --git a/src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-DecimalPrecision-Correctness.yml b/spec/client-side-encryption/unified/fle2v2-Rangev2-DecimalPrecision-Correctness.yml similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-DecimalPrecision-Correctness.yml rename to spec/client-side-encryption/unified/fle2v2-Rangev2-DecimalPrecision-Correctness.yml diff --git a/src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-DecimalPrecision-Delete.json b/spec/client-side-encryption/unified/fle2v2-Rangev2-DecimalPrecision-Delete.json similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-DecimalPrecision-Delete.json rename to spec/client-side-encryption/unified/fle2v2-Rangev2-DecimalPrecision-Delete.json diff --git a/src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-DecimalPrecision-Delete.yml b/spec/client-side-encryption/unified/fle2v2-Rangev2-DecimalPrecision-Delete.yml similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-DecimalPrecision-Delete.yml rename to spec/client-side-encryption/unified/fle2v2-Rangev2-DecimalPrecision-Delete.yml diff --git a/src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-DecimalPrecision-FindOneAndUpdate.json b/spec/client-side-encryption/unified/fle2v2-Rangev2-DecimalPrecision-FindOneAndUpdate.json similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-DecimalPrecision-FindOneAndUpdate.json rename to spec/client-side-encryption/unified/fle2v2-Rangev2-DecimalPrecision-FindOneAndUpdate.json diff --git a/src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-DecimalPrecision-FindOneAndUpdate.yml b/spec/client-side-encryption/unified/fle2v2-Rangev2-DecimalPrecision-FindOneAndUpdate.yml similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-DecimalPrecision-FindOneAndUpdate.yml rename to spec/client-side-encryption/unified/fle2v2-Rangev2-DecimalPrecision-FindOneAndUpdate.yml diff --git a/src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-DecimalPrecision-InsertFind.json b/spec/client-side-encryption/unified/fle2v2-Rangev2-DecimalPrecision-InsertFind.json similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-DecimalPrecision-InsertFind.json rename to spec/client-side-encryption/unified/fle2v2-Rangev2-DecimalPrecision-InsertFind.json diff --git a/src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-DecimalPrecision-InsertFind.yml b/spec/client-side-encryption/unified/fle2v2-Rangev2-DecimalPrecision-InsertFind.yml similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-DecimalPrecision-InsertFind.yml rename to spec/client-side-encryption/unified/fle2v2-Rangev2-DecimalPrecision-InsertFind.yml diff --git a/src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-DecimalPrecision-Update.json b/spec/client-side-encryption/unified/fle2v2-Rangev2-DecimalPrecision-Update.json similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-DecimalPrecision-Update.json rename to spec/client-side-encryption/unified/fle2v2-Rangev2-DecimalPrecision-Update.json diff --git a/src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-DecimalPrecision-Update.yml b/spec/client-side-encryption/unified/fle2v2-Rangev2-DecimalPrecision-Update.yml similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-DecimalPrecision-Update.yml rename to spec/client-side-encryption/unified/fle2v2-Rangev2-DecimalPrecision-Update.yml diff --git a/src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-Defaults.json b/spec/client-side-encryption/unified/fle2v2-Rangev2-Defaults.json similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-Defaults.json rename to spec/client-side-encryption/unified/fle2v2-Rangev2-Defaults.json diff --git a/src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-Defaults.yml b/spec/client-side-encryption/unified/fle2v2-Rangev2-Defaults.yml similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-Defaults.yml rename to spec/client-side-encryption/unified/fle2v2-Rangev2-Defaults.yml diff --git a/src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-Double-Aggregate.json b/spec/client-side-encryption/unified/fle2v2-Rangev2-Double-Aggregate.json similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-Double-Aggregate.json rename to spec/client-side-encryption/unified/fle2v2-Rangev2-Double-Aggregate.json diff --git a/src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-Double-Aggregate.yml b/spec/client-side-encryption/unified/fle2v2-Rangev2-Double-Aggregate.yml similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-Double-Aggregate.yml rename to spec/client-side-encryption/unified/fle2v2-Rangev2-Double-Aggregate.yml diff --git a/src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-Double-Correctness.json b/spec/client-side-encryption/unified/fle2v2-Rangev2-Double-Correctness.json similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-Double-Correctness.json rename to spec/client-side-encryption/unified/fle2v2-Rangev2-Double-Correctness.json diff --git a/src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-Double-Correctness.yml b/spec/client-side-encryption/unified/fle2v2-Rangev2-Double-Correctness.yml similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-Double-Correctness.yml rename to spec/client-side-encryption/unified/fle2v2-Rangev2-Double-Correctness.yml diff --git a/src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-Double-Delete.json b/spec/client-side-encryption/unified/fle2v2-Rangev2-Double-Delete.json similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-Double-Delete.json rename to spec/client-side-encryption/unified/fle2v2-Rangev2-Double-Delete.json diff --git a/src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-Double-Delete.yml b/spec/client-side-encryption/unified/fle2v2-Rangev2-Double-Delete.yml similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-Double-Delete.yml rename to spec/client-side-encryption/unified/fle2v2-Rangev2-Double-Delete.yml diff --git a/src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-Double-FindOneAndUpdate.json b/spec/client-side-encryption/unified/fle2v2-Rangev2-Double-FindOneAndUpdate.json similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-Double-FindOneAndUpdate.json rename to spec/client-side-encryption/unified/fle2v2-Rangev2-Double-FindOneAndUpdate.json diff --git a/src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-Double-FindOneAndUpdate.yml b/spec/client-side-encryption/unified/fle2v2-Rangev2-Double-FindOneAndUpdate.yml similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-Double-FindOneAndUpdate.yml rename to spec/client-side-encryption/unified/fle2v2-Rangev2-Double-FindOneAndUpdate.yml diff --git a/src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-Double-InsertFind.json b/spec/client-side-encryption/unified/fle2v2-Rangev2-Double-InsertFind.json similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-Double-InsertFind.json rename to spec/client-side-encryption/unified/fle2v2-Rangev2-Double-InsertFind.json diff --git a/src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-Double-InsertFind.yml b/spec/client-side-encryption/unified/fle2v2-Rangev2-Double-InsertFind.yml similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-Double-InsertFind.yml rename to spec/client-side-encryption/unified/fle2v2-Rangev2-Double-InsertFind.yml diff --git a/src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-Double-Update.json b/spec/client-side-encryption/unified/fle2v2-Rangev2-Double-Update.json similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-Double-Update.json rename to spec/client-side-encryption/unified/fle2v2-Rangev2-Double-Update.json diff --git a/src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-Double-Update.yml b/spec/client-side-encryption/unified/fle2v2-Rangev2-Double-Update.yml similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-Double-Update.yml rename to spec/client-side-encryption/unified/fle2v2-Rangev2-Double-Update.yml diff --git a/src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-DoublePrecision-Aggregate.json b/spec/client-side-encryption/unified/fle2v2-Rangev2-DoublePrecision-Aggregate.json similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-DoublePrecision-Aggregate.json rename to spec/client-side-encryption/unified/fle2v2-Rangev2-DoublePrecision-Aggregate.json diff --git a/src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-DoublePrecision-Aggregate.yml b/spec/client-side-encryption/unified/fle2v2-Rangev2-DoublePrecision-Aggregate.yml similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-DoublePrecision-Aggregate.yml rename to spec/client-side-encryption/unified/fle2v2-Rangev2-DoublePrecision-Aggregate.yml diff --git a/src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-DoublePrecision-Correctness.json b/spec/client-side-encryption/unified/fle2v2-Rangev2-DoublePrecision-Correctness.json similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-DoublePrecision-Correctness.json rename to spec/client-side-encryption/unified/fle2v2-Rangev2-DoublePrecision-Correctness.json diff --git a/src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-DoublePrecision-Correctness.yml b/spec/client-side-encryption/unified/fle2v2-Rangev2-DoublePrecision-Correctness.yml similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-DoublePrecision-Correctness.yml rename to spec/client-side-encryption/unified/fle2v2-Rangev2-DoublePrecision-Correctness.yml diff --git a/src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-DoublePrecision-Delete.json b/spec/client-side-encryption/unified/fle2v2-Rangev2-DoublePrecision-Delete.json similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-DoublePrecision-Delete.json rename to spec/client-side-encryption/unified/fle2v2-Rangev2-DoublePrecision-Delete.json diff --git a/src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-DoublePrecision-Delete.yml b/spec/client-side-encryption/unified/fle2v2-Rangev2-DoublePrecision-Delete.yml similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-DoublePrecision-Delete.yml rename to spec/client-side-encryption/unified/fle2v2-Rangev2-DoublePrecision-Delete.yml diff --git a/src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-DoublePrecision-FindOneAndUpdate.json b/spec/client-side-encryption/unified/fle2v2-Rangev2-DoublePrecision-FindOneAndUpdate.json similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-DoublePrecision-FindOneAndUpdate.json rename to spec/client-side-encryption/unified/fle2v2-Rangev2-DoublePrecision-FindOneAndUpdate.json diff --git a/src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-DoublePrecision-FindOneAndUpdate.yml b/spec/client-side-encryption/unified/fle2v2-Rangev2-DoublePrecision-FindOneAndUpdate.yml similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-DoublePrecision-FindOneAndUpdate.yml rename to spec/client-side-encryption/unified/fle2v2-Rangev2-DoublePrecision-FindOneAndUpdate.yml diff --git a/src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-DoublePrecision-InsertFind.json b/spec/client-side-encryption/unified/fle2v2-Rangev2-DoublePrecision-InsertFind.json similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-DoublePrecision-InsertFind.json rename to spec/client-side-encryption/unified/fle2v2-Rangev2-DoublePrecision-InsertFind.json diff --git a/src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-DoublePrecision-InsertFind.yml b/spec/client-side-encryption/unified/fle2v2-Rangev2-DoublePrecision-InsertFind.yml similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-DoublePrecision-InsertFind.yml rename to spec/client-side-encryption/unified/fle2v2-Rangev2-DoublePrecision-InsertFind.yml diff --git a/src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-DoublePrecision-Update.json b/spec/client-side-encryption/unified/fle2v2-Rangev2-DoublePrecision-Update.json similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-DoublePrecision-Update.json rename to spec/client-side-encryption/unified/fle2v2-Rangev2-DoublePrecision-Update.json diff --git a/src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-DoublePrecision-Update.yml b/spec/client-side-encryption/unified/fle2v2-Rangev2-DoublePrecision-Update.yml similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-DoublePrecision-Update.yml rename to spec/client-side-encryption/unified/fle2v2-Rangev2-DoublePrecision-Update.yml diff --git a/src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-Int-Aggregate.json b/spec/client-side-encryption/unified/fle2v2-Rangev2-Int-Aggregate.json similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-Int-Aggregate.json rename to spec/client-side-encryption/unified/fle2v2-Rangev2-Int-Aggregate.json diff --git a/src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-Int-Aggregate.yml b/spec/client-side-encryption/unified/fle2v2-Rangev2-Int-Aggregate.yml similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-Int-Aggregate.yml rename to spec/client-side-encryption/unified/fle2v2-Rangev2-Int-Aggregate.yml diff --git a/src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-Int-Correctness.json b/spec/client-side-encryption/unified/fle2v2-Rangev2-Int-Correctness.json similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-Int-Correctness.json rename to spec/client-side-encryption/unified/fle2v2-Rangev2-Int-Correctness.json diff --git a/src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-Int-Correctness.yml b/spec/client-side-encryption/unified/fle2v2-Rangev2-Int-Correctness.yml similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-Int-Correctness.yml rename to spec/client-side-encryption/unified/fle2v2-Rangev2-Int-Correctness.yml diff --git a/src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-Int-Delete.json b/spec/client-side-encryption/unified/fle2v2-Rangev2-Int-Delete.json similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-Int-Delete.json rename to spec/client-side-encryption/unified/fle2v2-Rangev2-Int-Delete.json diff --git a/src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-Int-Delete.yml b/spec/client-side-encryption/unified/fle2v2-Rangev2-Int-Delete.yml similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-Int-Delete.yml rename to spec/client-side-encryption/unified/fle2v2-Rangev2-Int-Delete.yml diff --git a/src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-Int-FindOneAndUpdate.json b/spec/client-side-encryption/unified/fle2v2-Rangev2-Int-FindOneAndUpdate.json similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-Int-FindOneAndUpdate.json rename to spec/client-side-encryption/unified/fle2v2-Rangev2-Int-FindOneAndUpdate.json diff --git a/src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-Int-FindOneAndUpdate.yml b/spec/client-side-encryption/unified/fle2v2-Rangev2-Int-FindOneAndUpdate.yml similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-Int-FindOneAndUpdate.yml rename to spec/client-side-encryption/unified/fle2v2-Rangev2-Int-FindOneAndUpdate.yml diff --git a/src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-Int-InsertFind.json b/spec/client-side-encryption/unified/fle2v2-Rangev2-Int-InsertFind.json similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-Int-InsertFind.json rename to spec/client-side-encryption/unified/fle2v2-Rangev2-Int-InsertFind.json diff --git a/src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-Int-InsertFind.yml b/spec/client-side-encryption/unified/fle2v2-Rangev2-Int-InsertFind.yml similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-Int-InsertFind.yml rename to spec/client-side-encryption/unified/fle2v2-Rangev2-Int-InsertFind.yml diff --git a/src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-Int-Update.json b/spec/client-side-encryption/unified/fle2v2-Rangev2-Int-Update.json similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-Int-Update.json rename to spec/client-side-encryption/unified/fle2v2-Rangev2-Int-Update.json diff --git a/src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-Int-Update.yml b/spec/client-side-encryption/unified/fle2v2-Rangev2-Int-Update.yml similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-Int-Update.yml rename to spec/client-side-encryption/unified/fle2v2-Rangev2-Int-Update.yml diff --git a/src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-Long-Aggregate.json b/spec/client-side-encryption/unified/fle2v2-Rangev2-Long-Aggregate.json similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-Long-Aggregate.json rename to spec/client-side-encryption/unified/fle2v2-Rangev2-Long-Aggregate.json diff --git a/src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-Long-Aggregate.yml b/spec/client-side-encryption/unified/fle2v2-Rangev2-Long-Aggregate.yml similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-Long-Aggregate.yml rename to spec/client-side-encryption/unified/fle2v2-Rangev2-Long-Aggregate.yml diff --git a/src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-Long-Correctness.json b/spec/client-side-encryption/unified/fle2v2-Rangev2-Long-Correctness.json similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-Long-Correctness.json rename to spec/client-side-encryption/unified/fle2v2-Rangev2-Long-Correctness.json diff --git a/src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-Long-Correctness.yml b/spec/client-side-encryption/unified/fle2v2-Rangev2-Long-Correctness.yml similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-Long-Correctness.yml rename to spec/client-side-encryption/unified/fle2v2-Rangev2-Long-Correctness.yml diff --git a/src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-Long-Delete.json b/spec/client-side-encryption/unified/fle2v2-Rangev2-Long-Delete.json similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-Long-Delete.json rename to spec/client-side-encryption/unified/fle2v2-Rangev2-Long-Delete.json diff --git a/src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-Long-Delete.yml b/spec/client-side-encryption/unified/fle2v2-Rangev2-Long-Delete.yml similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-Long-Delete.yml rename to spec/client-side-encryption/unified/fle2v2-Rangev2-Long-Delete.yml diff --git a/src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-Long-FindOneAndUpdate.json b/spec/client-side-encryption/unified/fle2v2-Rangev2-Long-FindOneAndUpdate.json similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-Long-FindOneAndUpdate.json rename to spec/client-side-encryption/unified/fle2v2-Rangev2-Long-FindOneAndUpdate.json diff --git a/src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-Long-FindOneAndUpdate.yml b/spec/client-side-encryption/unified/fle2v2-Rangev2-Long-FindOneAndUpdate.yml similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-Long-FindOneAndUpdate.yml rename to spec/client-side-encryption/unified/fle2v2-Rangev2-Long-FindOneAndUpdate.yml diff --git a/src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-Long-InsertFind.json b/spec/client-side-encryption/unified/fle2v2-Rangev2-Long-InsertFind.json similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-Long-InsertFind.json rename to spec/client-side-encryption/unified/fle2v2-Rangev2-Long-InsertFind.json diff --git a/src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-Long-InsertFind.yml b/spec/client-side-encryption/unified/fle2v2-Rangev2-Long-InsertFind.yml similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-Long-InsertFind.yml rename to spec/client-side-encryption/unified/fle2v2-Rangev2-Long-InsertFind.yml diff --git a/src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-Long-Update.json b/spec/client-side-encryption/unified/fle2v2-Rangev2-Long-Update.json similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-Long-Update.json rename to spec/client-side-encryption/unified/fle2v2-Rangev2-Long-Update.json diff --git a/src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-Long-Update.yml b/spec/client-side-encryption/unified/fle2v2-Rangev2-Long-Update.yml similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-Long-Update.yml rename to spec/client-side-encryption/unified/fle2v2-Rangev2-Long-Update.yml diff --git a/src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-WrongType.json b/spec/client-side-encryption/unified/fle2v2-Rangev2-WrongType.json similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-WrongType.json rename to spec/client-side-encryption/unified/fle2v2-Rangev2-WrongType.json diff --git a/src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-WrongType.yml b/spec/client-side-encryption/unified/fle2v2-Rangev2-WrongType.yml similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/fle2v2-Rangev2-WrongType.yml rename to spec/client-side-encryption/unified/fle2v2-Rangev2-WrongType.yml diff --git a/src/test/spec/json/client-side-encryption/unified/fle2v2-Update.json b/spec/client-side-encryption/unified/fle2v2-Update.json similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/fle2v2-Update.json rename to spec/client-side-encryption/unified/fle2v2-Update.json diff --git a/src/test/spec/json/client-side-encryption/unified/fle2v2-Update.yml b/spec/client-side-encryption/unified/fle2v2-Update.yml similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/fle2v2-Update.yml rename to spec/client-side-encryption/unified/fle2v2-Update.yml diff --git a/src/test/spec/json/client-side-encryption/unified/fle2v2-validatorAndPartialFieldExpression.json b/spec/client-side-encryption/unified/fle2v2-validatorAndPartialFieldExpression.json similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/fle2v2-validatorAndPartialFieldExpression.json rename to spec/client-side-encryption/unified/fle2v2-validatorAndPartialFieldExpression.json diff --git a/src/test/spec/json/client-side-encryption/unified/fle2v2-validatorAndPartialFieldExpression.yml b/spec/client-side-encryption/unified/fle2v2-validatorAndPartialFieldExpression.yml similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/fle2v2-validatorAndPartialFieldExpression.yml rename to spec/client-side-encryption/unified/fle2v2-validatorAndPartialFieldExpression.yml diff --git a/src/test/spec/json/client-side-encryption/unified/gcpKMS.json b/spec/client-side-encryption/unified/gcpKMS.json similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/gcpKMS.json rename to spec/client-side-encryption/unified/gcpKMS.json diff --git a/src/test/spec/json/client-side-encryption/unified/gcpKMS.yml b/spec/client-side-encryption/unified/gcpKMS.yml similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/gcpKMS.yml rename to spec/client-side-encryption/unified/gcpKMS.yml diff --git a/src/test/spec/json/client-side-encryption/unified/getKey.json b/spec/client-side-encryption/unified/getKey.json similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/getKey.json rename to spec/client-side-encryption/unified/getKey.json diff --git a/src/test/spec/json/client-side-encryption/unified/getKey.yml b/spec/client-side-encryption/unified/getKey.yml similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/getKey.yml rename to spec/client-side-encryption/unified/getKey.yml diff --git a/src/test/spec/json/client-side-encryption/unified/getKeyByAltName.json b/spec/client-side-encryption/unified/getKeyByAltName.json similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/getKeyByAltName.json rename to spec/client-side-encryption/unified/getKeyByAltName.json diff --git a/src/test/spec/json/client-side-encryption/unified/getKeyByAltName.yml b/spec/client-side-encryption/unified/getKeyByAltName.yml similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/getKeyByAltName.yml rename to spec/client-side-encryption/unified/getKeyByAltName.yml diff --git a/src/test/spec/json/client-side-encryption/unified/getKeys.json b/spec/client-side-encryption/unified/getKeys.json similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/getKeys.json rename to spec/client-side-encryption/unified/getKeys.json diff --git a/src/test/spec/json/client-side-encryption/unified/getKeys.yml b/spec/client-side-encryption/unified/getKeys.yml similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/getKeys.yml rename to spec/client-side-encryption/unified/getKeys.yml diff --git a/src/test/spec/json/client-side-encryption/unified/getMore.json b/spec/client-side-encryption/unified/getMore.json similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/getMore.json rename to spec/client-side-encryption/unified/getMore.json diff --git a/src/test/spec/json/client-side-encryption/unified/getMore.yml b/spec/client-side-encryption/unified/getMore.yml similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/getMore.yml rename to spec/client-side-encryption/unified/getMore.yml diff --git a/src/test/spec/json/client-side-encryption/unified/insert.json b/spec/client-side-encryption/unified/insert.json similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/insert.json rename to spec/client-side-encryption/unified/insert.json diff --git a/src/test/spec/json/client-side-encryption/unified/insert.yml b/spec/client-side-encryption/unified/insert.yml similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/insert.yml rename to spec/client-side-encryption/unified/insert.yml diff --git a/src/test/spec/json/client-side-encryption/unified/keyAltName.json b/spec/client-side-encryption/unified/keyAltName.json similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/keyAltName.json rename to spec/client-side-encryption/unified/keyAltName.json diff --git a/src/test/spec/json/client-side-encryption/unified/keyAltName.yml b/spec/client-side-encryption/unified/keyAltName.yml similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/keyAltName.yml rename to spec/client-side-encryption/unified/keyAltName.yml diff --git a/src/test/spec/json/client-side-encryption/unified/keyCache.json b/spec/client-side-encryption/unified/keyCache.json similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/keyCache.json rename to spec/client-side-encryption/unified/keyCache.json diff --git a/src/test/spec/json/client-side-encryption/unified/keyCache.yml b/spec/client-side-encryption/unified/keyCache.yml similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/keyCache.yml rename to spec/client-side-encryption/unified/keyCache.yml diff --git a/src/test/spec/json/client-side-encryption/unified/kmipKMS.json b/spec/client-side-encryption/unified/kmipKMS.json similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/kmipKMS.json rename to spec/client-side-encryption/unified/kmipKMS.json diff --git a/src/test/spec/json/client-side-encryption/unified/kmipKMS.yml b/spec/client-side-encryption/unified/kmipKMS.yml similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/kmipKMS.yml rename to spec/client-side-encryption/unified/kmipKMS.yml diff --git a/src/test/spec/json/client-side-encryption/unified/localKMS.json b/spec/client-side-encryption/unified/localKMS.json similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/localKMS.json rename to spec/client-side-encryption/unified/localKMS.json diff --git a/src/test/spec/json/client-side-encryption/unified/localKMS.yml b/spec/client-side-encryption/unified/localKMS.yml similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/localKMS.yml rename to spec/client-side-encryption/unified/localKMS.yml diff --git a/src/test/spec/json/client-side-encryption/unified/localSchema.json b/spec/client-side-encryption/unified/localSchema.json similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/localSchema.json rename to spec/client-side-encryption/unified/localSchema.json diff --git a/src/test/spec/json/client-side-encryption/unified/localSchema.yml b/spec/client-side-encryption/unified/localSchema.yml similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/localSchema.yml rename to spec/client-side-encryption/unified/localSchema.yml diff --git a/src/test/spec/json/client-side-encryption/unified/malformedCiphertext.json b/spec/client-side-encryption/unified/malformedCiphertext.json similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/malformedCiphertext.json rename to spec/client-side-encryption/unified/malformedCiphertext.json diff --git a/src/test/spec/json/client-side-encryption/unified/malformedCiphertext.yml b/spec/client-side-encryption/unified/malformedCiphertext.yml similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/malformedCiphertext.yml rename to spec/client-side-encryption/unified/malformedCiphertext.yml diff --git a/src/test/spec/json/client-side-encryption/unified/maxWireVersion.json b/spec/client-side-encryption/unified/maxWireVersion.json similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/maxWireVersion.json rename to spec/client-side-encryption/unified/maxWireVersion.json diff --git a/src/test/spec/json/client-side-encryption/unified/maxWireVersion.yml b/spec/client-side-encryption/unified/maxWireVersion.yml similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/maxWireVersion.yml rename to spec/client-side-encryption/unified/maxWireVersion.yml diff --git a/src/test/spec/json/client-side-encryption/unified/missingKey.json b/spec/client-side-encryption/unified/missingKey.json similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/missingKey.json rename to spec/client-side-encryption/unified/missingKey.json diff --git a/src/test/spec/json/client-side-encryption/unified/missingKey.yml b/spec/client-side-encryption/unified/missingKey.yml similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/missingKey.yml rename to spec/client-side-encryption/unified/missingKey.yml diff --git a/src/test/spec/json/client-side-encryption/unified/namedKMS-createDataKey.json b/spec/client-side-encryption/unified/namedKMS-createDataKey.json similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/namedKMS-createDataKey.json rename to spec/client-side-encryption/unified/namedKMS-createDataKey.json diff --git a/src/test/spec/json/client-side-encryption/unified/namedKMS-createDataKey.yml b/spec/client-side-encryption/unified/namedKMS-createDataKey.yml similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/namedKMS-createDataKey.yml rename to spec/client-side-encryption/unified/namedKMS-createDataKey.yml diff --git a/src/test/spec/json/client-side-encryption/unified/namedKMS-explicit.json b/spec/client-side-encryption/unified/namedKMS-explicit.json similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/namedKMS-explicit.json rename to spec/client-side-encryption/unified/namedKMS-explicit.json diff --git a/src/test/spec/json/client-side-encryption/unified/namedKMS-explicit.yml b/spec/client-side-encryption/unified/namedKMS-explicit.yml similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/namedKMS-explicit.yml rename to spec/client-side-encryption/unified/namedKMS-explicit.yml diff --git a/src/test/spec/json/client-side-encryption/unified/namedKMS-rewrapManyDataKey.json b/spec/client-side-encryption/unified/namedKMS-rewrapManyDataKey.json similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/namedKMS-rewrapManyDataKey.json rename to spec/client-side-encryption/unified/namedKMS-rewrapManyDataKey.json diff --git a/src/test/spec/json/client-side-encryption/unified/namedKMS-rewrapManyDataKey.yml b/spec/client-side-encryption/unified/namedKMS-rewrapManyDataKey.yml similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/namedKMS-rewrapManyDataKey.yml rename to spec/client-side-encryption/unified/namedKMS-rewrapManyDataKey.yml diff --git a/src/test/spec/json/client-side-encryption/unified/namedKMS.json b/spec/client-side-encryption/unified/namedKMS.json similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/namedKMS.json rename to spec/client-side-encryption/unified/namedKMS.json diff --git a/src/test/spec/json/client-side-encryption/unified/namedKMS.yml b/spec/client-side-encryption/unified/namedKMS.yml similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/namedKMS.yml rename to spec/client-side-encryption/unified/namedKMS.yml diff --git a/src/test/spec/json/client-side-encryption/unified/noSchema.json b/spec/client-side-encryption/unified/noSchema.json similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/noSchema.json rename to spec/client-side-encryption/unified/noSchema.json diff --git a/src/test/spec/json/client-side-encryption/unified/noSchema.yml b/spec/client-side-encryption/unified/noSchema.yml similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/noSchema.yml rename to spec/client-side-encryption/unified/noSchema.yml diff --git a/src/test/spec/json/client-side-encryption/unified/removeKeyAltName.json b/spec/client-side-encryption/unified/removeKeyAltName.json similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/removeKeyAltName.json rename to spec/client-side-encryption/unified/removeKeyAltName.json diff --git a/src/test/spec/json/client-side-encryption/unified/removeKeyAltName.yml b/spec/client-side-encryption/unified/removeKeyAltName.yml similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/removeKeyAltName.yml rename to spec/client-side-encryption/unified/removeKeyAltName.yml diff --git a/src/test/spec/json/client-side-encryption/unified/replaceOne.json b/spec/client-side-encryption/unified/replaceOne.json similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/replaceOne.json rename to spec/client-side-encryption/unified/replaceOne.json diff --git a/src/test/spec/json/client-side-encryption/unified/replaceOne.yml b/spec/client-side-encryption/unified/replaceOne.yml similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/replaceOne.yml rename to spec/client-side-encryption/unified/replaceOne.yml diff --git a/src/test/spec/json/client-side-encryption/unified/rewrapManyDataKey-decrypt_failure.json b/spec/client-side-encryption/unified/rewrapManyDataKey-decrypt_failure.json similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/rewrapManyDataKey-decrypt_failure.json rename to spec/client-side-encryption/unified/rewrapManyDataKey-decrypt_failure.json diff --git a/src/test/spec/json/client-side-encryption/unified/rewrapManyDataKey-decrypt_failure.yml b/spec/client-side-encryption/unified/rewrapManyDataKey-decrypt_failure.yml similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/rewrapManyDataKey-decrypt_failure.yml rename to spec/client-side-encryption/unified/rewrapManyDataKey-decrypt_failure.yml diff --git a/src/test/spec/json/client-side-encryption/unified/rewrapManyDataKey-encrypt_failure.json b/spec/client-side-encryption/unified/rewrapManyDataKey-encrypt_failure.json similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/rewrapManyDataKey-encrypt_failure.json rename to spec/client-side-encryption/unified/rewrapManyDataKey-encrypt_failure.json diff --git a/src/test/spec/json/client-side-encryption/unified/rewrapManyDataKey-encrypt_failure.yml b/spec/client-side-encryption/unified/rewrapManyDataKey-encrypt_failure.yml similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/rewrapManyDataKey-encrypt_failure.yml rename to spec/client-side-encryption/unified/rewrapManyDataKey-encrypt_failure.yml diff --git a/src/test/spec/json/client-side-encryption/unified/rewrapManyDataKey.json b/spec/client-side-encryption/unified/rewrapManyDataKey.json similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/rewrapManyDataKey.json rename to spec/client-side-encryption/unified/rewrapManyDataKey.json diff --git a/src/test/spec/json/client-side-encryption/unified/rewrapManyDataKey.yml b/spec/client-side-encryption/unified/rewrapManyDataKey.yml similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/rewrapManyDataKey.yml rename to spec/client-side-encryption/unified/rewrapManyDataKey.yml diff --git a/src/test/spec/json/client-side-encryption/unified/timeoutMS.json b/spec/client-side-encryption/unified/timeoutMS.json similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/timeoutMS.json rename to spec/client-side-encryption/unified/timeoutMS.json diff --git a/src/test/spec/json/client-side-encryption/unified/timeoutMS.yml b/spec/client-side-encryption/unified/timeoutMS.yml similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/timeoutMS.yml rename to spec/client-side-encryption/unified/timeoutMS.yml diff --git a/src/test/spec/json/client-side-encryption/unified/types.json b/spec/client-side-encryption/unified/types.json similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/types.json rename to spec/client-side-encryption/unified/types.json diff --git a/src/test/spec/json/client-side-encryption/unified/types.yml b/spec/client-side-encryption/unified/types.yml similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/types.yml rename to spec/client-side-encryption/unified/types.yml diff --git a/src/test/spec/json/client-side-encryption/unified/unsupportedCommand.json b/spec/client-side-encryption/unified/unsupportedCommand.json similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/unsupportedCommand.json rename to spec/client-side-encryption/unified/unsupportedCommand.json diff --git a/src/test/spec/json/client-side-encryption/unified/unsupportedCommand.yml b/spec/client-side-encryption/unified/unsupportedCommand.yml similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/unsupportedCommand.yml rename to spec/client-side-encryption/unified/unsupportedCommand.yml diff --git a/src/test/spec/json/client-side-encryption/unified/updateMany.json b/spec/client-side-encryption/unified/updateMany.json similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/updateMany.json rename to spec/client-side-encryption/unified/updateMany.json diff --git a/src/test/spec/json/client-side-encryption/unified/updateMany.yml b/spec/client-side-encryption/unified/updateMany.yml similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/updateMany.yml rename to spec/client-side-encryption/unified/updateMany.yml diff --git a/src/test/spec/json/client-side-encryption/unified/updateOne.json b/spec/client-side-encryption/unified/updateOne.json similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/updateOne.json rename to spec/client-side-encryption/unified/updateOne.json diff --git a/src/test/spec/json/client-side-encryption/unified/updateOne.yml b/spec/client-side-encryption/unified/updateOne.yml similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/updateOne.yml rename to spec/client-side-encryption/unified/updateOne.yml diff --git a/src/test/spec/json/client-side-encryption/unified/validatorAndPartialFieldExpression.json b/spec/client-side-encryption/unified/validatorAndPartialFieldExpression.json similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/validatorAndPartialFieldExpression.json rename to spec/client-side-encryption/unified/validatorAndPartialFieldExpression.json diff --git a/src/test/spec/json/client-side-encryption/unified/validatorAndPartialFieldExpression.yml b/spec/client-side-encryption/unified/validatorAndPartialFieldExpression.yml similarity index 100% rename from src/test/spec/json/client-side-encryption/unified/validatorAndPartialFieldExpression.yml rename to spec/client-side-encryption/unified/validatorAndPartialFieldExpression.yml diff --git a/src/test/spec/json/collection-management/README.rst b/spec/collection-management/README.rst similarity index 100% rename from src/test/spec/json/collection-management/README.rst rename to spec/collection-management/README.rst diff --git a/src/test/spec/json/collection-management/clustered-indexes.json b/spec/collection-management/clustered-indexes.json similarity index 100% rename from src/test/spec/json/collection-management/clustered-indexes.json rename to spec/collection-management/clustered-indexes.json diff --git a/src/test/spec/json/collection-management/clustered-indexes.yml b/spec/collection-management/clustered-indexes.yml similarity index 100% rename from src/test/spec/json/collection-management/clustered-indexes.yml rename to spec/collection-management/clustered-indexes.yml diff --git a/src/test/spec/json/collection-management/createCollection-pre_and_post_images.json b/spec/collection-management/createCollection-pre_and_post_images.json similarity index 100% rename from src/test/spec/json/collection-management/createCollection-pre_and_post_images.json rename to spec/collection-management/createCollection-pre_and_post_images.json diff --git a/src/test/spec/json/collection-management/createCollection-pre_and_post_images.yml b/spec/collection-management/createCollection-pre_and_post_images.yml similarity index 100% rename from src/test/spec/json/collection-management/createCollection-pre_and_post_images.yml rename to spec/collection-management/createCollection-pre_and_post_images.yml diff --git a/src/test/spec/json/collection-management/modifyCollection-errorResponse.json b/spec/collection-management/modifyCollection-errorResponse.json similarity index 100% rename from src/test/spec/json/collection-management/modifyCollection-errorResponse.json rename to spec/collection-management/modifyCollection-errorResponse.json diff --git a/src/test/spec/json/collection-management/modifyCollection-errorResponse.yml b/spec/collection-management/modifyCollection-errorResponse.yml similarity index 100% rename from src/test/spec/json/collection-management/modifyCollection-errorResponse.yml rename to spec/collection-management/modifyCollection-errorResponse.yml diff --git a/src/test/spec/json/collection-management/modifyCollection-pre_and_post_images.json b/spec/collection-management/modifyCollection-pre_and_post_images.json similarity index 100% rename from src/test/spec/json/collection-management/modifyCollection-pre_and_post_images.json rename to spec/collection-management/modifyCollection-pre_and_post_images.json diff --git a/src/test/spec/json/collection-management/modifyCollection-pre_and_post_images.yml b/spec/collection-management/modifyCollection-pre_and_post_images.yml similarity index 100% rename from src/test/spec/json/collection-management/modifyCollection-pre_and_post_images.yml rename to spec/collection-management/modifyCollection-pre_and_post_images.yml diff --git a/src/test/spec/json/collection-management/timeseries-collection.json b/spec/collection-management/timeseries-collection.json similarity index 100% rename from src/test/spec/json/collection-management/timeseries-collection.json rename to spec/collection-management/timeseries-collection.json diff --git a/src/test/spec/json/collection-management/timeseries-collection.yml b/spec/collection-management/timeseries-collection.yml similarity index 100% rename from src/test/spec/json/collection-management/timeseries-collection.yml rename to spec/collection-management/timeseries-collection.yml diff --git a/src/test/spec/json/command-logging-and-monitoring/README.md b/spec/command-logging-and-monitoring/README.md similarity index 100% rename from src/test/spec/json/command-logging-and-monitoring/README.md rename to spec/command-logging-and-monitoring/README.md diff --git a/src/test/spec/json/command-logging-and-monitoring/logging/command.json b/spec/command-logging-and-monitoring/logging/command.json similarity index 100% rename from src/test/spec/json/command-logging-and-monitoring/logging/command.json rename to spec/command-logging-and-monitoring/logging/command.json diff --git a/src/test/spec/json/command-logging-and-monitoring/logging/command.yml b/spec/command-logging-and-monitoring/logging/command.yml similarity index 100% rename from src/test/spec/json/command-logging-and-monitoring/logging/command.yml rename to spec/command-logging-and-monitoring/logging/command.yml diff --git a/src/test/spec/json/command-logging-and-monitoring/logging/driver-connection-id.json b/spec/command-logging-and-monitoring/logging/driver-connection-id.json similarity index 100% rename from src/test/spec/json/command-logging-and-monitoring/logging/driver-connection-id.json rename to spec/command-logging-and-monitoring/logging/driver-connection-id.json diff --git a/src/test/spec/json/command-logging-and-monitoring/logging/driver-connection-id.yml b/spec/command-logging-and-monitoring/logging/driver-connection-id.yml similarity index 100% rename from src/test/spec/json/command-logging-and-monitoring/logging/driver-connection-id.yml rename to spec/command-logging-and-monitoring/logging/driver-connection-id.yml diff --git a/src/test/spec/json/command-logging-and-monitoring/logging/no-handshake-messages.json b/spec/command-logging-and-monitoring/logging/no-handshake-messages.json similarity index 100% rename from src/test/spec/json/command-logging-and-monitoring/logging/no-handshake-messages.json rename to spec/command-logging-and-monitoring/logging/no-handshake-messages.json diff --git a/src/test/spec/json/command-logging-and-monitoring/logging/no-handshake-messages.yml b/spec/command-logging-and-monitoring/logging/no-handshake-messages.yml similarity index 100% rename from src/test/spec/json/command-logging-and-monitoring/logging/no-handshake-messages.yml rename to spec/command-logging-and-monitoring/logging/no-handshake-messages.yml diff --git a/src/test/spec/json/command-logging-and-monitoring/logging/no-heartbeat-messages.json b/spec/command-logging-and-monitoring/logging/no-heartbeat-messages.json similarity index 100% rename from src/test/spec/json/command-logging-and-monitoring/logging/no-heartbeat-messages.json rename to spec/command-logging-and-monitoring/logging/no-heartbeat-messages.json diff --git a/src/test/spec/json/command-logging-and-monitoring/logging/no-heartbeat-messages.yml b/spec/command-logging-and-monitoring/logging/no-heartbeat-messages.yml similarity index 100% rename from src/test/spec/json/command-logging-and-monitoring/logging/no-heartbeat-messages.yml rename to spec/command-logging-and-monitoring/logging/no-heartbeat-messages.yml diff --git a/src/test/spec/json/command-logging-and-monitoring/logging/operation-id.json b/spec/command-logging-and-monitoring/logging/operation-id.json similarity index 100% rename from src/test/spec/json/command-logging-and-monitoring/logging/operation-id.json rename to spec/command-logging-and-monitoring/logging/operation-id.json diff --git a/src/test/spec/json/command-logging-and-monitoring/logging/operation-id.yml b/spec/command-logging-and-monitoring/logging/operation-id.yml similarity index 100% rename from src/test/spec/json/command-logging-and-monitoring/logging/operation-id.yml rename to spec/command-logging-and-monitoring/logging/operation-id.yml diff --git a/src/test/spec/json/command-logging-and-monitoring/logging/pre-42-server-connection-id.json b/spec/command-logging-and-monitoring/logging/pre-42-server-connection-id.json similarity index 100% rename from src/test/spec/json/command-logging-and-monitoring/logging/pre-42-server-connection-id.json rename to spec/command-logging-and-monitoring/logging/pre-42-server-connection-id.json diff --git a/src/test/spec/json/command-logging-and-monitoring/logging/pre-42-server-connection-id.yml b/spec/command-logging-and-monitoring/logging/pre-42-server-connection-id.yml similarity index 100% rename from src/test/spec/json/command-logging-and-monitoring/logging/pre-42-server-connection-id.yml rename to spec/command-logging-and-monitoring/logging/pre-42-server-connection-id.yml diff --git a/src/test/spec/json/command-logging-and-monitoring/logging/redacted-commands.json b/spec/command-logging-and-monitoring/logging/redacted-commands.json similarity index 100% rename from src/test/spec/json/command-logging-and-monitoring/logging/redacted-commands.json rename to spec/command-logging-and-monitoring/logging/redacted-commands.json diff --git a/src/test/spec/json/command-logging-and-monitoring/logging/redacted-commands.yml b/spec/command-logging-and-monitoring/logging/redacted-commands.yml similarity index 100% rename from src/test/spec/json/command-logging-and-monitoring/logging/redacted-commands.yml rename to spec/command-logging-and-monitoring/logging/redacted-commands.yml diff --git a/src/test/spec/json/command-logging-and-monitoring/logging/server-connection-id.json b/spec/command-logging-and-monitoring/logging/server-connection-id.json similarity index 100% rename from src/test/spec/json/command-logging-and-monitoring/logging/server-connection-id.json rename to spec/command-logging-and-monitoring/logging/server-connection-id.json diff --git a/src/test/spec/json/command-logging-and-monitoring/logging/server-connection-id.yml b/spec/command-logging-and-monitoring/logging/server-connection-id.yml similarity index 100% rename from src/test/spec/json/command-logging-and-monitoring/logging/server-connection-id.yml rename to spec/command-logging-and-monitoring/logging/server-connection-id.yml diff --git a/src/test/spec/json/command-logging-and-monitoring/logging/service-id.json b/spec/command-logging-and-monitoring/logging/service-id.json similarity index 100% rename from src/test/spec/json/command-logging-and-monitoring/logging/service-id.json rename to spec/command-logging-and-monitoring/logging/service-id.json diff --git a/src/test/spec/json/command-logging-and-monitoring/logging/service-id.yml b/spec/command-logging-and-monitoring/logging/service-id.yml similarity index 100% rename from src/test/spec/json/command-logging-and-monitoring/logging/service-id.yml rename to spec/command-logging-and-monitoring/logging/service-id.yml diff --git a/src/test/spec/json/command-logging-and-monitoring/logging/unacknowledged-write.json b/spec/command-logging-and-monitoring/logging/unacknowledged-write.json similarity index 100% rename from src/test/spec/json/command-logging-and-monitoring/logging/unacknowledged-write.json rename to spec/command-logging-and-monitoring/logging/unacknowledged-write.json diff --git a/src/test/spec/json/command-logging-and-monitoring/logging/unacknowledged-write.yml b/spec/command-logging-and-monitoring/logging/unacknowledged-write.yml similarity index 100% rename from src/test/spec/json/command-logging-and-monitoring/logging/unacknowledged-write.yml rename to spec/command-logging-and-monitoring/logging/unacknowledged-write.yml diff --git a/src/test/spec/json/command-logging-and-monitoring/monitoring/bulkWrite.json b/spec/command-logging-and-monitoring/monitoring/bulkWrite.json similarity index 100% rename from src/test/spec/json/command-logging-and-monitoring/monitoring/bulkWrite.json rename to spec/command-logging-and-monitoring/monitoring/bulkWrite.json diff --git a/src/test/spec/json/command-logging-and-monitoring/monitoring/bulkWrite.yml b/spec/command-logging-and-monitoring/monitoring/bulkWrite.yml similarity index 100% rename from src/test/spec/json/command-logging-and-monitoring/monitoring/bulkWrite.yml rename to spec/command-logging-and-monitoring/monitoring/bulkWrite.yml diff --git a/src/test/spec/json/command-logging-and-monitoring/monitoring/command.json b/spec/command-logging-and-monitoring/monitoring/command.json similarity index 100% rename from src/test/spec/json/command-logging-and-monitoring/monitoring/command.json rename to spec/command-logging-and-monitoring/monitoring/command.json diff --git a/src/test/spec/json/command-logging-and-monitoring/monitoring/command.yml b/spec/command-logging-and-monitoring/monitoring/command.yml similarity index 100% rename from src/test/spec/json/command-logging-and-monitoring/monitoring/command.yml rename to spec/command-logging-and-monitoring/monitoring/command.yml diff --git a/src/test/spec/json/command-logging-and-monitoring/monitoring/deleteMany.json b/spec/command-logging-and-monitoring/monitoring/deleteMany.json similarity index 100% rename from src/test/spec/json/command-logging-and-monitoring/monitoring/deleteMany.json rename to spec/command-logging-and-monitoring/monitoring/deleteMany.json diff --git a/src/test/spec/json/command-logging-and-monitoring/monitoring/deleteMany.yml b/spec/command-logging-and-monitoring/monitoring/deleteMany.yml similarity index 100% rename from src/test/spec/json/command-logging-and-monitoring/monitoring/deleteMany.yml rename to spec/command-logging-and-monitoring/monitoring/deleteMany.yml diff --git a/src/test/spec/json/command-logging-and-monitoring/monitoring/deleteOne.json b/spec/command-logging-and-monitoring/monitoring/deleteOne.json similarity index 100% rename from src/test/spec/json/command-logging-and-monitoring/monitoring/deleteOne.json rename to spec/command-logging-and-monitoring/monitoring/deleteOne.json diff --git a/src/test/spec/json/command-logging-and-monitoring/monitoring/deleteOne.yml b/spec/command-logging-and-monitoring/monitoring/deleteOne.yml similarity index 100% rename from src/test/spec/json/command-logging-and-monitoring/monitoring/deleteOne.yml rename to spec/command-logging-and-monitoring/monitoring/deleteOne.yml diff --git a/src/test/spec/json/command-logging-and-monitoring/monitoring/find.json b/spec/command-logging-and-monitoring/monitoring/find.json similarity index 100% rename from src/test/spec/json/command-logging-and-monitoring/monitoring/find.json rename to spec/command-logging-and-monitoring/monitoring/find.json diff --git a/src/test/spec/json/command-logging-and-monitoring/monitoring/find.yml b/spec/command-logging-and-monitoring/monitoring/find.yml similarity index 100% rename from src/test/spec/json/command-logging-and-monitoring/monitoring/find.yml rename to spec/command-logging-and-monitoring/monitoring/find.yml diff --git a/src/test/spec/json/command-logging-and-monitoring/monitoring/insertMany.json b/spec/command-logging-and-monitoring/monitoring/insertMany.json similarity index 100% rename from src/test/spec/json/command-logging-and-monitoring/monitoring/insertMany.json rename to spec/command-logging-and-monitoring/monitoring/insertMany.json diff --git a/src/test/spec/json/command-logging-and-monitoring/monitoring/insertMany.yml b/spec/command-logging-and-monitoring/monitoring/insertMany.yml similarity index 100% rename from src/test/spec/json/command-logging-and-monitoring/monitoring/insertMany.yml rename to spec/command-logging-and-monitoring/monitoring/insertMany.yml diff --git a/src/test/spec/json/command-logging-and-monitoring/monitoring/insertOne.json b/spec/command-logging-and-monitoring/monitoring/insertOne.json similarity index 100% rename from src/test/spec/json/command-logging-and-monitoring/monitoring/insertOne.json rename to spec/command-logging-and-monitoring/monitoring/insertOne.json diff --git a/src/test/spec/json/command-logging-and-monitoring/monitoring/insertOne.yml b/spec/command-logging-and-monitoring/monitoring/insertOne.yml similarity index 100% rename from src/test/spec/json/command-logging-and-monitoring/monitoring/insertOne.yml rename to spec/command-logging-and-monitoring/monitoring/insertOne.yml diff --git a/src/test/spec/json/command-logging-and-monitoring/monitoring/pre-42-server-connection-id.json b/spec/command-logging-and-monitoring/monitoring/pre-42-server-connection-id.json similarity index 100% rename from src/test/spec/json/command-logging-and-monitoring/monitoring/pre-42-server-connection-id.json rename to spec/command-logging-and-monitoring/monitoring/pre-42-server-connection-id.json diff --git a/src/test/spec/json/command-logging-and-monitoring/monitoring/pre-42-server-connection-id.yml b/spec/command-logging-and-monitoring/monitoring/pre-42-server-connection-id.yml similarity index 100% rename from src/test/spec/json/command-logging-and-monitoring/monitoring/pre-42-server-connection-id.yml rename to spec/command-logging-and-monitoring/monitoring/pre-42-server-connection-id.yml diff --git a/src/test/spec/json/command-logging-and-monitoring/monitoring/redacted-commands.json b/spec/command-logging-and-monitoring/monitoring/redacted-commands.json similarity index 100% rename from src/test/spec/json/command-logging-and-monitoring/monitoring/redacted-commands.json rename to spec/command-logging-and-monitoring/monitoring/redacted-commands.json diff --git a/src/test/spec/json/command-logging-and-monitoring/monitoring/redacted-commands.yml b/spec/command-logging-and-monitoring/monitoring/redacted-commands.yml similarity index 100% rename from src/test/spec/json/command-logging-and-monitoring/monitoring/redacted-commands.yml rename to spec/command-logging-and-monitoring/monitoring/redacted-commands.yml diff --git a/src/test/spec/json/command-logging-and-monitoring/monitoring/server-connection-id.json b/spec/command-logging-and-monitoring/monitoring/server-connection-id.json similarity index 100% rename from src/test/spec/json/command-logging-and-monitoring/monitoring/server-connection-id.json rename to spec/command-logging-and-monitoring/monitoring/server-connection-id.json diff --git a/src/test/spec/json/command-logging-and-monitoring/monitoring/server-connection-id.yml b/spec/command-logging-and-monitoring/monitoring/server-connection-id.yml similarity index 100% rename from src/test/spec/json/command-logging-and-monitoring/monitoring/server-connection-id.yml rename to spec/command-logging-and-monitoring/monitoring/server-connection-id.yml diff --git a/src/test/spec/json/command-logging-and-monitoring/monitoring/unacknowledged-client-bulkWrite.json b/spec/command-logging-and-monitoring/monitoring/unacknowledged-client-bulkWrite.json similarity index 100% rename from src/test/spec/json/command-logging-and-monitoring/monitoring/unacknowledged-client-bulkWrite.json rename to spec/command-logging-and-monitoring/monitoring/unacknowledged-client-bulkWrite.json diff --git a/src/test/spec/json/command-logging-and-monitoring/monitoring/unacknowledged-client-bulkWrite.yml b/spec/command-logging-and-monitoring/monitoring/unacknowledged-client-bulkWrite.yml similarity index 100% rename from src/test/spec/json/command-logging-and-monitoring/monitoring/unacknowledged-client-bulkWrite.yml rename to spec/command-logging-and-monitoring/monitoring/unacknowledged-client-bulkWrite.yml diff --git a/src/test/spec/json/command-logging-and-monitoring/monitoring/unacknowledgedBulkWrite.json b/spec/command-logging-and-monitoring/monitoring/unacknowledgedBulkWrite.json similarity index 100% rename from src/test/spec/json/command-logging-and-monitoring/monitoring/unacknowledgedBulkWrite.json rename to spec/command-logging-and-monitoring/monitoring/unacknowledgedBulkWrite.json diff --git a/src/test/spec/json/command-logging-and-monitoring/monitoring/unacknowledgedBulkWrite.yml b/spec/command-logging-and-monitoring/monitoring/unacknowledgedBulkWrite.yml similarity index 100% rename from src/test/spec/json/command-logging-and-monitoring/monitoring/unacknowledgedBulkWrite.yml rename to spec/command-logging-and-monitoring/monitoring/unacknowledgedBulkWrite.yml diff --git a/src/test/spec/json/command-logging-and-monitoring/monitoring/updateMany.json b/spec/command-logging-and-monitoring/monitoring/updateMany.json similarity index 100% rename from src/test/spec/json/command-logging-and-monitoring/monitoring/updateMany.json rename to spec/command-logging-and-monitoring/monitoring/updateMany.json diff --git a/src/test/spec/json/command-logging-and-monitoring/monitoring/updateMany.yml b/spec/command-logging-and-monitoring/monitoring/updateMany.yml similarity index 100% rename from src/test/spec/json/command-logging-and-monitoring/monitoring/updateMany.yml rename to spec/command-logging-and-monitoring/monitoring/updateMany.yml diff --git a/src/test/spec/json/command-logging-and-monitoring/monitoring/updateOne.json b/spec/command-logging-and-monitoring/monitoring/updateOne.json similarity index 100% rename from src/test/spec/json/command-logging-and-monitoring/monitoring/updateOne.json rename to spec/command-logging-and-monitoring/monitoring/updateOne.json diff --git a/src/test/spec/json/command-logging-and-monitoring/monitoring/updateOne.yml b/spec/command-logging-and-monitoring/monitoring/updateOne.yml similarity index 100% rename from src/test/spec/json/command-logging-and-monitoring/monitoring/updateOne.yml rename to spec/command-logging-and-monitoring/monitoring/updateOne.yml diff --git a/src/test/spec/json/command-logging-and-monitoring/monitoring/writeConcernError.json b/spec/command-logging-and-monitoring/monitoring/writeConcernError.json similarity index 100% rename from src/test/spec/json/command-logging-and-monitoring/monitoring/writeConcernError.json rename to spec/command-logging-and-monitoring/monitoring/writeConcernError.json diff --git a/src/test/spec/json/command-logging-and-monitoring/monitoring/writeConcernError.yml b/spec/command-logging-and-monitoring/monitoring/writeConcernError.yml similarity index 100% rename from src/test/spec/json/command-logging-and-monitoring/monitoring/writeConcernError.yml rename to spec/command-logging-and-monitoring/monitoring/writeConcernError.yml diff --git a/src/test/spec/json/command-monitoring/README.rst b/spec/command-monitoring/README.rst similarity index 100% rename from src/test/spec/json/command-monitoring/README.rst rename to spec/command-monitoring/README.rst diff --git a/src/test/spec/json/connection-monitoring-and-pooling/README.md b/spec/connection-monitoring-and-pooling/README.md similarity index 100% rename from src/test/spec/json/connection-monitoring-and-pooling/README.md rename to spec/connection-monitoring-and-pooling/README.md diff --git a/src/test/spec/json/connection-monitoring-and-pooling/cmap-format/README.md b/spec/connection-monitoring-and-pooling/cmap-format/README.md similarity index 100% rename from src/test/spec/json/connection-monitoring-and-pooling/cmap-format/README.md rename to spec/connection-monitoring-and-pooling/cmap-format/README.md diff --git a/src/test/spec/json/connection-monitoring-and-pooling/cmap-format/connection-must-have-id.json b/spec/connection-monitoring-and-pooling/cmap-format/connection-must-have-id.json similarity index 100% rename from src/test/spec/json/connection-monitoring-and-pooling/cmap-format/connection-must-have-id.json rename to spec/connection-monitoring-and-pooling/cmap-format/connection-must-have-id.json diff --git a/src/test/spec/json/connection-monitoring-and-pooling/cmap-format/connection-must-have-id.yml b/spec/connection-monitoring-and-pooling/cmap-format/connection-must-have-id.yml similarity index 100% rename from src/test/spec/json/connection-monitoring-and-pooling/cmap-format/connection-must-have-id.yml rename to spec/connection-monitoring-and-pooling/cmap-format/connection-must-have-id.yml diff --git a/src/test/spec/json/connection-monitoring-and-pooling/cmap-format/connection-must-order-ids.json b/spec/connection-monitoring-and-pooling/cmap-format/connection-must-order-ids.json similarity index 100% rename from src/test/spec/json/connection-monitoring-and-pooling/cmap-format/connection-must-order-ids.json rename to spec/connection-monitoring-and-pooling/cmap-format/connection-must-order-ids.json diff --git a/src/test/spec/json/connection-monitoring-and-pooling/cmap-format/connection-must-order-ids.yml b/spec/connection-monitoring-and-pooling/cmap-format/connection-must-order-ids.yml similarity index 100% rename from src/test/spec/json/connection-monitoring-and-pooling/cmap-format/connection-must-order-ids.yml rename to spec/connection-monitoring-and-pooling/cmap-format/connection-must-order-ids.yml diff --git a/src/test/spec/json/connection-monitoring-and-pooling/cmap-format/pool-checkin-destroy-closed.json b/spec/connection-monitoring-and-pooling/cmap-format/pool-checkin-destroy-closed.json similarity index 100% rename from src/test/spec/json/connection-monitoring-and-pooling/cmap-format/pool-checkin-destroy-closed.json rename to spec/connection-monitoring-and-pooling/cmap-format/pool-checkin-destroy-closed.json diff --git a/src/test/spec/json/connection-monitoring-and-pooling/cmap-format/pool-checkin-destroy-closed.yml b/spec/connection-monitoring-and-pooling/cmap-format/pool-checkin-destroy-closed.yml similarity index 100% rename from src/test/spec/json/connection-monitoring-and-pooling/cmap-format/pool-checkin-destroy-closed.yml rename to spec/connection-monitoring-and-pooling/cmap-format/pool-checkin-destroy-closed.yml diff --git a/src/test/spec/json/connection-monitoring-and-pooling/cmap-format/pool-checkin-destroy-stale.json b/spec/connection-monitoring-and-pooling/cmap-format/pool-checkin-destroy-stale.json similarity index 100% rename from src/test/spec/json/connection-monitoring-and-pooling/cmap-format/pool-checkin-destroy-stale.json rename to spec/connection-monitoring-and-pooling/cmap-format/pool-checkin-destroy-stale.json diff --git a/src/test/spec/json/connection-monitoring-and-pooling/cmap-format/pool-checkin-destroy-stale.yml b/spec/connection-monitoring-and-pooling/cmap-format/pool-checkin-destroy-stale.yml similarity index 100% rename from src/test/spec/json/connection-monitoring-and-pooling/cmap-format/pool-checkin-destroy-stale.yml rename to spec/connection-monitoring-and-pooling/cmap-format/pool-checkin-destroy-stale.yml diff --git a/src/test/spec/json/connection-monitoring-and-pooling/cmap-format/pool-checkin-make-available.json b/spec/connection-monitoring-and-pooling/cmap-format/pool-checkin-make-available.json similarity index 100% rename from src/test/spec/json/connection-monitoring-and-pooling/cmap-format/pool-checkin-make-available.json rename to spec/connection-monitoring-and-pooling/cmap-format/pool-checkin-make-available.json diff --git a/src/test/spec/json/connection-monitoring-and-pooling/cmap-format/pool-checkin-make-available.yml b/spec/connection-monitoring-and-pooling/cmap-format/pool-checkin-make-available.yml similarity index 100% rename from src/test/spec/json/connection-monitoring-and-pooling/cmap-format/pool-checkin-make-available.yml rename to spec/connection-monitoring-and-pooling/cmap-format/pool-checkin-make-available.yml diff --git a/src/test/spec/json/connection-monitoring-and-pooling/cmap-format/pool-checkin.json b/spec/connection-monitoring-and-pooling/cmap-format/pool-checkin.json similarity index 100% rename from src/test/spec/json/connection-monitoring-and-pooling/cmap-format/pool-checkin.json rename to spec/connection-monitoring-and-pooling/cmap-format/pool-checkin.json diff --git a/src/test/spec/json/connection-monitoring-and-pooling/cmap-format/pool-checkin.yml b/spec/connection-monitoring-and-pooling/cmap-format/pool-checkin.yml similarity index 100% rename from src/test/spec/json/connection-monitoring-and-pooling/cmap-format/pool-checkin.yml rename to spec/connection-monitoring-and-pooling/cmap-format/pool-checkin.yml diff --git a/src/test/spec/json/connection-monitoring-and-pooling/cmap-format/pool-checkout-connection.json b/spec/connection-monitoring-and-pooling/cmap-format/pool-checkout-connection.json similarity index 100% rename from src/test/spec/json/connection-monitoring-and-pooling/cmap-format/pool-checkout-connection.json rename to spec/connection-monitoring-and-pooling/cmap-format/pool-checkout-connection.json diff --git a/src/test/spec/json/connection-monitoring-and-pooling/cmap-format/pool-checkout-connection.yml b/spec/connection-monitoring-and-pooling/cmap-format/pool-checkout-connection.yml similarity index 100% rename from src/test/spec/json/connection-monitoring-and-pooling/cmap-format/pool-checkout-connection.yml rename to spec/connection-monitoring-and-pooling/cmap-format/pool-checkout-connection.yml diff --git a/src/test/spec/json/connection-monitoring-and-pooling/cmap-format/pool-checkout-custom-maxConnecting-is-enforced.json b/spec/connection-monitoring-and-pooling/cmap-format/pool-checkout-custom-maxConnecting-is-enforced.json similarity index 100% rename from src/test/spec/json/connection-monitoring-and-pooling/cmap-format/pool-checkout-custom-maxConnecting-is-enforced.json rename to spec/connection-monitoring-and-pooling/cmap-format/pool-checkout-custom-maxConnecting-is-enforced.json diff --git a/src/test/spec/json/connection-monitoring-and-pooling/cmap-format/pool-checkout-custom-maxConnecting-is-enforced.yml b/spec/connection-monitoring-and-pooling/cmap-format/pool-checkout-custom-maxConnecting-is-enforced.yml similarity index 100% rename from src/test/spec/json/connection-monitoring-and-pooling/cmap-format/pool-checkout-custom-maxConnecting-is-enforced.yml rename to spec/connection-monitoring-and-pooling/cmap-format/pool-checkout-custom-maxConnecting-is-enforced.yml diff --git a/src/test/spec/json/connection-monitoring-and-pooling/cmap-format/pool-checkout-error-closed.json b/spec/connection-monitoring-and-pooling/cmap-format/pool-checkout-error-closed.json similarity index 100% rename from src/test/spec/json/connection-monitoring-and-pooling/cmap-format/pool-checkout-error-closed.json rename to spec/connection-monitoring-and-pooling/cmap-format/pool-checkout-error-closed.json diff --git a/src/test/spec/json/connection-monitoring-and-pooling/cmap-format/pool-checkout-error-closed.yml b/spec/connection-monitoring-and-pooling/cmap-format/pool-checkout-error-closed.yml similarity index 100% rename from src/test/spec/json/connection-monitoring-and-pooling/cmap-format/pool-checkout-error-closed.yml rename to spec/connection-monitoring-and-pooling/cmap-format/pool-checkout-error-closed.yml diff --git a/src/test/spec/json/connection-monitoring-and-pooling/cmap-format/pool-checkout-maxConnecting-is-enforced.json b/spec/connection-monitoring-and-pooling/cmap-format/pool-checkout-maxConnecting-is-enforced.json similarity index 100% rename from src/test/spec/json/connection-monitoring-and-pooling/cmap-format/pool-checkout-maxConnecting-is-enforced.json rename to spec/connection-monitoring-and-pooling/cmap-format/pool-checkout-maxConnecting-is-enforced.json diff --git a/src/test/spec/json/connection-monitoring-and-pooling/cmap-format/pool-checkout-maxConnecting-is-enforced.yml b/spec/connection-monitoring-and-pooling/cmap-format/pool-checkout-maxConnecting-is-enforced.yml similarity index 100% rename from src/test/spec/json/connection-monitoring-and-pooling/cmap-format/pool-checkout-maxConnecting-is-enforced.yml rename to spec/connection-monitoring-and-pooling/cmap-format/pool-checkout-maxConnecting-is-enforced.yml diff --git a/src/test/spec/json/connection-monitoring-and-pooling/cmap-format/pool-checkout-maxConnecting-timeout.json b/spec/connection-monitoring-and-pooling/cmap-format/pool-checkout-maxConnecting-timeout.json similarity index 100% rename from src/test/spec/json/connection-monitoring-and-pooling/cmap-format/pool-checkout-maxConnecting-timeout.json rename to spec/connection-monitoring-and-pooling/cmap-format/pool-checkout-maxConnecting-timeout.json diff --git a/src/test/spec/json/connection-monitoring-and-pooling/cmap-format/pool-checkout-maxConnecting-timeout.yml b/spec/connection-monitoring-and-pooling/cmap-format/pool-checkout-maxConnecting-timeout.yml similarity index 100% rename from src/test/spec/json/connection-monitoring-and-pooling/cmap-format/pool-checkout-maxConnecting-timeout.yml rename to spec/connection-monitoring-and-pooling/cmap-format/pool-checkout-maxConnecting-timeout.yml diff --git a/src/test/spec/json/connection-monitoring-and-pooling/cmap-format/pool-checkout-minPoolSize-connection-maxConnecting.json b/spec/connection-monitoring-and-pooling/cmap-format/pool-checkout-minPoolSize-connection-maxConnecting.json similarity index 100% rename from src/test/spec/json/connection-monitoring-and-pooling/cmap-format/pool-checkout-minPoolSize-connection-maxConnecting.json rename to spec/connection-monitoring-and-pooling/cmap-format/pool-checkout-minPoolSize-connection-maxConnecting.json diff --git a/src/test/spec/json/connection-monitoring-and-pooling/cmap-format/pool-checkout-minPoolSize-connection-maxConnecting.yml b/spec/connection-monitoring-and-pooling/cmap-format/pool-checkout-minPoolSize-connection-maxConnecting.yml similarity index 100% rename from src/test/spec/json/connection-monitoring-and-pooling/cmap-format/pool-checkout-minPoolSize-connection-maxConnecting.yml rename to spec/connection-monitoring-and-pooling/cmap-format/pool-checkout-minPoolSize-connection-maxConnecting.yml diff --git a/src/test/spec/json/connection-monitoring-and-pooling/cmap-format/pool-checkout-multiple.json b/spec/connection-monitoring-and-pooling/cmap-format/pool-checkout-multiple.json similarity index 100% rename from src/test/spec/json/connection-monitoring-and-pooling/cmap-format/pool-checkout-multiple.json rename to spec/connection-monitoring-and-pooling/cmap-format/pool-checkout-multiple.json diff --git a/src/test/spec/json/connection-monitoring-and-pooling/cmap-format/pool-checkout-multiple.yml b/spec/connection-monitoring-and-pooling/cmap-format/pool-checkout-multiple.yml similarity index 100% rename from src/test/spec/json/connection-monitoring-and-pooling/cmap-format/pool-checkout-multiple.yml rename to spec/connection-monitoring-and-pooling/cmap-format/pool-checkout-multiple.yml diff --git a/src/test/spec/json/connection-monitoring-and-pooling/cmap-format/pool-checkout-no-idle.json b/spec/connection-monitoring-and-pooling/cmap-format/pool-checkout-no-idle.json similarity index 100% rename from src/test/spec/json/connection-monitoring-and-pooling/cmap-format/pool-checkout-no-idle.json rename to spec/connection-monitoring-and-pooling/cmap-format/pool-checkout-no-idle.json diff --git a/src/test/spec/json/connection-monitoring-and-pooling/cmap-format/pool-checkout-no-idle.yml b/spec/connection-monitoring-and-pooling/cmap-format/pool-checkout-no-idle.yml similarity index 100% rename from src/test/spec/json/connection-monitoring-and-pooling/cmap-format/pool-checkout-no-idle.yml rename to spec/connection-monitoring-and-pooling/cmap-format/pool-checkout-no-idle.yml diff --git a/src/test/spec/json/connection-monitoring-and-pooling/cmap-format/pool-checkout-no-stale.json b/spec/connection-monitoring-and-pooling/cmap-format/pool-checkout-no-stale.json similarity index 100% rename from src/test/spec/json/connection-monitoring-and-pooling/cmap-format/pool-checkout-no-stale.json rename to spec/connection-monitoring-and-pooling/cmap-format/pool-checkout-no-stale.json diff --git a/src/test/spec/json/connection-monitoring-and-pooling/cmap-format/pool-checkout-no-stale.yml b/spec/connection-monitoring-and-pooling/cmap-format/pool-checkout-no-stale.yml similarity index 100% rename from src/test/spec/json/connection-monitoring-and-pooling/cmap-format/pool-checkout-no-stale.yml rename to spec/connection-monitoring-and-pooling/cmap-format/pool-checkout-no-stale.yml diff --git a/src/test/spec/json/connection-monitoring-and-pooling/cmap-format/pool-checkout-returned-connection-maxConnecting.json b/spec/connection-monitoring-and-pooling/cmap-format/pool-checkout-returned-connection-maxConnecting.json similarity index 100% rename from src/test/spec/json/connection-monitoring-and-pooling/cmap-format/pool-checkout-returned-connection-maxConnecting.json rename to spec/connection-monitoring-and-pooling/cmap-format/pool-checkout-returned-connection-maxConnecting.json diff --git a/src/test/spec/json/connection-monitoring-and-pooling/cmap-format/pool-checkout-returned-connection-maxConnecting.yml b/spec/connection-monitoring-and-pooling/cmap-format/pool-checkout-returned-connection-maxConnecting.yml similarity index 100% rename from src/test/spec/json/connection-monitoring-and-pooling/cmap-format/pool-checkout-returned-connection-maxConnecting.yml rename to spec/connection-monitoring-and-pooling/cmap-format/pool-checkout-returned-connection-maxConnecting.yml diff --git a/src/test/spec/json/connection-monitoring-and-pooling/cmap-format/pool-clear-clears-waitqueue.json b/spec/connection-monitoring-and-pooling/cmap-format/pool-clear-clears-waitqueue.json similarity index 100% rename from src/test/spec/json/connection-monitoring-and-pooling/cmap-format/pool-clear-clears-waitqueue.json rename to spec/connection-monitoring-and-pooling/cmap-format/pool-clear-clears-waitqueue.json diff --git a/src/test/spec/json/connection-monitoring-and-pooling/cmap-format/pool-clear-clears-waitqueue.yml b/spec/connection-monitoring-and-pooling/cmap-format/pool-clear-clears-waitqueue.yml similarity index 100% rename from src/test/spec/json/connection-monitoring-and-pooling/cmap-format/pool-clear-clears-waitqueue.yml rename to spec/connection-monitoring-and-pooling/cmap-format/pool-clear-clears-waitqueue.yml diff --git a/src/test/spec/json/connection-monitoring-and-pooling/cmap-format/pool-clear-interrupting-pending-connections.json b/spec/connection-monitoring-and-pooling/cmap-format/pool-clear-interrupting-pending-connections.json similarity index 100% rename from src/test/spec/json/connection-monitoring-and-pooling/cmap-format/pool-clear-interrupting-pending-connections.json rename to spec/connection-monitoring-and-pooling/cmap-format/pool-clear-interrupting-pending-connections.json diff --git a/src/test/spec/json/connection-monitoring-and-pooling/cmap-format/pool-clear-interrupting-pending-connections.yml b/spec/connection-monitoring-and-pooling/cmap-format/pool-clear-interrupting-pending-connections.yml similarity index 100% rename from src/test/spec/json/connection-monitoring-and-pooling/cmap-format/pool-clear-interrupting-pending-connections.yml rename to spec/connection-monitoring-and-pooling/cmap-format/pool-clear-interrupting-pending-connections.yml diff --git a/src/test/spec/json/connection-monitoring-and-pooling/cmap-format/pool-clear-min-size.json b/spec/connection-monitoring-and-pooling/cmap-format/pool-clear-min-size.json similarity index 100% rename from src/test/spec/json/connection-monitoring-and-pooling/cmap-format/pool-clear-min-size.json rename to spec/connection-monitoring-and-pooling/cmap-format/pool-clear-min-size.json diff --git a/src/test/spec/json/connection-monitoring-and-pooling/cmap-format/pool-clear-min-size.yml b/spec/connection-monitoring-and-pooling/cmap-format/pool-clear-min-size.yml similarity index 100% rename from src/test/spec/json/connection-monitoring-and-pooling/cmap-format/pool-clear-min-size.yml rename to spec/connection-monitoring-and-pooling/cmap-format/pool-clear-min-size.yml diff --git a/src/test/spec/json/connection-monitoring-and-pooling/cmap-format/pool-clear-paused.json b/spec/connection-monitoring-and-pooling/cmap-format/pool-clear-paused.json similarity index 100% rename from src/test/spec/json/connection-monitoring-and-pooling/cmap-format/pool-clear-paused.json rename to spec/connection-monitoring-and-pooling/cmap-format/pool-clear-paused.json diff --git a/src/test/spec/json/connection-monitoring-and-pooling/cmap-format/pool-clear-paused.yml b/spec/connection-monitoring-and-pooling/cmap-format/pool-clear-paused.yml similarity index 100% rename from src/test/spec/json/connection-monitoring-and-pooling/cmap-format/pool-clear-paused.yml rename to spec/connection-monitoring-and-pooling/cmap-format/pool-clear-paused.yml diff --git a/src/test/spec/json/connection-monitoring-and-pooling/cmap-format/pool-clear-ready.json b/spec/connection-monitoring-and-pooling/cmap-format/pool-clear-ready.json similarity index 100% rename from src/test/spec/json/connection-monitoring-and-pooling/cmap-format/pool-clear-ready.json rename to spec/connection-monitoring-and-pooling/cmap-format/pool-clear-ready.json diff --git a/src/test/spec/json/connection-monitoring-and-pooling/cmap-format/pool-clear-ready.yml b/spec/connection-monitoring-and-pooling/cmap-format/pool-clear-ready.yml similarity index 100% rename from src/test/spec/json/connection-monitoring-and-pooling/cmap-format/pool-clear-ready.yml rename to spec/connection-monitoring-and-pooling/cmap-format/pool-clear-ready.yml diff --git a/src/test/spec/json/connection-monitoring-and-pooling/cmap-format/pool-clear-schedule-run-interruptInUseConnections-false.json b/spec/connection-monitoring-and-pooling/cmap-format/pool-clear-schedule-run-interruptInUseConnections-false.json similarity index 100% rename from src/test/spec/json/connection-monitoring-and-pooling/cmap-format/pool-clear-schedule-run-interruptInUseConnections-false.json rename to spec/connection-monitoring-and-pooling/cmap-format/pool-clear-schedule-run-interruptInUseConnections-false.json diff --git a/src/test/spec/json/connection-monitoring-and-pooling/cmap-format/pool-clear-schedule-run-interruptInUseConnections-false.yml b/spec/connection-monitoring-and-pooling/cmap-format/pool-clear-schedule-run-interruptInUseConnections-false.yml similarity index 100% rename from src/test/spec/json/connection-monitoring-and-pooling/cmap-format/pool-clear-schedule-run-interruptInUseConnections-false.yml rename to spec/connection-monitoring-and-pooling/cmap-format/pool-clear-schedule-run-interruptInUseConnections-false.yml diff --git a/src/test/spec/json/connection-monitoring-and-pooling/cmap-format/pool-close-destroy-conns.json b/spec/connection-monitoring-and-pooling/cmap-format/pool-close-destroy-conns.json similarity index 100% rename from src/test/spec/json/connection-monitoring-and-pooling/cmap-format/pool-close-destroy-conns.json rename to spec/connection-monitoring-and-pooling/cmap-format/pool-close-destroy-conns.json diff --git a/src/test/spec/json/connection-monitoring-and-pooling/cmap-format/pool-close-destroy-conns.yml b/spec/connection-monitoring-and-pooling/cmap-format/pool-close-destroy-conns.yml similarity index 100% rename from src/test/spec/json/connection-monitoring-and-pooling/cmap-format/pool-close-destroy-conns.yml rename to spec/connection-monitoring-and-pooling/cmap-format/pool-close-destroy-conns.yml diff --git a/src/test/spec/json/connection-monitoring-and-pooling/cmap-format/pool-close.json b/spec/connection-monitoring-and-pooling/cmap-format/pool-close.json similarity index 100% rename from src/test/spec/json/connection-monitoring-and-pooling/cmap-format/pool-close.json rename to spec/connection-monitoring-and-pooling/cmap-format/pool-close.json diff --git a/src/test/spec/json/connection-monitoring-and-pooling/cmap-format/pool-close.yml b/spec/connection-monitoring-and-pooling/cmap-format/pool-close.yml similarity index 100% rename from src/test/spec/json/connection-monitoring-and-pooling/cmap-format/pool-close.yml rename to spec/connection-monitoring-and-pooling/cmap-format/pool-close.yml diff --git a/src/test/spec/json/connection-monitoring-and-pooling/cmap-format/pool-create-max-size.json b/spec/connection-monitoring-and-pooling/cmap-format/pool-create-max-size.json similarity index 100% rename from src/test/spec/json/connection-monitoring-and-pooling/cmap-format/pool-create-max-size.json rename to spec/connection-monitoring-and-pooling/cmap-format/pool-create-max-size.json diff --git a/src/test/spec/json/connection-monitoring-and-pooling/cmap-format/pool-create-max-size.yml b/spec/connection-monitoring-and-pooling/cmap-format/pool-create-max-size.yml similarity index 100% rename from src/test/spec/json/connection-monitoring-and-pooling/cmap-format/pool-create-max-size.yml rename to spec/connection-monitoring-and-pooling/cmap-format/pool-create-max-size.yml diff --git a/src/test/spec/json/connection-monitoring-and-pooling/cmap-format/pool-create-min-size-error.json b/spec/connection-monitoring-and-pooling/cmap-format/pool-create-min-size-error.json similarity index 100% rename from src/test/spec/json/connection-monitoring-and-pooling/cmap-format/pool-create-min-size-error.json rename to spec/connection-monitoring-and-pooling/cmap-format/pool-create-min-size-error.json diff --git a/src/test/spec/json/connection-monitoring-and-pooling/cmap-format/pool-create-min-size-error.yml b/spec/connection-monitoring-and-pooling/cmap-format/pool-create-min-size-error.yml similarity index 100% rename from src/test/spec/json/connection-monitoring-and-pooling/cmap-format/pool-create-min-size-error.yml rename to spec/connection-monitoring-and-pooling/cmap-format/pool-create-min-size-error.yml diff --git a/src/test/spec/json/connection-monitoring-and-pooling/cmap-format/pool-create-min-size.json b/spec/connection-monitoring-and-pooling/cmap-format/pool-create-min-size.json similarity index 100% rename from src/test/spec/json/connection-monitoring-and-pooling/cmap-format/pool-create-min-size.json rename to spec/connection-monitoring-and-pooling/cmap-format/pool-create-min-size.json diff --git a/src/test/spec/json/connection-monitoring-and-pooling/cmap-format/pool-create-min-size.yml b/spec/connection-monitoring-and-pooling/cmap-format/pool-create-min-size.yml similarity index 100% rename from src/test/spec/json/connection-monitoring-and-pooling/cmap-format/pool-create-min-size.yml rename to spec/connection-monitoring-and-pooling/cmap-format/pool-create-min-size.yml diff --git a/src/test/spec/json/connection-monitoring-and-pooling/cmap-format/pool-create-with-options.json b/spec/connection-monitoring-and-pooling/cmap-format/pool-create-with-options.json similarity index 100% rename from src/test/spec/json/connection-monitoring-and-pooling/cmap-format/pool-create-with-options.json rename to spec/connection-monitoring-and-pooling/cmap-format/pool-create-with-options.json diff --git a/src/test/spec/json/connection-monitoring-and-pooling/cmap-format/pool-create-with-options.yml b/spec/connection-monitoring-and-pooling/cmap-format/pool-create-with-options.yml similarity index 100% rename from src/test/spec/json/connection-monitoring-and-pooling/cmap-format/pool-create-with-options.yml rename to spec/connection-monitoring-and-pooling/cmap-format/pool-create-with-options.yml diff --git a/src/test/spec/json/connection-monitoring-and-pooling/cmap-format/pool-create.json b/spec/connection-monitoring-and-pooling/cmap-format/pool-create.json similarity index 100% rename from src/test/spec/json/connection-monitoring-and-pooling/cmap-format/pool-create.json rename to spec/connection-monitoring-and-pooling/cmap-format/pool-create.json diff --git a/src/test/spec/json/connection-monitoring-and-pooling/cmap-format/pool-create.yml b/spec/connection-monitoring-and-pooling/cmap-format/pool-create.yml similarity index 100% rename from src/test/spec/json/connection-monitoring-and-pooling/cmap-format/pool-create.yml rename to spec/connection-monitoring-and-pooling/cmap-format/pool-create.yml diff --git a/src/test/spec/json/connection-monitoring-and-pooling/cmap-format/pool-ready-ready.json b/spec/connection-monitoring-and-pooling/cmap-format/pool-ready-ready.json similarity index 100% rename from src/test/spec/json/connection-monitoring-and-pooling/cmap-format/pool-ready-ready.json rename to spec/connection-monitoring-and-pooling/cmap-format/pool-ready-ready.json diff --git a/src/test/spec/json/connection-monitoring-and-pooling/cmap-format/pool-ready-ready.yml b/spec/connection-monitoring-and-pooling/cmap-format/pool-ready-ready.yml similarity index 100% rename from src/test/spec/json/connection-monitoring-and-pooling/cmap-format/pool-ready-ready.yml rename to spec/connection-monitoring-and-pooling/cmap-format/pool-ready-ready.yml diff --git a/src/test/spec/json/connection-monitoring-and-pooling/cmap-format/pool-ready.json b/spec/connection-monitoring-and-pooling/cmap-format/pool-ready.json similarity index 100% rename from src/test/spec/json/connection-monitoring-and-pooling/cmap-format/pool-ready.json rename to spec/connection-monitoring-and-pooling/cmap-format/pool-ready.json diff --git a/src/test/spec/json/connection-monitoring-and-pooling/cmap-format/pool-ready.yml b/spec/connection-monitoring-and-pooling/cmap-format/pool-ready.yml similarity index 100% rename from src/test/spec/json/connection-monitoring-and-pooling/cmap-format/pool-ready.yml rename to spec/connection-monitoring-and-pooling/cmap-format/pool-ready.yml diff --git a/src/test/spec/json/connection-monitoring-and-pooling/cmap-format/wait-queue-fairness.json b/spec/connection-monitoring-and-pooling/cmap-format/wait-queue-fairness.json similarity index 100% rename from src/test/spec/json/connection-monitoring-and-pooling/cmap-format/wait-queue-fairness.json rename to spec/connection-monitoring-and-pooling/cmap-format/wait-queue-fairness.json diff --git a/src/test/spec/json/connection-monitoring-and-pooling/cmap-format/wait-queue-fairness.yml b/spec/connection-monitoring-and-pooling/cmap-format/wait-queue-fairness.yml similarity index 100% rename from src/test/spec/json/connection-monitoring-and-pooling/cmap-format/wait-queue-fairness.yml rename to spec/connection-monitoring-and-pooling/cmap-format/wait-queue-fairness.yml diff --git a/src/test/spec/json/connection-monitoring-and-pooling/cmap-format/wait-queue-timeout.json b/spec/connection-monitoring-and-pooling/cmap-format/wait-queue-timeout.json similarity index 100% rename from src/test/spec/json/connection-monitoring-and-pooling/cmap-format/wait-queue-timeout.json rename to spec/connection-monitoring-and-pooling/cmap-format/wait-queue-timeout.json diff --git a/src/test/spec/json/connection-monitoring-and-pooling/cmap-format/wait-queue-timeout.yml b/spec/connection-monitoring-and-pooling/cmap-format/wait-queue-timeout.yml similarity index 100% rename from src/test/spec/json/connection-monitoring-and-pooling/cmap-format/wait-queue-timeout.yml rename to spec/connection-monitoring-and-pooling/cmap-format/wait-queue-timeout.yml diff --git a/src/test/spec/json/connection-monitoring-and-pooling/logging/connection-logging.json b/spec/connection-monitoring-and-pooling/logging/connection-logging.json similarity index 100% rename from src/test/spec/json/connection-monitoring-and-pooling/logging/connection-logging.json rename to spec/connection-monitoring-and-pooling/logging/connection-logging.json diff --git a/src/test/spec/json/connection-monitoring-and-pooling/logging/connection-logging.yml b/spec/connection-monitoring-and-pooling/logging/connection-logging.yml similarity index 100% rename from src/test/spec/json/connection-monitoring-and-pooling/logging/connection-logging.yml rename to spec/connection-monitoring-and-pooling/logging/connection-logging.yml diff --git a/src/test/spec/json/connection-monitoring-and-pooling/logging/connection-pool-options.json b/spec/connection-monitoring-and-pooling/logging/connection-pool-options.json similarity index 100% rename from src/test/spec/json/connection-monitoring-and-pooling/logging/connection-pool-options.json rename to spec/connection-monitoring-and-pooling/logging/connection-pool-options.json diff --git a/src/test/spec/json/connection-monitoring-and-pooling/logging/connection-pool-options.yml b/spec/connection-monitoring-and-pooling/logging/connection-pool-options.yml similarity index 100% rename from src/test/spec/json/connection-monitoring-and-pooling/logging/connection-pool-options.yml rename to spec/connection-monitoring-and-pooling/logging/connection-pool-options.yml diff --git a/src/test/spec/json/connection-string/README.md b/spec/connection-string/README.md similarity index 100% rename from src/test/spec/json/connection-string/README.md rename to spec/connection-string/README.md diff --git a/src/test/spec/json/connection-string/invalid-uris.json b/spec/connection-string/invalid-uris.json similarity index 100% rename from src/test/spec/json/connection-string/invalid-uris.json rename to spec/connection-string/invalid-uris.json diff --git a/src/test/spec/json/connection-string/invalid-uris.yml b/spec/connection-string/invalid-uris.yml similarity index 100% rename from src/test/spec/json/connection-string/invalid-uris.yml rename to spec/connection-string/invalid-uris.yml diff --git a/src/test/spec/json/connection-string/valid-auth.json b/spec/connection-string/valid-auth.json similarity index 100% rename from src/test/spec/json/connection-string/valid-auth.json rename to spec/connection-string/valid-auth.json diff --git a/src/test/spec/json/connection-string/valid-auth.yml b/spec/connection-string/valid-auth.yml similarity index 100% rename from src/test/spec/json/connection-string/valid-auth.yml rename to spec/connection-string/valid-auth.yml diff --git a/src/test/spec/json/connection-string/valid-db-with-dotted-name.json b/spec/connection-string/valid-db-with-dotted-name.json similarity index 100% rename from src/test/spec/json/connection-string/valid-db-with-dotted-name.json rename to spec/connection-string/valid-db-with-dotted-name.json diff --git a/src/test/spec/json/connection-string/valid-db-with-dotted-name.yml b/spec/connection-string/valid-db-with-dotted-name.yml similarity index 100% rename from src/test/spec/json/connection-string/valid-db-with-dotted-name.yml rename to spec/connection-string/valid-db-with-dotted-name.yml diff --git a/src/test/spec/json/connection-string/valid-host_identifiers.json b/spec/connection-string/valid-host_identifiers.json similarity index 100% rename from src/test/spec/json/connection-string/valid-host_identifiers.json rename to spec/connection-string/valid-host_identifiers.json diff --git a/src/test/spec/json/connection-string/valid-host_identifiers.yml b/spec/connection-string/valid-host_identifiers.yml similarity index 100% rename from src/test/spec/json/connection-string/valid-host_identifiers.yml rename to spec/connection-string/valid-host_identifiers.yml diff --git a/src/test/spec/json/connection-string/valid-options.json b/spec/connection-string/valid-options.json similarity index 100% rename from src/test/spec/json/connection-string/valid-options.json rename to spec/connection-string/valid-options.json diff --git a/src/test/spec/json/connection-string/valid-options.yml b/spec/connection-string/valid-options.yml similarity index 100% rename from src/test/spec/json/connection-string/valid-options.yml rename to spec/connection-string/valid-options.yml diff --git a/src/test/spec/json/connection-string/valid-unix_socket-absolute.json b/spec/connection-string/valid-unix_socket-absolute.json similarity index 100% rename from src/test/spec/json/connection-string/valid-unix_socket-absolute.json rename to spec/connection-string/valid-unix_socket-absolute.json diff --git a/src/test/spec/json/connection-string/valid-unix_socket-absolute.yml b/spec/connection-string/valid-unix_socket-absolute.yml similarity index 100% rename from src/test/spec/json/connection-string/valid-unix_socket-absolute.yml rename to spec/connection-string/valid-unix_socket-absolute.yml diff --git a/src/test/spec/json/connection-string/valid-unix_socket-relative.json b/spec/connection-string/valid-unix_socket-relative.json similarity index 100% rename from src/test/spec/json/connection-string/valid-unix_socket-relative.json rename to spec/connection-string/valid-unix_socket-relative.json diff --git a/src/test/spec/json/connection-string/valid-unix_socket-relative.yml b/spec/connection-string/valid-unix_socket-relative.yml similarity index 100% rename from src/test/spec/json/connection-string/valid-unix_socket-relative.yml rename to spec/connection-string/valid-unix_socket-relative.yml diff --git a/src/test/spec/json/connection-string/valid-warnings.json b/spec/connection-string/valid-warnings.json similarity index 100% rename from src/test/spec/json/connection-string/valid-warnings.json rename to spec/connection-string/valid-warnings.json diff --git a/src/test/spec/json/connection-string/valid-warnings.yml b/spec/connection-string/valid-warnings.yml similarity index 100% rename from src/test/spec/json/connection-string/valid-warnings.yml rename to spec/connection-string/valid-warnings.yml diff --git a/src/test/spec/json/crud/README.md b/spec/crud/README.md similarity index 100% rename from src/test/spec/json/crud/README.md rename to spec/crud/README.md diff --git a/src/test/spec/json/crud/unified/aggregate-allowdiskuse.json b/spec/crud/unified/aggregate-allowdiskuse.json similarity index 100% rename from src/test/spec/json/crud/unified/aggregate-allowdiskuse.json rename to spec/crud/unified/aggregate-allowdiskuse.json diff --git a/src/test/spec/json/crud/unified/aggregate-allowdiskuse.yml b/spec/crud/unified/aggregate-allowdiskuse.yml similarity index 100% rename from src/test/spec/json/crud/unified/aggregate-allowdiskuse.yml rename to spec/crud/unified/aggregate-allowdiskuse.yml diff --git a/src/test/spec/json/crud/unified/aggregate-collation.json b/spec/crud/unified/aggregate-collation.json similarity index 100% rename from src/test/spec/json/crud/unified/aggregate-collation.json rename to spec/crud/unified/aggregate-collation.json diff --git a/src/test/spec/json/crud/unified/aggregate-collation.yml b/spec/crud/unified/aggregate-collation.yml similarity index 100% rename from src/test/spec/json/crud/unified/aggregate-collation.yml rename to spec/crud/unified/aggregate-collation.yml diff --git a/src/test/spec/json/crud/unified/aggregate-let.json b/spec/crud/unified/aggregate-let.json similarity index 100% rename from src/test/spec/json/crud/unified/aggregate-let.json rename to spec/crud/unified/aggregate-let.json diff --git a/src/test/spec/json/crud/unified/aggregate-let.yml b/spec/crud/unified/aggregate-let.yml similarity index 100% rename from src/test/spec/json/crud/unified/aggregate-let.yml rename to spec/crud/unified/aggregate-let.yml diff --git a/src/test/spec/json/crud/unified/aggregate-merge-errorResponse.json b/spec/crud/unified/aggregate-merge-errorResponse.json similarity index 100% rename from src/test/spec/json/crud/unified/aggregate-merge-errorResponse.json rename to spec/crud/unified/aggregate-merge-errorResponse.json diff --git a/src/test/spec/json/crud/unified/aggregate-merge-errorResponse.yml b/spec/crud/unified/aggregate-merge-errorResponse.yml similarity index 100% rename from src/test/spec/json/crud/unified/aggregate-merge-errorResponse.yml rename to spec/crud/unified/aggregate-merge-errorResponse.yml diff --git a/src/test/spec/json/crud/unified/aggregate-merge.json b/spec/crud/unified/aggregate-merge.json similarity index 100% rename from src/test/spec/json/crud/unified/aggregate-merge.json rename to spec/crud/unified/aggregate-merge.json diff --git a/src/test/spec/json/crud/unified/aggregate-merge.yml b/spec/crud/unified/aggregate-merge.yml similarity index 100% rename from src/test/spec/json/crud/unified/aggregate-merge.yml rename to spec/crud/unified/aggregate-merge.yml diff --git a/src/test/spec/json/crud/unified/aggregate-out-readConcern.json b/spec/crud/unified/aggregate-out-readConcern.json similarity index 100% rename from src/test/spec/json/crud/unified/aggregate-out-readConcern.json rename to spec/crud/unified/aggregate-out-readConcern.json diff --git a/src/test/spec/json/crud/unified/aggregate-out-readConcern.yml b/spec/crud/unified/aggregate-out-readConcern.yml similarity index 100% rename from src/test/spec/json/crud/unified/aggregate-out-readConcern.yml rename to spec/crud/unified/aggregate-out-readConcern.yml diff --git a/src/test/spec/json/crud/unified/aggregate-out.json b/spec/crud/unified/aggregate-out.json similarity index 100% rename from src/test/spec/json/crud/unified/aggregate-out.json rename to spec/crud/unified/aggregate-out.json diff --git a/src/test/spec/json/crud/unified/aggregate-out.yml b/spec/crud/unified/aggregate-out.yml similarity index 100% rename from src/test/spec/json/crud/unified/aggregate-out.yml rename to spec/crud/unified/aggregate-out.yml diff --git a/src/test/spec/json/crud/unified/aggregate-write-readPreference.json b/spec/crud/unified/aggregate-write-readPreference.json similarity index 100% rename from src/test/spec/json/crud/unified/aggregate-write-readPreference.json rename to spec/crud/unified/aggregate-write-readPreference.json diff --git a/src/test/spec/json/crud/unified/aggregate-write-readPreference.yml b/spec/crud/unified/aggregate-write-readPreference.yml similarity index 100% rename from src/test/spec/json/crud/unified/aggregate-write-readPreference.yml rename to spec/crud/unified/aggregate-write-readPreference.yml diff --git a/src/test/spec/json/crud/unified/aggregate.json b/spec/crud/unified/aggregate.json similarity index 100% rename from src/test/spec/json/crud/unified/aggregate.json rename to spec/crud/unified/aggregate.json diff --git a/src/test/spec/json/crud/unified/aggregate.yml b/spec/crud/unified/aggregate.yml similarity index 100% rename from src/test/spec/json/crud/unified/aggregate.yml rename to spec/crud/unified/aggregate.yml diff --git a/src/test/spec/json/crud/unified/bulkWrite-arrayFilters-clientError.json b/spec/crud/unified/bulkWrite-arrayFilters-clientError.json similarity index 100% rename from src/test/spec/json/crud/unified/bulkWrite-arrayFilters-clientError.json rename to spec/crud/unified/bulkWrite-arrayFilters-clientError.json diff --git a/src/test/spec/json/crud/unified/bulkWrite-arrayFilters-clientError.yml b/spec/crud/unified/bulkWrite-arrayFilters-clientError.yml similarity index 100% rename from src/test/spec/json/crud/unified/bulkWrite-arrayFilters-clientError.yml rename to spec/crud/unified/bulkWrite-arrayFilters-clientError.yml diff --git a/src/test/spec/json/crud/unified/bulkWrite-arrayFilters.json b/spec/crud/unified/bulkWrite-arrayFilters.json similarity index 100% rename from src/test/spec/json/crud/unified/bulkWrite-arrayFilters.json rename to spec/crud/unified/bulkWrite-arrayFilters.json diff --git a/src/test/spec/json/crud/unified/bulkWrite-arrayFilters.yml b/spec/crud/unified/bulkWrite-arrayFilters.yml similarity index 100% rename from src/test/spec/json/crud/unified/bulkWrite-arrayFilters.yml rename to spec/crud/unified/bulkWrite-arrayFilters.yml diff --git a/src/test/spec/json/crud/unified/bulkWrite-collation.json b/spec/crud/unified/bulkWrite-collation.json similarity index 100% rename from src/test/spec/json/crud/unified/bulkWrite-collation.json rename to spec/crud/unified/bulkWrite-collation.json diff --git a/src/test/spec/json/crud/unified/bulkWrite-collation.yml b/spec/crud/unified/bulkWrite-collation.yml similarity index 100% rename from src/test/spec/json/crud/unified/bulkWrite-collation.yml rename to spec/crud/unified/bulkWrite-collation.yml diff --git a/src/test/spec/json/crud/unified/bulkWrite-comment.json b/spec/crud/unified/bulkWrite-comment.json similarity index 100% rename from src/test/spec/json/crud/unified/bulkWrite-comment.json rename to spec/crud/unified/bulkWrite-comment.json diff --git a/src/test/spec/json/crud/unified/bulkWrite-comment.yml b/spec/crud/unified/bulkWrite-comment.yml similarity index 100% rename from src/test/spec/json/crud/unified/bulkWrite-comment.yml rename to spec/crud/unified/bulkWrite-comment.yml diff --git a/src/test/spec/json/crud/unified/bulkWrite-delete-hint-clientError.json b/spec/crud/unified/bulkWrite-delete-hint-clientError.json similarity index 100% rename from src/test/spec/json/crud/unified/bulkWrite-delete-hint-clientError.json rename to spec/crud/unified/bulkWrite-delete-hint-clientError.json diff --git a/src/test/spec/json/crud/unified/bulkWrite-delete-hint-clientError.yml b/spec/crud/unified/bulkWrite-delete-hint-clientError.yml similarity index 100% rename from src/test/spec/json/crud/unified/bulkWrite-delete-hint-clientError.yml rename to spec/crud/unified/bulkWrite-delete-hint-clientError.yml diff --git a/src/test/spec/json/crud/unified/bulkWrite-delete-hint-serverError.json b/spec/crud/unified/bulkWrite-delete-hint-serverError.json similarity index 100% rename from src/test/spec/json/crud/unified/bulkWrite-delete-hint-serverError.json rename to spec/crud/unified/bulkWrite-delete-hint-serverError.json diff --git a/src/test/spec/json/crud/unified/bulkWrite-delete-hint-serverError.yml b/spec/crud/unified/bulkWrite-delete-hint-serverError.yml similarity index 100% rename from src/test/spec/json/crud/unified/bulkWrite-delete-hint-serverError.yml rename to spec/crud/unified/bulkWrite-delete-hint-serverError.yml diff --git a/src/test/spec/json/crud/unified/bulkWrite-delete-hint.json b/spec/crud/unified/bulkWrite-delete-hint.json similarity index 100% rename from src/test/spec/json/crud/unified/bulkWrite-delete-hint.json rename to spec/crud/unified/bulkWrite-delete-hint.json diff --git a/src/test/spec/json/crud/unified/bulkWrite-delete-hint.yml b/spec/crud/unified/bulkWrite-delete-hint.yml similarity index 100% rename from src/test/spec/json/crud/unified/bulkWrite-delete-hint.yml rename to spec/crud/unified/bulkWrite-delete-hint.yml diff --git a/src/test/spec/json/crud/unified/bulkWrite-deleteMany-hint-unacknowledged.json b/spec/crud/unified/bulkWrite-deleteMany-hint-unacknowledged.json similarity index 100% rename from src/test/spec/json/crud/unified/bulkWrite-deleteMany-hint-unacknowledged.json rename to spec/crud/unified/bulkWrite-deleteMany-hint-unacknowledged.json diff --git a/src/test/spec/json/crud/unified/bulkWrite-deleteMany-hint-unacknowledged.yml b/spec/crud/unified/bulkWrite-deleteMany-hint-unacknowledged.yml similarity index 100% rename from src/test/spec/json/crud/unified/bulkWrite-deleteMany-hint-unacknowledged.yml rename to spec/crud/unified/bulkWrite-deleteMany-hint-unacknowledged.yml diff --git a/src/test/spec/json/crud/unified/bulkWrite-deleteMany-let.json b/spec/crud/unified/bulkWrite-deleteMany-let.json similarity index 100% rename from src/test/spec/json/crud/unified/bulkWrite-deleteMany-let.json rename to spec/crud/unified/bulkWrite-deleteMany-let.json diff --git a/src/test/spec/json/crud/unified/bulkWrite-deleteMany-let.yml b/spec/crud/unified/bulkWrite-deleteMany-let.yml similarity index 100% rename from src/test/spec/json/crud/unified/bulkWrite-deleteMany-let.yml rename to spec/crud/unified/bulkWrite-deleteMany-let.yml diff --git a/src/test/spec/json/crud/unified/bulkWrite-deleteOne-hint-unacknowledged.json b/spec/crud/unified/bulkWrite-deleteOne-hint-unacknowledged.json similarity index 100% rename from src/test/spec/json/crud/unified/bulkWrite-deleteOne-hint-unacknowledged.json rename to spec/crud/unified/bulkWrite-deleteOne-hint-unacknowledged.json diff --git a/src/test/spec/json/crud/unified/bulkWrite-deleteOne-hint-unacknowledged.yml b/spec/crud/unified/bulkWrite-deleteOne-hint-unacknowledged.yml similarity index 100% rename from src/test/spec/json/crud/unified/bulkWrite-deleteOne-hint-unacknowledged.yml rename to spec/crud/unified/bulkWrite-deleteOne-hint-unacknowledged.yml diff --git a/src/test/spec/json/crud/unified/bulkWrite-deleteOne-let.json b/spec/crud/unified/bulkWrite-deleteOne-let.json similarity index 100% rename from src/test/spec/json/crud/unified/bulkWrite-deleteOne-let.json rename to spec/crud/unified/bulkWrite-deleteOne-let.json diff --git a/src/test/spec/json/crud/unified/bulkWrite-deleteOne-let.yml b/spec/crud/unified/bulkWrite-deleteOne-let.yml similarity index 100% rename from src/test/spec/json/crud/unified/bulkWrite-deleteOne-let.yml rename to spec/crud/unified/bulkWrite-deleteOne-let.yml diff --git a/src/test/spec/json/crud/unified/bulkWrite-errorResponse.json b/spec/crud/unified/bulkWrite-errorResponse.json similarity index 100% rename from src/test/spec/json/crud/unified/bulkWrite-errorResponse.json rename to spec/crud/unified/bulkWrite-errorResponse.json diff --git a/src/test/spec/json/crud/unified/bulkWrite-errorResponse.yml b/spec/crud/unified/bulkWrite-errorResponse.yml similarity index 100% rename from src/test/spec/json/crud/unified/bulkWrite-errorResponse.yml rename to spec/crud/unified/bulkWrite-errorResponse.yml diff --git a/src/test/spec/json/crud/unified/bulkWrite-insertOne-dots_and_dollars.json b/spec/crud/unified/bulkWrite-insertOne-dots_and_dollars.json similarity index 100% rename from src/test/spec/json/crud/unified/bulkWrite-insertOne-dots_and_dollars.json rename to spec/crud/unified/bulkWrite-insertOne-dots_and_dollars.json diff --git a/src/test/spec/json/crud/unified/bulkWrite-insertOne-dots_and_dollars.yml b/spec/crud/unified/bulkWrite-insertOne-dots_and_dollars.yml similarity index 100% rename from src/test/spec/json/crud/unified/bulkWrite-insertOne-dots_and_dollars.yml rename to spec/crud/unified/bulkWrite-insertOne-dots_and_dollars.yml diff --git a/src/test/spec/json/crud/unified/bulkWrite-replaceOne-dots_and_dollars.json b/spec/crud/unified/bulkWrite-replaceOne-dots_and_dollars.json similarity index 100% rename from src/test/spec/json/crud/unified/bulkWrite-replaceOne-dots_and_dollars.json rename to spec/crud/unified/bulkWrite-replaceOne-dots_and_dollars.json diff --git a/src/test/spec/json/crud/unified/bulkWrite-replaceOne-dots_and_dollars.yml b/spec/crud/unified/bulkWrite-replaceOne-dots_and_dollars.yml similarity index 100% rename from src/test/spec/json/crud/unified/bulkWrite-replaceOne-dots_and_dollars.yml rename to spec/crud/unified/bulkWrite-replaceOne-dots_and_dollars.yml diff --git a/src/test/spec/json/crud/unified/bulkWrite-replaceOne-hint-unacknowledged.json b/spec/crud/unified/bulkWrite-replaceOne-hint-unacknowledged.json similarity index 100% rename from src/test/spec/json/crud/unified/bulkWrite-replaceOne-hint-unacknowledged.json rename to spec/crud/unified/bulkWrite-replaceOne-hint-unacknowledged.json diff --git a/src/test/spec/json/crud/unified/bulkWrite-replaceOne-hint-unacknowledged.yml b/spec/crud/unified/bulkWrite-replaceOne-hint-unacknowledged.yml similarity index 100% rename from src/test/spec/json/crud/unified/bulkWrite-replaceOne-hint-unacknowledged.yml rename to spec/crud/unified/bulkWrite-replaceOne-hint-unacknowledged.yml diff --git a/src/test/spec/json/crud/unified/bulkWrite-replaceOne-let.json b/spec/crud/unified/bulkWrite-replaceOne-let.json similarity index 100% rename from src/test/spec/json/crud/unified/bulkWrite-replaceOne-let.json rename to spec/crud/unified/bulkWrite-replaceOne-let.json diff --git a/src/test/spec/json/crud/unified/bulkWrite-replaceOne-let.yml b/spec/crud/unified/bulkWrite-replaceOne-let.yml similarity index 100% rename from src/test/spec/json/crud/unified/bulkWrite-replaceOne-let.yml rename to spec/crud/unified/bulkWrite-replaceOne-let.yml diff --git a/src/test/spec/json/crud/unified/bulkWrite-replaceOne-sort.json b/spec/crud/unified/bulkWrite-replaceOne-sort.json similarity index 100% rename from src/test/spec/json/crud/unified/bulkWrite-replaceOne-sort.json rename to spec/crud/unified/bulkWrite-replaceOne-sort.json diff --git a/src/test/spec/json/crud/unified/bulkWrite-replaceOne-sort.yml b/spec/crud/unified/bulkWrite-replaceOne-sort.yml similarity index 100% rename from src/test/spec/json/crud/unified/bulkWrite-replaceOne-sort.yml rename to spec/crud/unified/bulkWrite-replaceOne-sort.yml diff --git a/src/test/spec/json/crud/unified/bulkWrite-update-hint-clientError.json b/spec/crud/unified/bulkWrite-update-hint-clientError.json similarity index 100% rename from src/test/spec/json/crud/unified/bulkWrite-update-hint-clientError.json rename to spec/crud/unified/bulkWrite-update-hint-clientError.json diff --git a/src/test/spec/json/crud/unified/bulkWrite-update-hint-clientError.yml b/spec/crud/unified/bulkWrite-update-hint-clientError.yml similarity index 100% rename from src/test/spec/json/crud/unified/bulkWrite-update-hint-clientError.yml rename to spec/crud/unified/bulkWrite-update-hint-clientError.yml diff --git a/src/test/spec/json/crud/unified/bulkWrite-update-hint-serverError.json b/spec/crud/unified/bulkWrite-update-hint-serverError.json similarity index 100% rename from src/test/spec/json/crud/unified/bulkWrite-update-hint-serverError.json rename to spec/crud/unified/bulkWrite-update-hint-serverError.json diff --git a/src/test/spec/json/crud/unified/bulkWrite-update-hint-serverError.yml b/spec/crud/unified/bulkWrite-update-hint-serverError.yml similarity index 100% rename from src/test/spec/json/crud/unified/bulkWrite-update-hint-serverError.yml rename to spec/crud/unified/bulkWrite-update-hint-serverError.yml diff --git a/src/test/spec/json/crud/unified/bulkWrite-update-hint.json b/spec/crud/unified/bulkWrite-update-hint.json similarity index 100% rename from src/test/spec/json/crud/unified/bulkWrite-update-hint.json rename to spec/crud/unified/bulkWrite-update-hint.json diff --git a/src/test/spec/json/crud/unified/bulkWrite-update-hint.yml b/spec/crud/unified/bulkWrite-update-hint.yml similarity index 100% rename from src/test/spec/json/crud/unified/bulkWrite-update-hint.yml rename to spec/crud/unified/bulkWrite-update-hint.yml diff --git a/src/test/spec/json/crud/unified/bulkWrite-update-validation.json b/spec/crud/unified/bulkWrite-update-validation.json similarity index 100% rename from src/test/spec/json/crud/unified/bulkWrite-update-validation.json rename to spec/crud/unified/bulkWrite-update-validation.json diff --git a/src/test/spec/json/crud/unified/bulkWrite-update-validation.yml b/spec/crud/unified/bulkWrite-update-validation.yml similarity index 100% rename from src/test/spec/json/crud/unified/bulkWrite-update-validation.yml rename to spec/crud/unified/bulkWrite-update-validation.yml diff --git a/src/test/spec/json/crud/unified/bulkWrite-updateMany-dots_and_dollars.json b/spec/crud/unified/bulkWrite-updateMany-dots_and_dollars.json similarity index 100% rename from src/test/spec/json/crud/unified/bulkWrite-updateMany-dots_and_dollars.json rename to spec/crud/unified/bulkWrite-updateMany-dots_and_dollars.json diff --git a/src/test/spec/json/crud/unified/bulkWrite-updateMany-dots_and_dollars.yml b/spec/crud/unified/bulkWrite-updateMany-dots_and_dollars.yml similarity index 100% rename from src/test/spec/json/crud/unified/bulkWrite-updateMany-dots_and_dollars.yml rename to spec/crud/unified/bulkWrite-updateMany-dots_and_dollars.yml diff --git a/src/test/spec/json/crud/unified/bulkWrite-updateMany-hint-unacknowledged.json b/spec/crud/unified/bulkWrite-updateMany-hint-unacknowledged.json similarity index 100% rename from src/test/spec/json/crud/unified/bulkWrite-updateMany-hint-unacknowledged.json rename to spec/crud/unified/bulkWrite-updateMany-hint-unacknowledged.json diff --git a/src/test/spec/json/crud/unified/bulkWrite-updateMany-hint-unacknowledged.yml b/spec/crud/unified/bulkWrite-updateMany-hint-unacknowledged.yml similarity index 100% rename from src/test/spec/json/crud/unified/bulkWrite-updateMany-hint-unacknowledged.yml rename to spec/crud/unified/bulkWrite-updateMany-hint-unacknowledged.yml diff --git a/src/test/spec/json/crud/unified/bulkWrite-updateMany-let.json b/spec/crud/unified/bulkWrite-updateMany-let.json similarity index 100% rename from src/test/spec/json/crud/unified/bulkWrite-updateMany-let.json rename to spec/crud/unified/bulkWrite-updateMany-let.json diff --git a/src/test/spec/json/crud/unified/bulkWrite-updateMany-let.yml b/spec/crud/unified/bulkWrite-updateMany-let.yml similarity index 100% rename from src/test/spec/json/crud/unified/bulkWrite-updateMany-let.yml rename to spec/crud/unified/bulkWrite-updateMany-let.yml diff --git a/src/test/spec/json/crud/unified/bulkWrite-updateMany-pipeline.json b/spec/crud/unified/bulkWrite-updateMany-pipeline.json similarity index 100% rename from src/test/spec/json/crud/unified/bulkWrite-updateMany-pipeline.json rename to spec/crud/unified/bulkWrite-updateMany-pipeline.json diff --git a/src/test/spec/json/crud/unified/bulkWrite-updateMany-pipeline.yml b/spec/crud/unified/bulkWrite-updateMany-pipeline.yml similarity index 100% rename from src/test/spec/json/crud/unified/bulkWrite-updateMany-pipeline.yml rename to spec/crud/unified/bulkWrite-updateMany-pipeline.yml diff --git a/src/test/spec/json/crud/unified/bulkWrite-updateOne-dots_and_dollars.json b/spec/crud/unified/bulkWrite-updateOne-dots_and_dollars.json similarity index 100% rename from src/test/spec/json/crud/unified/bulkWrite-updateOne-dots_and_dollars.json rename to spec/crud/unified/bulkWrite-updateOne-dots_and_dollars.json diff --git a/src/test/spec/json/crud/unified/bulkWrite-updateOne-dots_and_dollars.yml b/spec/crud/unified/bulkWrite-updateOne-dots_and_dollars.yml similarity index 100% rename from src/test/spec/json/crud/unified/bulkWrite-updateOne-dots_and_dollars.yml rename to spec/crud/unified/bulkWrite-updateOne-dots_and_dollars.yml diff --git a/src/test/spec/json/crud/unified/bulkWrite-updateOne-hint-unacknowledged.json b/spec/crud/unified/bulkWrite-updateOne-hint-unacknowledged.json similarity index 100% rename from src/test/spec/json/crud/unified/bulkWrite-updateOne-hint-unacknowledged.json rename to spec/crud/unified/bulkWrite-updateOne-hint-unacknowledged.json diff --git a/src/test/spec/json/crud/unified/bulkWrite-updateOne-hint-unacknowledged.yml b/spec/crud/unified/bulkWrite-updateOne-hint-unacknowledged.yml similarity index 100% rename from src/test/spec/json/crud/unified/bulkWrite-updateOne-hint-unacknowledged.yml rename to spec/crud/unified/bulkWrite-updateOne-hint-unacknowledged.yml diff --git a/src/test/spec/json/crud/unified/bulkWrite-updateOne-let.json b/spec/crud/unified/bulkWrite-updateOne-let.json similarity index 100% rename from src/test/spec/json/crud/unified/bulkWrite-updateOne-let.json rename to spec/crud/unified/bulkWrite-updateOne-let.json diff --git a/src/test/spec/json/crud/unified/bulkWrite-updateOne-let.yml b/spec/crud/unified/bulkWrite-updateOne-let.yml similarity index 100% rename from src/test/spec/json/crud/unified/bulkWrite-updateOne-let.yml rename to spec/crud/unified/bulkWrite-updateOne-let.yml diff --git a/src/test/spec/json/crud/unified/bulkWrite-updateOne-pipeline.json b/spec/crud/unified/bulkWrite-updateOne-pipeline.json similarity index 100% rename from src/test/spec/json/crud/unified/bulkWrite-updateOne-pipeline.json rename to spec/crud/unified/bulkWrite-updateOne-pipeline.json diff --git a/src/test/spec/json/crud/unified/bulkWrite-updateOne-pipeline.yml b/spec/crud/unified/bulkWrite-updateOne-pipeline.yml similarity index 100% rename from src/test/spec/json/crud/unified/bulkWrite-updateOne-pipeline.yml rename to spec/crud/unified/bulkWrite-updateOne-pipeline.yml diff --git a/src/test/spec/json/crud/unified/bulkWrite-updateOne-sort.json b/spec/crud/unified/bulkWrite-updateOne-sort.json similarity index 100% rename from src/test/spec/json/crud/unified/bulkWrite-updateOne-sort.json rename to spec/crud/unified/bulkWrite-updateOne-sort.json diff --git a/src/test/spec/json/crud/unified/bulkWrite-updateOne-sort.yml b/spec/crud/unified/bulkWrite-updateOne-sort.yml similarity index 100% rename from src/test/spec/json/crud/unified/bulkWrite-updateOne-sort.yml rename to spec/crud/unified/bulkWrite-updateOne-sort.yml diff --git a/src/test/spec/json/crud/unified/bulkWrite.json b/spec/crud/unified/bulkWrite.json similarity index 100% rename from src/test/spec/json/crud/unified/bulkWrite.json rename to spec/crud/unified/bulkWrite.json diff --git a/src/test/spec/json/crud/unified/bulkWrite.yml b/spec/crud/unified/bulkWrite.yml similarity index 100% rename from src/test/spec/json/crud/unified/bulkWrite.yml rename to spec/crud/unified/bulkWrite.yml diff --git a/src/test/spec/json/crud/unified/bypassDocumentValidation.json b/spec/crud/unified/bypassDocumentValidation.json similarity index 100% rename from src/test/spec/json/crud/unified/bypassDocumentValidation.json rename to spec/crud/unified/bypassDocumentValidation.json diff --git a/src/test/spec/json/crud/unified/bypassDocumentValidation.yml b/spec/crud/unified/bypassDocumentValidation.yml similarity index 100% rename from src/test/spec/json/crud/unified/bypassDocumentValidation.yml rename to spec/crud/unified/bypassDocumentValidation.yml diff --git a/src/test/spec/json/crud/unified/client-bulkWrite-delete-options.json b/spec/crud/unified/client-bulkWrite-delete-options.json similarity index 100% rename from src/test/spec/json/crud/unified/client-bulkWrite-delete-options.json rename to spec/crud/unified/client-bulkWrite-delete-options.json diff --git a/src/test/spec/json/crud/unified/client-bulkWrite-delete-options.yml b/spec/crud/unified/client-bulkWrite-delete-options.yml similarity index 100% rename from src/test/spec/json/crud/unified/client-bulkWrite-delete-options.yml rename to spec/crud/unified/client-bulkWrite-delete-options.yml diff --git a/src/test/spec/json/crud/unified/client-bulkWrite-errorResponse.json b/spec/crud/unified/client-bulkWrite-errorResponse.json similarity index 100% rename from src/test/spec/json/crud/unified/client-bulkWrite-errorResponse.json rename to spec/crud/unified/client-bulkWrite-errorResponse.json diff --git a/src/test/spec/json/crud/unified/client-bulkWrite-errorResponse.yml b/spec/crud/unified/client-bulkWrite-errorResponse.yml similarity index 100% rename from src/test/spec/json/crud/unified/client-bulkWrite-errorResponse.yml rename to spec/crud/unified/client-bulkWrite-errorResponse.yml diff --git a/src/test/spec/json/crud/unified/client-bulkWrite-errors.json b/spec/crud/unified/client-bulkWrite-errors.json similarity index 100% rename from src/test/spec/json/crud/unified/client-bulkWrite-errors.json rename to spec/crud/unified/client-bulkWrite-errors.json diff --git a/src/test/spec/json/crud/unified/client-bulkWrite-errors.yml b/spec/crud/unified/client-bulkWrite-errors.yml similarity index 100% rename from src/test/spec/json/crud/unified/client-bulkWrite-errors.yml rename to spec/crud/unified/client-bulkWrite-errors.yml diff --git a/src/test/spec/json/crud/unified/client-bulkWrite-mixed-namespaces.json b/spec/crud/unified/client-bulkWrite-mixed-namespaces.json similarity index 100% rename from src/test/spec/json/crud/unified/client-bulkWrite-mixed-namespaces.json rename to spec/crud/unified/client-bulkWrite-mixed-namespaces.json diff --git a/src/test/spec/json/crud/unified/client-bulkWrite-mixed-namespaces.yml b/spec/crud/unified/client-bulkWrite-mixed-namespaces.yml similarity index 100% rename from src/test/spec/json/crud/unified/client-bulkWrite-mixed-namespaces.yml rename to spec/crud/unified/client-bulkWrite-mixed-namespaces.yml diff --git a/src/test/spec/json/crud/unified/client-bulkWrite-options.json b/spec/crud/unified/client-bulkWrite-options.json similarity index 100% rename from src/test/spec/json/crud/unified/client-bulkWrite-options.json rename to spec/crud/unified/client-bulkWrite-options.json diff --git a/src/test/spec/json/crud/unified/client-bulkWrite-options.yml b/spec/crud/unified/client-bulkWrite-options.yml similarity index 100% rename from src/test/spec/json/crud/unified/client-bulkWrite-options.yml rename to spec/crud/unified/client-bulkWrite-options.yml diff --git a/src/test/spec/json/crud/unified/client-bulkWrite-ordered.json b/spec/crud/unified/client-bulkWrite-ordered.json similarity index 100% rename from src/test/spec/json/crud/unified/client-bulkWrite-ordered.json rename to spec/crud/unified/client-bulkWrite-ordered.json diff --git a/src/test/spec/json/crud/unified/client-bulkWrite-ordered.yml b/spec/crud/unified/client-bulkWrite-ordered.yml similarity index 100% rename from src/test/spec/json/crud/unified/client-bulkWrite-ordered.yml rename to spec/crud/unified/client-bulkWrite-ordered.yml diff --git a/src/test/spec/json/crud/unified/client-bulkWrite-partialResults.json b/spec/crud/unified/client-bulkWrite-partialResults.json similarity index 100% rename from src/test/spec/json/crud/unified/client-bulkWrite-partialResults.json rename to spec/crud/unified/client-bulkWrite-partialResults.json diff --git a/src/test/spec/json/crud/unified/client-bulkWrite-partialResults.yml b/spec/crud/unified/client-bulkWrite-partialResults.yml similarity index 100% rename from src/test/spec/json/crud/unified/client-bulkWrite-partialResults.yml rename to spec/crud/unified/client-bulkWrite-partialResults.yml diff --git a/src/test/spec/json/crud/unified/client-bulkWrite-replaceOne-sort.json b/spec/crud/unified/client-bulkWrite-replaceOne-sort.json similarity index 100% rename from src/test/spec/json/crud/unified/client-bulkWrite-replaceOne-sort.json rename to spec/crud/unified/client-bulkWrite-replaceOne-sort.json diff --git a/src/test/spec/json/crud/unified/client-bulkWrite-replaceOne-sort.yml b/spec/crud/unified/client-bulkWrite-replaceOne-sort.yml similarity index 100% rename from src/test/spec/json/crud/unified/client-bulkWrite-replaceOne-sort.yml rename to spec/crud/unified/client-bulkWrite-replaceOne-sort.yml diff --git a/src/test/spec/json/crud/unified/client-bulkWrite-results.json b/spec/crud/unified/client-bulkWrite-results.json similarity index 100% rename from src/test/spec/json/crud/unified/client-bulkWrite-results.json rename to spec/crud/unified/client-bulkWrite-results.json diff --git a/src/test/spec/json/crud/unified/client-bulkWrite-results.yml b/spec/crud/unified/client-bulkWrite-results.yml similarity index 100% rename from src/test/spec/json/crud/unified/client-bulkWrite-results.yml rename to spec/crud/unified/client-bulkWrite-results.yml diff --git a/src/test/spec/json/crud/unified/client-bulkWrite-update-options.json b/spec/crud/unified/client-bulkWrite-update-options.json similarity index 100% rename from src/test/spec/json/crud/unified/client-bulkWrite-update-options.json rename to spec/crud/unified/client-bulkWrite-update-options.json diff --git a/src/test/spec/json/crud/unified/client-bulkWrite-update-options.yml b/spec/crud/unified/client-bulkWrite-update-options.yml similarity index 100% rename from src/test/spec/json/crud/unified/client-bulkWrite-update-options.yml rename to spec/crud/unified/client-bulkWrite-update-options.yml diff --git a/src/test/spec/json/crud/unified/client-bulkWrite-update-pipeline.json b/spec/crud/unified/client-bulkWrite-update-pipeline.json similarity index 100% rename from src/test/spec/json/crud/unified/client-bulkWrite-update-pipeline.json rename to spec/crud/unified/client-bulkWrite-update-pipeline.json diff --git a/src/test/spec/json/crud/unified/client-bulkWrite-update-pipeline.yml b/spec/crud/unified/client-bulkWrite-update-pipeline.yml similarity index 100% rename from src/test/spec/json/crud/unified/client-bulkWrite-update-pipeline.yml rename to spec/crud/unified/client-bulkWrite-update-pipeline.yml diff --git a/src/test/spec/json/crud/unified/client-bulkWrite-update-validation.json b/spec/crud/unified/client-bulkWrite-update-validation.json similarity index 100% rename from src/test/spec/json/crud/unified/client-bulkWrite-update-validation.json rename to spec/crud/unified/client-bulkWrite-update-validation.json diff --git a/src/test/spec/json/crud/unified/client-bulkWrite-update-validation.yml b/spec/crud/unified/client-bulkWrite-update-validation.yml similarity index 100% rename from src/test/spec/json/crud/unified/client-bulkWrite-update-validation.yml rename to spec/crud/unified/client-bulkWrite-update-validation.yml diff --git a/src/test/spec/json/crud/unified/client-bulkWrite-updateOne-sort.json b/spec/crud/unified/client-bulkWrite-updateOne-sort.json similarity index 100% rename from src/test/spec/json/crud/unified/client-bulkWrite-updateOne-sort.json rename to spec/crud/unified/client-bulkWrite-updateOne-sort.json diff --git a/src/test/spec/json/crud/unified/client-bulkWrite-updateOne-sort.yml b/spec/crud/unified/client-bulkWrite-updateOne-sort.yml similarity index 100% rename from src/test/spec/json/crud/unified/client-bulkWrite-updateOne-sort.yml rename to spec/crud/unified/client-bulkWrite-updateOne-sort.yml diff --git a/src/test/spec/json/crud/unified/count-collation.json b/spec/crud/unified/count-collation.json similarity index 100% rename from src/test/spec/json/crud/unified/count-collation.json rename to spec/crud/unified/count-collation.json diff --git a/src/test/spec/json/crud/unified/count-collation.yml b/spec/crud/unified/count-collation.yml similarity index 100% rename from src/test/spec/json/crud/unified/count-collation.yml rename to spec/crud/unified/count-collation.yml diff --git a/src/test/spec/json/crud/unified/count-empty.json b/spec/crud/unified/count-empty.json similarity index 100% rename from src/test/spec/json/crud/unified/count-empty.json rename to spec/crud/unified/count-empty.json diff --git a/src/test/spec/json/crud/unified/count-empty.yml b/spec/crud/unified/count-empty.yml similarity index 100% rename from src/test/spec/json/crud/unified/count-empty.yml rename to spec/crud/unified/count-empty.yml diff --git a/src/test/spec/json/crud/unified/count.json b/spec/crud/unified/count.json similarity index 100% rename from src/test/spec/json/crud/unified/count.json rename to spec/crud/unified/count.json diff --git a/src/test/spec/json/crud/unified/count.yml b/spec/crud/unified/count.yml similarity index 100% rename from src/test/spec/json/crud/unified/count.yml rename to spec/crud/unified/count.yml diff --git a/src/test/spec/json/crud/unified/countDocuments-comment.json b/spec/crud/unified/countDocuments-comment.json similarity index 100% rename from src/test/spec/json/crud/unified/countDocuments-comment.json rename to spec/crud/unified/countDocuments-comment.json diff --git a/src/test/spec/json/crud/unified/countDocuments-comment.yml b/spec/crud/unified/countDocuments-comment.yml similarity index 100% rename from src/test/spec/json/crud/unified/countDocuments-comment.yml rename to spec/crud/unified/countDocuments-comment.yml diff --git a/src/test/spec/json/crud/unified/create-null-ids.json b/spec/crud/unified/create-null-ids.json similarity index 100% rename from src/test/spec/json/crud/unified/create-null-ids.json rename to spec/crud/unified/create-null-ids.json diff --git a/src/test/spec/json/crud/unified/create-null-ids.yml b/spec/crud/unified/create-null-ids.yml similarity index 100% rename from src/test/spec/json/crud/unified/create-null-ids.yml rename to spec/crud/unified/create-null-ids.yml diff --git a/src/test/spec/json/crud/unified/db-aggregate-write-readPreference.json b/spec/crud/unified/db-aggregate-write-readPreference.json similarity index 100% rename from src/test/spec/json/crud/unified/db-aggregate-write-readPreference.json rename to spec/crud/unified/db-aggregate-write-readPreference.json diff --git a/src/test/spec/json/crud/unified/db-aggregate-write-readPreference.yml b/spec/crud/unified/db-aggregate-write-readPreference.yml similarity index 100% rename from src/test/spec/json/crud/unified/db-aggregate-write-readPreference.yml rename to spec/crud/unified/db-aggregate-write-readPreference.yml diff --git a/src/test/spec/json/crud/unified/db-aggregate.json b/spec/crud/unified/db-aggregate.json similarity index 100% rename from src/test/spec/json/crud/unified/db-aggregate.json rename to spec/crud/unified/db-aggregate.json diff --git a/src/test/spec/json/crud/unified/db-aggregate.yml b/spec/crud/unified/db-aggregate.yml similarity index 100% rename from src/test/spec/json/crud/unified/db-aggregate.yml rename to spec/crud/unified/db-aggregate.yml diff --git a/src/test/spec/json/crud/unified/deleteMany-collation.json b/spec/crud/unified/deleteMany-collation.json similarity index 100% rename from src/test/spec/json/crud/unified/deleteMany-collation.json rename to spec/crud/unified/deleteMany-collation.json diff --git a/src/test/spec/json/crud/unified/deleteMany-collation.yml b/spec/crud/unified/deleteMany-collation.yml similarity index 100% rename from src/test/spec/json/crud/unified/deleteMany-collation.yml rename to spec/crud/unified/deleteMany-collation.yml diff --git a/src/test/spec/json/crud/unified/deleteMany-comment.json b/spec/crud/unified/deleteMany-comment.json similarity index 100% rename from src/test/spec/json/crud/unified/deleteMany-comment.json rename to spec/crud/unified/deleteMany-comment.json diff --git a/src/test/spec/json/crud/unified/deleteMany-comment.yml b/spec/crud/unified/deleteMany-comment.yml similarity index 100% rename from src/test/spec/json/crud/unified/deleteMany-comment.yml rename to spec/crud/unified/deleteMany-comment.yml diff --git a/src/test/spec/json/crud/unified/deleteMany-hint-clientError.json b/spec/crud/unified/deleteMany-hint-clientError.json similarity index 100% rename from src/test/spec/json/crud/unified/deleteMany-hint-clientError.json rename to spec/crud/unified/deleteMany-hint-clientError.json diff --git a/src/test/spec/json/crud/unified/deleteMany-hint-clientError.yml b/spec/crud/unified/deleteMany-hint-clientError.yml similarity index 100% rename from src/test/spec/json/crud/unified/deleteMany-hint-clientError.yml rename to spec/crud/unified/deleteMany-hint-clientError.yml diff --git a/src/test/spec/json/crud/unified/deleteMany-hint-serverError.json b/spec/crud/unified/deleteMany-hint-serverError.json similarity index 100% rename from src/test/spec/json/crud/unified/deleteMany-hint-serverError.json rename to spec/crud/unified/deleteMany-hint-serverError.json diff --git a/src/test/spec/json/crud/unified/deleteMany-hint-serverError.yml b/spec/crud/unified/deleteMany-hint-serverError.yml similarity index 100% rename from src/test/spec/json/crud/unified/deleteMany-hint-serverError.yml rename to spec/crud/unified/deleteMany-hint-serverError.yml diff --git a/src/test/spec/json/crud/unified/deleteMany-hint-unacknowledged.json b/spec/crud/unified/deleteMany-hint-unacknowledged.json similarity index 100% rename from src/test/spec/json/crud/unified/deleteMany-hint-unacknowledged.json rename to spec/crud/unified/deleteMany-hint-unacknowledged.json diff --git a/src/test/spec/json/crud/unified/deleteMany-hint-unacknowledged.yml b/spec/crud/unified/deleteMany-hint-unacknowledged.yml similarity index 100% rename from src/test/spec/json/crud/unified/deleteMany-hint-unacknowledged.yml rename to spec/crud/unified/deleteMany-hint-unacknowledged.yml diff --git a/src/test/spec/json/crud/unified/deleteMany-hint.json b/spec/crud/unified/deleteMany-hint.json similarity index 100% rename from src/test/spec/json/crud/unified/deleteMany-hint.json rename to spec/crud/unified/deleteMany-hint.json diff --git a/src/test/spec/json/crud/unified/deleteMany-hint.yml b/spec/crud/unified/deleteMany-hint.yml similarity index 100% rename from src/test/spec/json/crud/unified/deleteMany-hint.yml rename to spec/crud/unified/deleteMany-hint.yml diff --git a/src/test/spec/json/crud/unified/deleteMany-let.json b/spec/crud/unified/deleteMany-let.json similarity index 100% rename from src/test/spec/json/crud/unified/deleteMany-let.json rename to spec/crud/unified/deleteMany-let.json diff --git a/src/test/spec/json/crud/unified/deleteMany-let.yml b/spec/crud/unified/deleteMany-let.yml similarity index 100% rename from src/test/spec/json/crud/unified/deleteMany-let.yml rename to spec/crud/unified/deleteMany-let.yml diff --git a/src/test/spec/json/crud/unified/deleteMany.json b/spec/crud/unified/deleteMany.json similarity index 100% rename from src/test/spec/json/crud/unified/deleteMany.json rename to spec/crud/unified/deleteMany.json diff --git a/src/test/spec/json/crud/unified/deleteMany.yml b/spec/crud/unified/deleteMany.yml similarity index 100% rename from src/test/spec/json/crud/unified/deleteMany.yml rename to spec/crud/unified/deleteMany.yml diff --git a/src/test/spec/json/crud/unified/deleteOne-collation.json b/spec/crud/unified/deleteOne-collation.json similarity index 100% rename from src/test/spec/json/crud/unified/deleteOne-collation.json rename to spec/crud/unified/deleteOne-collation.json diff --git a/src/test/spec/json/crud/unified/deleteOne-collation.yml b/spec/crud/unified/deleteOne-collation.yml similarity index 100% rename from src/test/spec/json/crud/unified/deleteOne-collation.yml rename to spec/crud/unified/deleteOne-collation.yml diff --git a/src/test/spec/json/crud/unified/deleteOne-comment.json b/spec/crud/unified/deleteOne-comment.json similarity index 100% rename from src/test/spec/json/crud/unified/deleteOne-comment.json rename to spec/crud/unified/deleteOne-comment.json diff --git a/src/test/spec/json/crud/unified/deleteOne-comment.yml b/spec/crud/unified/deleteOne-comment.yml similarity index 100% rename from src/test/spec/json/crud/unified/deleteOne-comment.yml rename to spec/crud/unified/deleteOne-comment.yml diff --git a/src/test/spec/json/crud/unified/deleteOne-errorResponse.json b/spec/crud/unified/deleteOne-errorResponse.json similarity index 100% rename from src/test/spec/json/crud/unified/deleteOne-errorResponse.json rename to spec/crud/unified/deleteOne-errorResponse.json diff --git a/src/test/spec/json/crud/unified/deleteOne-errorResponse.yml b/spec/crud/unified/deleteOne-errorResponse.yml similarity index 100% rename from src/test/spec/json/crud/unified/deleteOne-errorResponse.yml rename to spec/crud/unified/deleteOne-errorResponse.yml diff --git a/src/test/spec/json/crud/unified/deleteOne-hint-clientError.json b/spec/crud/unified/deleteOne-hint-clientError.json similarity index 100% rename from src/test/spec/json/crud/unified/deleteOne-hint-clientError.json rename to spec/crud/unified/deleteOne-hint-clientError.json diff --git a/src/test/spec/json/crud/unified/deleteOne-hint-clientError.yml b/spec/crud/unified/deleteOne-hint-clientError.yml similarity index 100% rename from src/test/spec/json/crud/unified/deleteOne-hint-clientError.yml rename to spec/crud/unified/deleteOne-hint-clientError.yml diff --git a/src/test/spec/json/crud/unified/deleteOne-hint-serverError.json b/spec/crud/unified/deleteOne-hint-serverError.json similarity index 100% rename from src/test/spec/json/crud/unified/deleteOne-hint-serverError.json rename to spec/crud/unified/deleteOne-hint-serverError.json diff --git a/src/test/spec/json/crud/unified/deleteOne-hint-serverError.yml b/spec/crud/unified/deleteOne-hint-serverError.yml similarity index 100% rename from src/test/spec/json/crud/unified/deleteOne-hint-serverError.yml rename to spec/crud/unified/deleteOne-hint-serverError.yml diff --git a/src/test/spec/json/crud/unified/deleteOne-hint-unacknowledged.json b/spec/crud/unified/deleteOne-hint-unacknowledged.json similarity index 100% rename from src/test/spec/json/crud/unified/deleteOne-hint-unacknowledged.json rename to spec/crud/unified/deleteOne-hint-unacknowledged.json diff --git a/src/test/spec/json/crud/unified/deleteOne-hint-unacknowledged.yml b/spec/crud/unified/deleteOne-hint-unacknowledged.yml similarity index 100% rename from src/test/spec/json/crud/unified/deleteOne-hint-unacknowledged.yml rename to spec/crud/unified/deleteOne-hint-unacknowledged.yml diff --git a/src/test/spec/json/crud/unified/deleteOne-hint.json b/spec/crud/unified/deleteOne-hint.json similarity index 100% rename from src/test/spec/json/crud/unified/deleteOne-hint.json rename to spec/crud/unified/deleteOne-hint.json diff --git a/src/test/spec/json/crud/unified/deleteOne-hint.yml b/spec/crud/unified/deleteOne-hint.yml similarity index 100% rename from src/test/spec/json/crud/unified/deleteOne-hint.yml rename to spec/crud/unified/deleteOne-hint.yml diff --git a/src/test/spec/json/crud/unified/deleteOne-let.json b/spec/crud/unified/deleteOne-let.json similarity index 100% rename from src/test/spec/json/crud/unified/deleteOne-let.json rename to spec/crud/unified/deleteOne-let.json diff --git a/src/test/spec/json/crud/unified/deleteOne-let.yml b/spec/crud/unified/deleteOne-let.yml similarity index 100% rename from src/test/spec/json/crud/unified/deleteOne-let.yml rename to spec/crud/unified/deleteOne-let.yml diff --git a/src/test/spec/json/crud/unified/deleteOne.json b/spec/crud/unified/deleteOne.json similarity index 100% rename from src/test/spec/json/crud/unified/deleteOne.json rename to spec/crud/unified/deleteOne.json diff --git a/src/test/spec/json/crud/unified/deleteOne.yml b/spec/crud/unified/deleteOne.yml similarity index 100% rename from src/test/spec/json/crud/unified/deleteOne.yml rename to spec/crud/unified/deleteOne.yml diff --git a/src/test/spec/json/crud/unified/distinct-collation.json b/spec/crud/unified/distinct-collation.json similarity index 100% rename from src/test/spec/json/crud/unified/distinct-collation.json rename to spec/crud/unified/distinct-collation.json diff --git a/src/test/spec/json/crud/unified/distinct-collation.yml b/spec/crud/unified/distinct-collation.yml similarity index 100% rename from src/test/spec/json/crud/unified/distinct-collation.yml rename to spec/crud/unified/distinct-collation.yml diff --git a/src/test/spec/json/crud/unified/distinct-comment.json b/spec/crud/unified/distinct-comment.json similarity index 100% rename from src/test/spec/json/crud/unified/distinct-comment.json rename to spec/crud/unified/distinct-comment.json diff --git a/src/test/spec/json/crud/unified/distinct-comment.yml b/spec/crud/unified/distinct-comment.yml similarity index 100% rename from src/test/spec/json/crud/unified/distinct-comment.yml rename to spec/crud/unified/distinct-comment.yml diff --git a/src/test/spec/json/crud/unified/distinct-hint.json b/spec/crud/unified/distinct-hint.json similarity index 100% rename from src/test/spec/json/crud/unified/distinct-hint.json rename to spec/crud/unified/distinct-hint.json diff --git a/src/test/spec/json/crud/unified/distinct-hint.yml b/spec/crud/unified/distinct-hint.yml similarity index 100% rename from src/test/spec/json/crud/unified/distinct-hint.yml rename to spec/crud/unified/distinct-hint.yml diff --git a/src/test/spec/json/crud/unified/distinct.json b/spec/crud/unified/distinct.json similarity index 100% rename from src/test/spec/json/crud/unified/distinct.json rename to spec/crud/unified/distinct.json diff --git a/src/test/spec/json/crud/unified/distinct.yml b/spec/crud/unified/distinct.yml similarity index 100% rename from src/test/spec/json/crud/unified/distinct.yml rename to spec/crud/unified/distinct.yml diff --git a/src/test/spec/json/crud/unified/estimatedDocumentCount-comment.json b/spec/crud/unified/estimatedDocumentCount-comment.json similarity index 100% rename from src/test/spec/json/crud/unified/estimatedDocumentCount-comment.json rename to spec/crud/unified/estimatedDocumentCount-comment.json diff --git a/src/test/spec/json/crud/unified/estimatedDocumentCount-comment.yml b/spec/crud/unified/estimatedDocumentCount-comment.yml similarity index 100% rename from src/test/spec/json/crud/unified/estimatedDocumentCount-comment.yml rename to spec/crud/unified/estimatedDocumentCount-comment.yml diff --git a/src/test/spec/json/crud/unified/estimatedDocumentCount.json b/spec/crud/unified/estimatedDocumentCount.json similarity index 100% rename from src/test/spec/json/crud/unified/estimatedDocumentCount.json rename to spec/crud/unified/estimatedDocumentCount.json diff --git a/src/test/spec/json/crud/unified/estimatedDocumentCount.yml b/spec/crud/unified/estimatedDocumentCount.yml similarity index 100% rename from src/test/spec/json/crud/unified/estimatedDocumentCount.yml rename to spec/crud/unified/estimatedDocumentCount.yml diff --git a/src/test/spec/json/crud/unified/find-allowdiskuse-clientError.json b/spec/crud/unified/find-allowdiskuse-clientError.json similarity index 100% rename from src/test/spec/json/crud/unified/find-allowdiskuse-clientError.json rename to spec/crud/unified/find-allowdiskuse-clientError.json diff --git a/src/test/spec/json/crud/unified/find-allowdiskuse-clientError.yml b/spec/crud/unified/find-allowdiskuse-clientError.yml similarity index 100% rename from src/test/spec/json/crud/unified/find-allowdiskuse-clientError.yml rename to spec/crud/unified/find-allowdiskuse-clientError.yml diff --git a/src/test/spec/json/crud/unified/find-allowdiskuse-serverError.json b/spec/crud/unified/find-allowdiskuse-serverError.json similarity index 100% rename from src/test/spec/json/crud/unified/find-allowdiskuse-serverError.json rename to spec/crud/unified/find-allowdiskuse-serverError.json diff --git a/src/test/spec/json/crud/unified/find-allowdiskuse-serverError.yml b/spec/crud/unified/find-allowdiskuse-serverError.yml similarity index 100% rename from src/test/spec/json/crud/unified/find-allowdiskuse-serverError.yml rename to spec/crud/unified/find-allowdiskuse-serverError.yml diff --git a/src/test/spec/json/crud/unified/find-allowdiskuse.json b/spec/crud/unified/find-allowdiskuse.json similarity index 100% rename from src/test/spec/json/crud/unified/find-allowdiskuse.json rename to spec/crud/unified/find-allowdiskuse.json diff --git a/src/test/spec/json/crud/unified/find-allowdiskuse.yml b/spec/crud/unified/find-allowdiskuse.yml similarity index 100% rename from src/test/spec/json/crud/unified/find-allowdiskuse.yml rename to spec/crud/unified/find-allowdiskuse.yml diff --git a/src/test/spec/json/crud/unified/find-collation.json b/spec/crud/unified/find-collation.json similarity index 100% rename from src/test/spec/json/crud/unified/find-collation.json rename to spec/crud/unified/find-collation.json diff --git a/src/test/spec/json/crud/unified/find-collation.yml b/spec/crud/unified/find-collation.yml similarity index 100% rename from src/test/spec/json/crud/unified/find-collation.yml rename to spec/crud/unified/find-collation.yml diff --git a/src/test/spec/json/crud/unified/find-comment.json b/spec/crud/unified/find-comment.json similarity index 100% rename from src/test/spec/json/crud/unified/find-comment.json rename to spec/crud/unified/find-comment.json diff --git a/src/test/spec/json/crud/unified/find-comment.yml b/spec/crud/unified/find-comment.yml similarity index 100% rename from src/test/spec/json/crud/unified/find-comment.yml rename to spec/crud/unified/find-comment.yml diff --git a/src/test/spec/json/crud/unified/find-let.json b/spec/crud/unified/find-let.json similarity index 100% rename from src/test/spec/json/crud/unified/find-let.json rename to spec/crud/unified/find-let.json diff --git a/src/test/spec/json/crud/unified/find-let.yml b/spec/crud/unified/find-let.yml similarity index 100% rename from src/test/spec/json/crud/unified/find-let.yml rename to spec/crud/unified/find-let.yml diff --git a/src/test/spec/json/crud/unified/find.json b/spec/crud/unified/find.json similarity index 100% rename from src/test/spec/json/crud/unified/find.json rename to spec/crud/unified/find.json diff --git a/src/test/spec/json/crud/unified/find.yml b/spec/crud/unified/find.yml similarity index 100% rename from src/test/spec/json/crud/unified/find.yml rename to spec/crud/unified/find.yml diff --git a/src/test/spec/json/crud/unified/findOne.json b/spec/crud/unified/findOne.json similarity index 100% rename from src/test/spec/json/crud/unified/findOne.json rename to spec/crud/unified/findOne.json diff --git a/src/test/spec/json/crud/unified/findOne.yml b/spec/crud/unified/findOne.yml similarity index 100% rename from src/test/spec/json/crud/unified/findOne.yml rename to spec/crud/unified/findOne.yml diff --git a/src/test/spec/json/crud/unified/findOneAndDelete-collation.json b/spec/crud/unified/findOneAndDelete-collation.json similarity index 100% rename from src/test/spec/json/crud/unified/findOneAndDelete-collation.json rename to spec/crud/unified/findOneAndDelete-collation.json diff --git a/src/test/spec/json/crud/unified/findOneAndDelete-collation.yml b/spec/crud/unified/findOneAndDelete-collation.yml similarity index 100% rename from src/test/spec/json/crud/unified/findOneAndDelete-collation.yml rename to spec/crud/unified/findOneAndDelete-collation.yml diff --git a/src/test/spec/json/crud/unified/findOneAndDelete-comment.json b/spec/crud/unified/findOneAndDelete-comment.json similarity index 100% rename from src/test/spec/json/crud/unified/findOneAndDelete-comment.json rename to spec/crud/unified/findOneAndDelete-comment.json diff --git a/src/test/spec/json/crud/unified/findOneAndDelete-comment.yml b/spec/crud/unified/findOneAndDelete-comment.yml similarity index 100% rename from src/test/spec/json/crud/unified/findOneAndDelete-comment.yml rename to spec/crud/unified/findOneAndDelete-comment.yml diff --git a/src/test/spec/json/crud/unified/findOneAndDelete-hint-clientError.json b/spec/crud/unified/findOneAndDelete-hint-clientError.json similarity index 100% rename from src/test/spec/json/crud/unified/findOneAndDelete-hint-clientError.json rename to spec/crud/unified/findOneAndDelete-hint-clientError.json diff --git a/src/test/spec/json/crud/unified/findOneAndDelete-hint-clientError.yml b/spec/crud/unified/findOneAndDelete-hint-clientError.yml similarity index 100% rename from src/test/spec/json/crud/unified/findOneAndDelete-hint-clientError.yml rename to spec/crud/unified/findOneAndDelete-hint-clientError.yml diff --git a/src/test/spec/json/crud/unified/findOneAndDelete-hint-serverError.json b/spec/crud/unified/findOneAndDelete-hint-serverError.json similarity index 100% rename from src/test/spec/json/crud/unified/findOneAndDelete-hint-serverError.json rename to spec/crud/unified/findOneAndDelete-hint-serverError.json diff --git a/src/test/spec/json/crud/unified/findOneAndDelete-hint-serverError.yml b/spec/crud/unified/findOneAndDelete-hint-serverError.yml similarity index 100% rename from src/test/spec/json/crud/unified/findOneAndDelete-hint-serverError.yml rename to spec/crud/unified/findOneAndDelete-hint-serverError.yml diff --git a/src/test/spec/json/crud/unified/findOneAndDelete-hint-unacknowledged.json b/spec/crud/unified/findOneAndDelete-hint-unacknowledged.json similarity index 100% rename from src/test/spec/json/crud/unified/findOneAndDelete-hint-unacknowledged.json rename to spec/crud/unified/findOneAndDelete-hint-unacknowledged.json diff --git a/src/test/spec/json/crud/unified/findOneAndDelete-hint-unacknowledged.yml b/spec/crud/unified/findOneAndDelete-hint-unacknowledged.yml similarity index 100% rename from src/test/spec/json/crud/unified/findOneAndDelete-hint-unacknowledged.yml rename to spec/crud/unified/findOneAndDelete-hint-unacknowledged.yml diff --git a/src/test/spec/json/crud/unified/findOneAndDelete-hint.json b/spec/crud/unified/findOneAndDelete-hint.json similarity index 100% rename from src/test/spec/json/crud/unified/findOneAndDelete-hint.json rename to spec/crud/unified/findOneAndDelete-hint.json diff --git a/src/test/spec/json/crud/unified/findOneAndDelete-hint.yml b/spec/crud/unified/findOneAndDelete-hint.yml similarity index 100% rename from src/test/spec/json/crud/unified/findOneAndDelete-hint.yml rename to spec/crud/unified/findOneAndDelete-hint.yml diff --git a/src/test/spec/json/crud/unified/findOneAndDelete-let.json b/spec/crud/unified/findOneAndDelete-let.json similarity index 100% rename from src/test/spec/json/crud/unified/findOneAndDelete-let.json rename to spec/crud/unified/findOneAndDelete-let.json diff --git a/src/test/spec/json/crud/unified/findOneAndDelete-let.yml b/spec/crud/unified/findOneAndDelete-let.yml similarity index 100% rename from src/test/spec/json/crud/unified/findOneAndDelete-let.yml rename to spec/crud/unified/findOneAndDelete-let.yml diff --git a/src/test/spec/json/crud/unified/findOneAndDelete.json b/spec/crud/unified/findOneAndDelete.json similarity index 100% rename from src/test/spec/json/crud/unified/findOneAndDelete.json rename to spec/crud/unified/findOneAndDelete.json diff --git a/src/test/spec/json/crud/unified/findOneAndDelete.yml b/spec/crud/unified/findOneAndDelete.yml similarity index 100% rename from src/test/spec/json/crud/unified/findOneAndDelete.yml rename to spec/crud/unified/findOneAndDelete.yml diff --git a/src/test/spec/json/crud/unified/findOneAndReplace-collation.json b/spec/crud/unified/findOneAndReplace-collation.json similarity index 100% rename from src/test/spec/json/crud/unified/findOneAndReplace-collation.json rename to spec/crud/unified/findOneAndReplace-collation.json diff --git a/src/test/spec/json/crud/unified/findOneAndReplace-collation.yml b/spec/crud/unified/findOneAndReplace-collation.yml similarity index 100% rename from src/test/spec/json/crud/unified/findOneAndReplace-collation.yml rename to spec/crud/unified/findOneAndReplace-collation.yml diff --git a/src/test/spec/json/crud/unified/findOneAndReplace-comment.json b/spec/crud/unified/findOneAndReplace-comment.json similarity index 100% rename from src/test/spec/json/crud/unified/findOneAndReplace-comment.json rename to spec/crud/unified/findOneAndReplace-comment.json diff --git a/src/test/spec/json/crud/unified/findOneAndReplace-comment.yml b/spec/crud/unified/findOneAndReplace-comment.yml similarity index 100% rename from src/test/spec/json/crud/unified/findOneAndReplace-comment.yml rename to spec/crud/unified/findOneAndReplace-comment.yml diff --git a/src/test/spec/json/crud/unified/findOneAndReplace-dots_and_dollars.json b/spec/crud/unified/findOneAndReplace-dots_and_dollars.json similarity index 100% rename from src/test/spec/json/crud/unified/findOneAndReplace-dots_and_dollars.json rename to spec/crud/unified/findOneAndReplace-dots_and_dollars.json diff --git a/src/test/spec/json/crud/unified/findOneAndReplace-dots_and_dollars.yml b/spec/crud/unified/findOneAndReplace-dots_and_dollars.yml similarity index 100% rename from src/test/spec/json/crud/unified/findOneAndReplace-dots_and_dollars.yml rename to spec/crud/unified/findOneAndReplace-dots_and_dollars.yml diff --git a/src/test/spec/json/crud/unified/findOneAndReplace-hint-clientError.json b/spec/crud/unified/findOneAndReplace-hint-clientError.json similarity index 100% rename from src/test/spec/json/crud/unified/findOneAndReplace-hint-clientError.json rename to spec/crud/unified/findOneAndReplace-hint-clientError.json diff --git a/src/test/spec/json/crud/unified/findOneAndReplace-hint-clientError.yml b/spec/crud/unified/findOneAndReplace-hint-clientError.yml similarity index 100% rename from src/test/spec/json/crud/unified/findOneAndReplace-hint-clientError.yml rename to spec/crud/unified/findOneAndReplace-hint-clientError.yml diff --git a/src/test/spec/json/crud/unified/findOneAndReplace-hint-serverError.json b/spec/crud/unified/findOneAndReplace-hint-serverError.json similarity index 100% rename from src/test/spec/json/crud/unified/findOneAndReplace-hint-serverError.json rename to spec/crud/unified/findOneAndReplace-hint-serverError.json diff --git a/src/test/spec/json/crud/unified/findOneAndReplace-hint-serverError.yml b/spec/crud/unified/findOneAndReplace-hint-serverError.yml similarity index 100% rename from src/test/spec/json/crud/unified/findOneAndReplace-hint-serverError.yml rename to spec/crud/unified/findOneAndReplace-hint-serverError.yml diff --git a/src/test/spec/json/crud/unified/findOneAndReplace-hint-unacknowledged.json b/spec/crud/unified/findOneAndReplace-hint-unacknowledged.json similarity index 100% rename from src/test/spec/json/crud/unified/findOneAndReplace-hint-unacknowledged.json rename to spec/crud/unified/findOneAndReplace-hint-unacknowledged.json diff --git a/src/test/spec/json/crud/unified/findOneAndReplace-hint-unacknowledged.yml b/spec/crud/unified/findOneAndReplace-hint-unacknowledged.yml similarity index 100% rename from src/test/spec/json/crud/unified/findOneAndReplace-hint-unacknowledged.yml rename to spec/crud/unified/findOneAndReplace-hint-unacknowledged.yml diff --git a/src/test/spec/json/crud/unified/findOneAndReplace-hint.json b/spec/crud/unified/findOneAndReplace-hint.json similarity index 100% rename from src/test/spec/json/crud/unified/findOneAndReplace-hint.json rename to spec/crud/unified/findOneAndReplace-hint.json diff --git a/src/test/spec/json/crud/unified/findOneAndReplace-hint.yml b/spec/crud/unified/findOneAndReplace-hint.yml similarity index 100% rename from src/test/spec/json/crud/unified/findOneAndReplace-hint.yml rename to spec/crud/unified/findOneAndReplace-hint.yml diff --git a/src/test/spec/json/crud/unified/findOneAndReplace-let.json b/spec/crud/unified/findOneAndReplace-let.json similarity index 100% rename from src/test/spec/json/crud/unified/findOneAndReplace-let.json rename to spec/crud/unified/findOneAndReplace-let.json diff --git a/src/test/spec/json/crud/unified/findOneAndReplace-let.yml b/spec/crud/unified/findOneAndReplace-let.yml similarity index 100% rename from src/test/spec/json/crud/unified/findOneAndReplace-let.yml rename to spec/crud/unified/findOneAndReplace-let.yml diff --git a/src/test/spec/json/crud/unified/findOneAndReplace-upsert.json b/spec/crud/unified/findOneAndReplace-upsert.json similarity index 100% rename from src/test/spec/json/crud/unified/findOneAndReplace-upsert.json rename to spec/crud/unified/findOneAndReplace-upsert.json diff --git a/src/test/spec/json/crud/unified/findOneAndReplace-upsert.yml b/spec/crud/unified/findOneAndReplace-upsert.yml similarity index 100% rename from src/test/spec/json/crud/unified/findOneAndReplace-upsert.yml rename to spec/crud/unified/findOneAndReplace-upsert.yml diff --git a/src/test/spec/json/crud/unified/findOneAndReplace.json b/spec/crud/unified/findOneAndReplace.json similarity index 100% rename from src/test/spec/json/crud/unified/findOneAndReplace.json rename to spec/crud/unified/findOneAndReplace.json diff --git a/src/test/spec/json/crud/unified/findOneAndReplace.yml b/spec/crud/unified/findOneAndReplace.yml similarity index 100% rename from src/test/spec/json/crud/unified/findOneAndReplace.yml rename to spec/crud/unified/findOneAndReplace.yml diff --git a/src/test/spec/json/crud/unified/findOneAndUpdate-arrayFilters.json b/spec/crud/unified/findOneAndUpdate-arrayFilters.json similarity index 100% rename from src/test/spec/json/crud/unified/findOneAndUpdate-arrayFilters.json rename to spec/crud/unified/findOneAndUpdate-arrayFilters.json diff --git a/src/test/spec/json/crud/unified/findOneAndUpdate-arrayFilters.yml b/spec/crud/unified/findOneAndUpdate-arrayFilters.yml similarity index 100% rename from src/test/spec/json/crud/unified/findOneAndUpdate-arrayFilters.yml rename to spec/crud/unified/findOneAndUpdate-arrayFilters.yml diff --git a/src/test/spec/json/crud/unified/findOneAndUpdate-collation.json b/spec/crud/unified/findOneAndUpdate-collation.json similarity index 100% rename from src/test/spec/json/crud/unified/findOneAndUpdate-collation.json rename to spec/crud/unified/findOneAndUpdate-collation.json diff --git a/src/test/spec/json/crud/unified/findOneAndUpdate-collation.yml b/spec/crud/unified/findOneAndUpdate-collation.yml similarity index 100% rename from src/test/spec/json/crud/unified/findOneAndUpdate-collation.yml rename to spec/crud/unified/findOneAndUpdate-collation.yml diff --git a/src/test/spec/json/crud/unified/findOneAndUpdate-comment.json b/spec/crud/unified/findOneAndUpdate-comment.json similarity index 100% rename from src/test/spec/json/crud/unified/findOneAndUpdate-comment.json rename to spec/crud/unified/findOneAndUpdate-comment.json diff --git a/src/test/spec/json/crud/unified/findOneAndUpdate-comment.yml b/spec/crud/unified/findOneAndUpdate-comment.yml similarity index 100% rename from src/test/spec/json/crud/unified/findOneAndUpdate-comment.yml rename to spec/crud/unified/findOneAndUpdate-comment.yml diff --git a/src/test/spec/json/crud/unified/findOneAndUpdate-dots_and_dollars.json b/spec/crud/unified/findOneAndUpdate-dots_and_dollars.json similarity index 100% rename from src/test/spec/json/crud/unified/findOneAndUpdate-dots_and_dollars.json rename to spec/crud/unified/findOneAndUpdate-dots_and_dollars.json diff --git a/src/test/spec/json/crud/unified/findOneAndUpdate-dots_and_dollars.yml b/spec/crud/unified/findOneAndUpdate-dots_and_dollars.yml similarity index 100% rename from src/test/spec/json/crud/unified/findOneAndUpdate-dots_and_dollars.yml rename to spec/crud/unified/findOneAndUpdate-dots_and_dollars.yml diff --git a/src/test/spec/json/crud/unified/findOneAndUpdate-errorResponse.json b/spec/crud/unified/findOneAndUpdate-errorResponse.json similarity index 100% rename from src/test/spec/json/crud/unified/findOneAndUpdate-errorResponse.json rename to spec/crud/unified/findOneAndUpdate-errorResponse.json diff --git a/src/test/spec/json/crud/unified/findOneAndUpdate-errorResponse.yml b/spec/crud/unified/findOneAndUpdate-errorResponse.yml similarity index 100% rename from src/test/spec/json/crud/unified/findOneAndUpdate-errorResponse.yml rename to spec/crud/unified/findOneAndUpdate-errorResponse.yml diff --git a/src/test/spec/json/crud/unified/findOneAndUpdate-hint-clientError.json b/spec/crud/unified/findOneAndUpdate-hint-clientError.json similarity index 100% rename from src/test/spec/json/crud/unified/findOneAndUpdate-hint-clientError.json rename to spec/crud/unified/findOneAndUpdate-hint-clientError.json diff --git a/src/test/spec/json/crud/unified/findOneAndUpdate-hint-clientError.yml b/spec/crud/unified/findOneAndUpdate-hint-clientError.yml similarity index 100% rename from src/test/spec/json/crud/unified/findOneAndUpdate-hint-clientError.yml rename to spec/crud/unified/findOneAndUpdate-hint-clientError.yml diff --git a/src/test/spec/json/crud/unified/findOneAndUpdate-hint-serverError.json b/spec/crud/unified/findOneAndUpdate-hint-serverError.json similarity index 100% rename from src/test/spec/json/crud/unified/findOneAndUpdate-hint-serverError.json rename to spec/crud/unified/findOneAndUpdate-hint-serverError.json diff --git a/src/test/spec/json/crud/unified/findOneAndUpdate-hint-serverError.yml b/spec/crud/unified/findOneAndUpdate-hint-serverError.yml similarity index 100% rename from src/test/spec/json/crud/unified/findOneAndUpdate-hint-serverError.yml rename to spec/crud/unified/findOneAndUpdate-hint-serverError.yml diff --git a/src/test/spec/json/crud/unified/findOneAndUpdate-hint-unacknowledged.json b/spec/crud/unified/findOneAndUpdate-hint-unacknowledged.json similarity index 100% rename from src/test/spec/json/crud/unified/findOneAndUpdate-hint-unacknowledged.json rename to spec/crud/unified/findOneAndUpdate-hint-unacknowledged.json diff --git a/src/test/spec/json/crud/unified/findOneAndUpdate-hint-unacknowledged.yml b/spec/crud/unified/findOneAndUpdate-hint-unacknowledged.yml similarity index 100% rename from src/test/spec/json/crud/unified/findOneAndUpdate-hint-unacknowledged.yml rename to spec/crud/unified/findOneAndUpdate-hint-unacknowledged.yml diff --git a/src/test/spec/json/crud/unified/findOneAndUpdate-hint.json b/spec/crud/unified/findOneAndUpdate-hint.json similarity index 100% rename from src/test/spec/json/crud/unified/findOneAndUpdate-hint.json rename to spec/crud/unified/findOneAndUpdate-hint.json diff --git a/src/test/spec/json/crud/unified/findOneAndUpdate-hint.yml b/spec/crud/unified/findOneAndUpdate-hint.yml similarity index 100% rename from src/test/spec/json/crud/unified/findOneAndUpdate-hint.yml rename to spec/crud/unified/findOneAndUpdate-hint.yml diff --git a/src/test/spec/json/crud/unified/findOneAndUpdate-let.json b/spec/crud/unified/findOneAndUpdate-let.json similarity index 100% rename from src/test/spec/json/crud/unified/findOneAndUpdate-let.json rename to spec/crud/unified/findOneAndUpdate-let.json diff --git a/src/test/spec/json/crud/unified/findOneAndUpdate-let.yml b/spec/crud/unified/findOneAndUpdate-let.yml similarity index 100% rename from src/test/spec/json/crud/unified/findOneAndUpdate-let.yml rename to spec/crud/unified/findOneAndUpdate-let.yml diff --git a/src/test/spec/json/crud/unified/findOneAndUpdate-pipeline.json b/spec/crud/unified/findOneAndUpdate-pipeline.json similarity index 100% rename from src/test/spec/json/crud/unified/findOneAndUpdate-pipeline.json rename to spec/crud/unified/findOneAndUpdate-pipeline.json diff --git a/src/test/spec/json/crud/unified/findOneAndUpdate-pipeline.yml b/spec/crud/unified/findOneAndUpdate-pipeline.yml similarity index 100% rename from src/test/spec/json/crud/unified/findOneAndUpdate-pipeline.yml rename to spec/crud/unified/findOneAndUpdate-pipeline.yml diff --git a/src/test/spec/json/crud/unified/findOneAndUpdate.json b/spec/crud/unified/findOneAndUpdate.json similarity index 100% rename from src/test/spec/json/crud/unified/findOneAndUpdate.json rename to spec/crud/unified/findOneAndUpdate.json diff --git a/src/test/spec/json/crud/unified/findOneAndUpdate.yml b/spec/crud/unified/findOneAndUpdate.yml similarity index 100% rename from src/test/spec/json/crud/unified/findOneAndUpdate.yml rename to spec/crud/unified/findOneAndUpdate.yml diff --git a/src/test/spec/json/crud/unified/insertMany-comment.json b/spec/crud/unified/insertMany-comment.json similarity index 100% rename from src/test/spec/json/crud/unified/insertMany-comment.json rename to spec/crud/unified/insertMany-comment.json diff --git a/src/test/spec/json/crud/unified/insertMany-comment.yml b/spec/crud/unified/insertMany-comment.yml similarity index 100% rename from src/test/spec/json/crud/unified/insertMany-comment.yml rename to spec/crud/unified/insertMany-comment.yml diff --git a/src/test/spec/json/crud/unified/insertMany-dots_and_dollars.json b/spec/crud/unified/insertMany-dots_and_dollars.json similarity index 100% rename from src/test/spec/json/crud/unified/insertMany-dots_and_dollars.json rename to spec/crud/unified/insertMany-dots_and_dollars.json diff --git a/src/test/spec/json/crud/unified/insertMany-dots_and_dollars.yml b/spec/crud/unified/insertMany-dots_and_dollars.yml similarity index 100% rename from src/test/spec/json/crud/unified/insertMany-dots_and_dollars.yml rename to spec/crud/unified/insertMany-dots_and_dollars.yml diff --git a/src/test/spec/json/crud/unified/insertMany.json b/spec/crud/unified/insertMany.json similarity index 100% rename from src/test/spec/json/crud/unified/insertMany.json rename to spec/crud/unified/insertMany.json diff --git a/src/test/spec/json/crud/unified/insertMany.yml b/spec/crud/unified/insertMany.yml similarity index 100% rename from src/test/spec/json/crud/unified/insertMany.yml rename to spec/crud/unified/insertMany.yml diff --git a/src/test/spec/json/crud/unified/insertOne-comment.json b/spec/crud/unified/insertOne-comment.json similarity index 100% rename from src/test/spec/json/crud/unified/insertOne-comment.json rename to spec/crud/unified/insertOne-comment.json diff --git a/src/test/spec/json/crud/unified/insertOne-comment.yml b/spec/crud/unified/insertOne-comment.yml similarity index 100% rename from src/test/spec/json/crud/unified/insertOne-comment.yml rename to spec/crud/unified/insertOne-comment.yml diff --git a/src/test/spec/json/crud/unified/insertOne-dots_and_dollars.json b/spec/crud/unified/insertOne-dots_and_dollars.json similarity index 100% rename from src/test/spec/json/crud/unified/insertOne-dots_and_dollars.json rename to spec/crud/unified/insertOne-dots_and_dollars.json diff --git a/src/test/spec/json/crud/unified/insertOne-dots_and_dollars.yml b/spec/crud/unified/insertOne-dots_and_dollars.yml similarity index 100% rename from src/test/spec/json/crud/unified/insertOne-dots_and_dollars.yml rename to spec/crud/unified/insertOne-dots_and_dollars.yml diff --git a/src/test/spec/json/crud/unified/insertOne-errorResponse.json b/spec/crud/unified/insertOne-errorResponse.json similarity index 100% rename from src/test/spec/json/crud/unified/insertOne-errorResponse.json rename to spec/crud/unified/insertOne-errorResponse.json diff --git a/src/test/spec/json/crud/unified/insertOne-errorResponse.yml b/spec/crud/unified/insertOne-errorResponse.yml similarity index 100% rename from src/test/spec/json/crud/unified/insertOne-errorResponse.yml rename to spec/crud/unified/insertOne-errorResponse.yml diff --git a/src/test/spec/json/crud/unified/insertOne.json b/spec/crud/unified/insertOne.json similarity index 100% rename from src/test/spec/json/crud/unified/insertOne.json rename to spec/crud/unified/insertOne.json diff --git a/src/test/spec/json/crud/unified/insertOne.yml b/spec/crud/unified/insertOne.yml similarity index 100% rename from src/test/spec/json/crud/unified/insertOne.yml rename to spec/crud/unified/insertOne.yml diff --git a/src/test/spec/json/crud/unified/replaceOne-collation.json b/spec/crud/unified/replaceOne-collation.json similarity index 100% rename from src/test/spec/json/crud/unified/replaceOne-collation.json rename to spec/crud/unified/replaceOne-collation.json diff --git a/src/test/spec/json/crud/unified/replaceOne-collation.yml b/spec/crud/unified/replaceOne-collation.yml similarity index 100% rename from src/test/spec/json/crud/unified/replaceOne-collation.yml rename to spec/crud/unified/replaceOne-collation.yml diff --git a/src/test/spec/json/crud/unified/replaceOne-comment.json b/spec/crud/unified/replaceOne-comment.json similarity index 100% rename from src/test/spec/json/crud/unified/replaceOne-comment.json rename to spec/crud/unified/replaceOne-comment.json diff --git a/src/test/spec/json/crud/unified/replaceOne-comment.yml b/spec/crud/unified/replaceOne-comment.yml similarity index 100% rename from src/test/spec/json/crud/unified/replaceOne-comment.yml rename to spec/crud/unified/replaceOne-comment.yml diff --git a/src/test/spec/json/crud/unified/replaceOne-dots_and_dollars.json b/spec/crud/unified/replaceOne-dots_and_dollars.json similarity index 100% rename from src/test/spec/json/crud/unified/replaceOne-dots_and_dollars.json rename to spec/crud/unified/replaceOne-dots_and_dollars.json diff --git a/src/test/spec/json/crud/unified/replaceOne-dots_and_dollars.yml b/spec/crud/unified/replaceOne-dots_and_dollars.yml similarity index 100% rename from src/test/spec/json/crud/unified/replaceOne-dots_and_dollars.yml rename to spec/crud/unified/replaceOne-dots_and_dollars.yml diff --git a/src/test/spec/json/crud/unified/replaceOne-hint-unacknowledged.json b/spec/crud/unified/replaceOne-hint-unacknowledged.json similarity index 100% rename from src/test/spec/json/crud/unified/replaceOne-hint-unacknowledged.json rename to spec/crud/unified/replaceOne-hint-unacknowledged.json diff --git a/src/test/spec/json/crud/unified/replaceOne-hint-unacknowledged.yml b/spec/crud/unified/replaceOne-hint-unacknowledged.yml similarity index 100% rename from src/test/spec/json/crud/unified/replaceOne-hint-unacknowledged.yml rename to spec/crud/unified/replaceOne-hint-unacknowledged.yml diff --git a/src/test/spec/json/crud/unified/replaceOne-hint.json b/spec/crud/unified/replaceOne-hint.json similarity index 100% rename from src/test/spec/json/crud/unified/replaceOne-hint.json rename to spec/crud/unified/replaceOne-hint.json diff --git a/src/test/spec/json/crud/unified/replaceOne-hint.yml b/spec/crud/unified/replaceOne-hint.yml similarity index 100% rename from src/test/spec/json/crud/unified/replaceOne-hint.yml rename to spec/crud/unified/replaceOne-hint.yml diff --git a/src/test/spec/json/crud/unified/replaceOne-let.json b/spec/crud/unified/replaceOne-let.json similarity index 100% rename from src/test/spec/json/crud/unified/replaceOne-let.json rename to spec/crud/unified/replaceOne-let.json diff --git a/src/test/spec/json/crud/unified/replaceOne-let.yml b/spec/crud/unified/replaceOne-let.yml similarity index 100% rename from src/test/spec/json/crud/unified/replaceOne-let.yml rename to spec/crud/unified/replaceOne-let.yml diff --git a/src/test/spec/json/crud/unified/replaceOne-sort.json b/spec/crud/unified/replaceOne-sort.json similarity index 100% rename from src/test/spec/json/crud/unified/replaceOne-sort.json rename to spec/crud/unified/replaceOne-sort.json diff --git a/src/test/spec/json/crud/unified/replaceOne-sort.yml b/spec/crud/unified/replaceOne-sort.yml similarity index 100% rename from src/test/spec/json/crud/unified/replaceOne-sort.yml rename to spec/crud/unified/replaceOne-sort.yml diff --git a/src/test/spec/json/crud/unified/replaceOne-validation.json b/spec/crud/unified/replaceOne-validation.json similarity index 100% rename from src/test/spec/json/crud/unified/replaceOne-validation.json rename to spec/crud/unified/replaceOne-validation.json diff --git a/src/test/spec/json/crud/unified/replaceOne-validation.yml b/spec/crud/unified/replaceOne-validation.yml similarity index 100% rename from src/test/spec/json/crud/unified/replaceOne-validation.yml rename to spec/crud/unified/replaceOne-validation.yml diff --git a/src/test/spec/json/crud/unified/replaceOne.json b/spec/crud/unified/replaceOne.json similarity index 100% rename from src/test/spec/json/crud/unified/replaceOne.json rename to spec/crud/unified/replaceOne.json diff --git a/src/test/spec/json/crud/unified/replaceOne.yml b/spec/crud/unified/replaceOne.yml similarity index 100% rename from src/test/spec/json/crud/unified/replaceOne.yml rename to spec/crud/unified/replaceOne.yml diff --git a/src/test/spec/json/crud/unified/updateMany-arrayFilters.json b/spec/crud/unified/updateMany-arrayFilters.json similarity index 100% rename from src/test/spec/json/crud/unified/updateMany-arrayFilters.json rename to spec/crud/unified/updateMany-arrayFilters.json diff --git a/src/test/spec/json/crud/unified/updateMany-arrayFilters.yml b/spec/crud/unified/updateMany-arrayFilters.yml similarity index 100% rename from src/test/spec/json/crud/unified/updateMany-arrayFilters.yml rename to spec/crud/unified/updateMany-arrayFilters.yml diff --git a/src/test/spec/json/crud/unified/updateMany-collation.json b/spec/crud/unified/updateMany-collation.json similarity index 100% rename from src/test/spec/json/crud/unified/updateMany-collation.json rename to spec/crud/unified/updateMany-collation.json diff --git a/src/test/spec/json/crud/unified/updateMany-collation.yml b/spec/crud/unified/updateMany-collation.yml similarity index 100% rename from src/test/spec/json/crud/unified/updateMany-collation.yml rename to spec/crud/unified/updateMany-collation.yml diff --git a/src/test/spec/json/crud/unified/updateMany-comment.json b/spec/crud/unified/updateMany-comment.json similarity index 100% rename from src/test/spec/json/crud/unified/updateMany-comment.json rename to spec/crud/unified/updateMany-comment.json diff --git a/src/test/spec/json/crud/unified/updateMany-comment.yml b/spec/crud/unified/updateMany-comment.yml similarity index 100% rename from src/test/spec/json/crud/unified/updateMany-comment.yml rename to spec/crud/unified/updateMany-comment.yml diff --git a/src/test/spec/json/crud/unified/updateMany-dots_and_dollars.json b/spec/crud/unified/updateMany-dots_and_dollars.json similarity index 100% rename from src/test/spec/json/crud/unified/updateMany-dots_and_dollars.json rename to spec/crud/unified/updateMany-dots_and_dollars.json diff --git a/src/test/spec/json/crud/unified/updateMany-dots_and_dollars.yml b/spec/crud/unified/updateMany-dots_and_dollars.yml similarity index 100% rename from src/test/spec/json/crud/unified/updateMany-dots_and_dollars.yml rename to spec/crud/unified/updateMany-dots_and_dollars.yml diff --git a/src/test/spec/json/crud/unified/updateMany-hint-clientError.json b/spec/crud/unified/updateMany-hint-clientError.json similarity index 100% rename from src/test/spec/json/crud/unified/updateMany-hint-clientError.json rename to spec/crud/unified/updateMany-hint-clientError.json diff --git a/src/test/spec/json/crud/unified/updateMany-hint-clientError.yml b/spec/crud/unified/updateMany-hint-clientError.yml similarity index 100% rename from src/test/spec/json/crud/unified/updateMany-hint-clientError.yml rename to spec/crud/unified/updateMany-hint-clientError.yml diff --git a/src/test/spec/json/crud/unified/updateMany-hint-serverError.json b/spec/crud/unified/updateMany-hint-serverError.json similarity index 100% rename from src/test/spec/json/crud/unified/updateMany-hint-serverError.json rename to spec/crud/unified/updateMany-hint-serverError.json diff --git a/src/test/spec/json/crud/unified/updateMany-hint-serverError.yml b/spec/crud/unified/updateMany-hint-serverError.yml similarity index 100% rename from src/test/spec/json/crud/unified/updateMany-hint-serverError.yml rename to spec/crud/unified/updateMany-hint-serverError.yml diff --git a/src/test/spec/json/crud/unified/updateMany-hint-unacknowledged.json b/spec/crud/unified/updateMany-hint-unacknowledged.json similarity index 100% rename from src/test/spec/json/crud/unified/updateMany-hint-unacknowledged.json rename to spec/crud/unified/updateMany-hint-unacknowledged.json diff --git a/src/test/spec/json/crud/unified/updateMany-hint-unacknowledged.yml b/spec/crud/unified/updateMany-hint-unacknowledged.yml similarity index 100% rename from src/test/spec/json/crud/unified/updateMany-hint-unacknowledged.yml rename to spec/crud/unified/updateMany-hint-unacknowledged.yml diff --git a/src/test/spec/json/crud/unified/updateMany-hint.json b/spec/crud/unified/updateMany-hint.json similarity index 100% rename from src/test/spec/json/crud/unified/updateMany-hint.json rename to spec/crud/unified/updateMany-hint.json diff --git a/src/test/spec/json/crud/unified/updateMany-hint.yml b/spec/crud/unified/updateMany-hint.yml similarity index 100% rename from src/test/spec/json/crud/unified/updateMany-hint.yml rename to spec/crud/unified/updateMany-hint.yml diff --git a/src/test/spec/json/crud/unified/updateMany-let.json b/spec/crud/unified/updateMany-let.json similarity index 100% rename from src/test/spec/json/crud/unified/updateMany-let.json rename to spec/crud/unified/updateMany-let.json diff --git a/src/test/spec/json/crud/unified/updateMany-let.yml b/spec/crud/unified/updateMany-let.yml similarity index 100% rename from src/test/spec/json/crud/unified/updateMany-let.yml rename to spec/crud/unified/updateMany-let.yml diff --git a/src/test/spec/json/crud/unified/updateMany-pipeline.json b/spec/crud/unified/updateMany-pipeline.json similarity index 100% rename from src/test/spec/json/crud/unified/updateMany-pipeline.json rename to spec/crud/unified/updateMany-pipeline.json diff --git a/src/test/spec/json/crud/unified/updateMany-pipeline.yml b/spec/crud/unified/updateMany-pipeline.yml similarity index 100% rename from src/test/spec/json/crud/unified/updateMany-pipeline.yml rename to spec/crud/unified/updateMany-pipeline.yml diff --git a/src/test/spec/json/crud/unified/updateMany-validation.json b/spec/crud/unified/updateMany-validation.json similarity index 100% rename from src/test/spec/json/crud/unified/updateMany-validation.json rename to spec/crud/unified/updateMany-validation.json diff --git a/src/test/spec/json/crud/unified/updateMany-validation.yml b/spec/crud/unified/updateMany-validation.yml similarity index 100% rename from src/test/spec/json/crud/unified/updateMany-validation.yml rename to spec/crud/unified/updateMany-validation.yml diff --git a/src/test/spec/json/crud/unified/updateMany.json b/spec/crud/unified/updateMany.json similarity index 100% rename from src/test/spec/json/crud/unified/updateMany.json rename to spec/crud/unified/updateMany.json diff --git a/src/test/spec/json/crud/unified/updateMany.yml b/spec/crud/unified/updateMany.yml similarity index 100% rename from src/test/spec/json/crud/unified/updateMany.yml rename to spec/crud/unified/updateMany.yml diff --git a/src/test/spec/json/crud/unified/updateOne-arrayFilters.json b/spec/crud/unified/updateOne-arrayFilters.json similarity index 100% rename from src/test/spec/json/crud/unified/updateOne-arrayFilters.json rename to spec/crud/unified/updateOne-arrayFilters.json diff --git a/src/test/spec/json/crud/unified/updateOne-arrayFilters.yml b/spec/crud/unified/updateOne-arrayFilters.yml similarity index 100% rename from src/test/spec/json/crud/unified/updateOne-arrayFilters.yml rename to spec/crud/unified/updateOne-arrayFilters.yml diff --git a/src/test/spec/json/crud/unified/updateOne-collation.json b/spec/crud/unified/updateOne-collation.json similarity index 100% rename from src/test/spec/json/crud/unified/updateOne-collation.json rename to spec/crud/unified/updateOne-collation.json diff --git a/src/test/spec/json/crud/unified/updateOne-collation.yml b/spec/crud/unified/updateOne-collation.yml similarity index 100% rename from src/test/spec/json/crud/unified/updateOne-collation.yml rename to spec/crud/unified/updateOne-collation.yml diff --git a/src/test/spec/json/crud/unified/updateOne-comment.json b/spec/crud/unified/updateOne-comment.json similarity index 100% rename from src/test/spec/json/crud/unified/updateOne-comment.json rename to spec/crud/unified/updateOne-comment.json diff --git a/src/test/spec/json/crud/unified/updateOne-comment.yml b/spec/crud/unified/updateOne-comment.yml similarity index 100% rename from src/test/spec/json/crud/unified/updateOne-comment.yml rename to spec/crud/unified/updateOne-comment.yml diff --git a/src/test/spec/json/crud/unified/updateOne-dots_and_dollars.json b/spec/crud/unified/updateOne-dots_and_dollars.json similarity index 100% rename from src/test/spec/json/crud/unified/updateOne-dots_and_dollars.json rename to spec/crud/unified/updateOne-dots_and_dollars.json diff --git a/src/test/spec/json/crud/unified/updateOne-dots_and_dollars.yml b/spec/crud/unified/updateOne-dots_and_dollars.yml similarity index 100% rename from src/test/spec/json/crud/unified/updateOne-dots_and_dollars.yml rename to spec/crud/unified/updateOne-dots_and_dollars.yml diff --git a/src/test/spec/json/crud/unified/updateOne-errorResponse.json b/spec/crud/unified/updateOne-errorResponse.json similarity index 100% rename from src/test/spec/json/crud/unified/updateOne-errorResponse.json rename to spec/crud/unified/updateOne-errorResponse.json diff --git a/src/test/spec/json/crud/unified/updateOne-errorResponse.yml b/spec/crud/unified/updateOne-errorResponse.yml similarity index 100% rename from src/test/spec/json/crud/unified/updateOne-errorResponse.yml rename to spec/crud/unified/updateOne-errorResponse.yml diff --git a/src/test/spec/json/crud/unified/updateOne-hint-clientError.json b/spec/crud/unified/updateOne-hint-clientError.json similarity index 100% rename from src/test/spec/json/crud/unified/updateOne-hint-clientError.json rename to spec/crud/unified/updateOne-hint-clientError.json diff --git a/src/test/spec/json/crud/unified/updateOne-hint-clientError.yml b/spec/crud/unified/updateOne-hint-clientError.yml similarity index 100% rename from src/test/spec/json/crud/unified/updateOne-hint-clientError.yml rename to spec/crud/unified/updateOne-hint-clientError.yml diff --git a/src/test/spec/json/crud/unified/updateOne-hint-serverError.json b/spec/crud/unified/updateOne-hint-serverError.json similarity index 100% rename from src/test/spec/json/crud/unified/updateOne-hint-serverError.json rename to spec/crud/unified/updateOne-hint-serverError.json diff --git a/src/test/spec/json/crud/unified/updateOne-hint-serverError.yml b/spec/crud/unified/updateOne-hint-serverError.yml similarity index 100% rename from src/test/spec/json/crud/unified/updateOne-hint-serverError.yml rename to spec/crud/unified/updateOne-hint-serverError.yml diff --git a/src/test/spec/json/crud/unified/updateOne-hint-unacknowledged.json b/spec/crud/unified/updateOne-hint-unacknowledged.json similarity index 100% rename from src/test/spec/json/crud/unified/updateOne-hint-unacknowledged.json rename to spec/crud/unified/updateOne-hint-unacknowledged.json diff --git a/src/test/spec/json/crud/unified/updateOne-hint-unacknowledged.yml b/spec/crud/unified/updateOne-hint-unacknowledged.yml similarity index 100% rename from src/test/spec/json/crud/unified/updateOne-hint-unacknowledged.yml rename to spec/crud/unified/updateOne-hint-unacknowledged.yml diff --git a/src/test/spec/json/crud/unified/updateOne-hint.json b/spec/crud/unified/updateOne-hint.json similarity index 100% rename from src/test/spec/json/crud/unified/updateOne-hint.json rename to spec/crud/unified/updateOne-hint.json diff --git a/src/test/spec/json/crud/unified/updateOne-hint.yml b/spec/crud/unified/updateOne-hint.yml similarity index 100% rename from src/test/spec/json/crud/unified/updateOne-hint.yml rename to spec/crud/unified/updateOne-hint.yml diff --git a/src/test/spec/json/crud/unified/updateOne-let.json b/spec/crud/unified/updateOne-let.json similarity index 100% rename from src/test/spec/json/crud/unified/updateOne-let.json rename to spec/crud/unified/updateOne-let.json diff --git a/src/test/spec/json/crud/unified/updateOne-let.yml b/spec/crud/unified/updateOne-let.yml similarity index 100% rename from src/test/spec/json/crud/unified/updateOne-let.yml rename to spec/crud/unified/updateOne-let.yml diff --git a/src/test/spec/json/crud/unified/updateOne-pipeline.json b/spec/crud/unified/updateOne-pipeline.json similarity index 100% rename from src/test/spec/json/crud/unified/updateOne-pipeline.json rename to spec/crud/unified/updateOne-pipeline.json diff --git a/src/test/spec/json/crud/unified/updateOne-pipeline.yml b/spec/crud/unified/updateOne-pipeline.yml similarity index 100% rename from src/test/spec/json/crud/unified/updateOne-pipeline.yml rename to spec/crud/unified/updateOne-pipeline.yml diff --git a/src/test/spec/json/crud/unified/updateOne-sort.json b/spec/crud/unified/updateOne-sort.json similarity index 100% rename from src/test/spec/json/crud/unified/updateOne-sort.json rename to spec/crud/unified/updateOne-sort.json diff --git a/src/test/spec/json/crud/unified/updateOne-sort.yml b/spec/crud/unified/updateOne-sort.yml similarity index 100% rename from src/test/spec/json/crud/unified/updateOne-sort.yml rename to spec/crud/unified/updateOne-sort.yml diff --git a/src/test/spec/json/crud/unified/updateOne-validation.json b/spec/crud/unified/updateOne-validation.json similarity index 100% rename from src/test/spec/json/crud/unified/updateOne-validation.json rename to spec/crud/unified/updateOne-validation.json diff --git a/src/test/spec/json/crud/unified/updateOne-validation.yml b/spec/crud/unified/updateOne-validation.yml similarity index 100% rename from src/test/spec/json/crud/unified/updateOne-validation.yml rename to spec/crud/unified/updateOne-validation.yml diff --git a/src/test/spec/json/crud/unified/updateOne.json b/spec/crud/unified/updateOne.json similarity index 100% rename from src/test/spec/json/crud/unified/updateOne.json rename to spec/crud/unified/updateOne.json diff --git a/src/test/spec/json/crud/unified/updateOne.yml b/spec/crud/unified/updateOne.yml similarity index 100% rename from src/test/spec/json/crud/unified/updateOne.yml rename to spec/crud/unified/updateOne.yml diff --git a/src/test/spec/json/gridfs/README.md b/spec/gridfs/README.md similarity index 100% rename from src/test/spec/json/gridfs/README.md rename to spec/gridfs/README.md diff --git a/src/test/spec/json/gridfs/delete.json b/spec/gridfs/delete.json similarity index 100% rename from src/test/spec/json/gridfs/delete.json rename to spec/gridfs/delete.json diff --git a/src/test/spec/json/gridfs/delete.yml b/spec/gridfs/delete.yml similarity index 100% rename from src/test/spec/json/gridfs/delete.yml rename to spec/gridfs/delete.yml diff --git a/src/test/spec/json/gridfs/deleteByName.json b/spec/gridfs/deleteByName.json similarity index 100% rename from src/test/spec/json/gridfs/deleteByName.json rename to spec/gridfs/deleteByName.json diff --git a/src/test/spec/json/gridfs/deleteByName.yml b/spec/gridfs/deleteByName.yml similarity index 100% rename from src/test/spec/json/gridfs/deleteByName.yml rename to spec/gridfs/deleteByName.yml diff --git a/src/test/spec/json/gridfs/download.json b/spec/gridfs/download.json similarity index 100% rename from src/test/spec/json/gridfs/download.json rename to spec/gridfs/download.json diff --git a/src/test/spec/json/gridfs/download.yml b/spec/gridfs/download.yml similarity index 100% rename from src/test/spec/json/gridfs/download.yml rename to spec/gridfs/download.yml diff --git a/src/test/spec/json/gridfs/downloadByName.json b/spec/gridfs/downloadByName.json similarity index 100% rename from src/test/spec/json/gridfs/downloadByName.json rename to spec/gridfs/downloadByName.json diff --git a/src/test/spec/json/gridfs/downloadByName.yml b/spec/gridfs/downloadByName.yml similarity index 100% rename from src/test/spec/json/gridfs/downloadByName.yml rename to spec/gridfs/downloadByName.yml diff --git a/src/test/spec/json/gridfs/rename.json b/spec/gridfs/rename.json similarity index 100% rename from src/test/spec/json/gridfs/rename.json rename to spec/gridfs/rename.json diff --git a/src/test/spec/json/gridfs/rename.yml b/spec/gridfs/rename.yml similarity index 100% rename from src/test/spec/json/gridfs/rename.yml rename to spec/gridfs/rename.yml diff --git a/src/test/spec/json/gridfs/renameByName.json b/spec/gridfs/renameByName.json similarity index 100% rename from src/test/spec/json/gridfs/renameByName.json rename to spec/gridfs/renameByName.json diff --git a/src/test/spec/json/gridfs/renameByName.yml b/spec/gridfs/renameByName.yml similarity index 100% rename from src/test/spec/json/gridfs/renameByName.yml rename to spec/gridfs/renameByName.yml diff --git a/src/test/spec/json/gridfs/upload-disableMD5.json b/spec/gridfs/upload-disableMD5.json similarity index 100% rename from src/test/spec/json/gridfs/upload-disableMD5.json rename to spec/gridfs/upload-disableMD5.json diff --git a/src/test/spec/json/gridfs/upload-disableMD5.yml b/spec/gridfs/upload-disableMD5.yml similarity index 100% rename from src/test/spec/json/gridfs/upload-disableMD5.yml rename to spec/gridfs/upload-disableMD5.yml diff --git a/src/test/spec/json/gridfs/upload.json b/spec/gridfs/upload.json similarity index 100% rename from src/test/spec/json/gridfs/upload.json rename to spec/gridfs/upload.json diff --git a/src/test/spec/json/gridfs/upload.yml b/spec/gridfs/upload.yml similarity index 100% rename from src/test/spec/json/gridfs/upload.yml rename to spec/gridfs/upload.yml diff --git a/src/test/spec/json/index-management/README.md b/spec/index-management/README.md similarity index 100% rename from src/test/spec/json/index-management/README.md rename to spec/index-management/README.md diff --git a/src/test/spec/json/index-management/createSearchIndex.json b/spec/index-management/createSearchIndex.json similarity index 100% rename from src/test/spec/json/index-management/createSearchIndex.json rename to spec/index-management/createSearchIndex.json diff --git a/src/test/spec/json/index-management/createSearchIndex.yml b/spec/index-management/createSearchIndex.yml similarity index 100% rename from src/test/spec/json/index-management/createSearchIndex.yml rename to spec/index-management/createSearchIndex.yml diff --git a/src/test/spec/json/index-management/createSearchIndexes.json b/spec/index-management/createSearchIndexes.json similarity index 100% rename from src/test/spec/json/index-management/createSearchIndexes.json rename to spec/index-management/createSearchIndexes.json diff --git a/src/test/spec/json/index-management/createSearchIndexes.yml b/spec/index-management/createSearchIndexes.yml similarity index 100% rename from src/test/spec/json/index-management/createSearchIndexes.yml rename to spec/index-management/createSearchIndexes.yml diff --git a/src/test/spec/json/index-management/dropSearchIndex.json b/spec/index-management/dropSearchIndex.json similarity index 100% rename from src/test/spec/json/index-management/dropSearchIndex.json rename to spec/index-management/dropSearchIndex.json diff --git a/src/test/spec/json/index-management/dropSearchIndex.yml b/spec/index-management/dropSearchIndex.yml similarity index 100% rename from src/test/spec/json/index-management/dropSearchIndex.yml rename to spec/index-management/dropSearchIndex.yml diff --git a/src/test/spec/json/index-management/listSearchIndexes.json b/spec/index-management/listSearchIndexes.json similarity index 100% rename from src/test/spec/json/index-management/listSearchIndexes.json rename to spec/index-management/listSearchIndexes.json diff --git a/src/test/spec/json/index-management/listSearchIndexes.yml b/spec/index-management/listSearchIndexes.yml similarity index 100% rename from src/test/spec/json/index-management/listSearchIndexes.yml rename to spec/index-management/listSearchIndexes.yml diff --git a/src/test/spec/json/index-management/searchIndexIgnoresReadWriteConcern.json b/spec/index-management/searchIndexIgnoresReadWriteConcern.json similarity index 100% rename from src/test/spec/json/index-management/searchIndexIgnoresReadWriteConcern.json rename to spec/index-management/searchIndexIgnoresReadWriteConcern.json diff --git a/src/test/spec/json/index-management/searchIndexIgnoresReadWriteConcern.yml b/spec/index-management/searchIndexIgnoresReadWriteConcern.yml similarity index 100% rename from src/test/spec/json/index-management/searchIndexIgnoresReadWriteConcern.yml rename to spec/index-management/searchIndexIgnoresReadWriteConcern.yml diff --git a/src/test/spec/json/index-management/updateSearchIndex.json b/spec/index-management/updateSearchIndex.json similarity index 100% rename from src/test/spec/json/index-management/updateSearchIndex.json rename to spec/index-management/updateSearchIndex.json diff --git a/src/test/spec/json/index-management/updateSearchIndex.yml b/spec/index-management/updateSearchIndex.yml similarity index 100% rename from src/test/spec/json/index-management/updateSearchIndex.yml rename to spec/index-management/updateSearchIndex.yml diff --git a/src/test/spec/json/initial-dns-seedlist-discovery/README.md b/spec/initial-dns-seedlist-discovery/README.md similarity index 100% rename from src/test/spec/json/initial-dns-seedlist-discovery/README.md rename to spec/initial-dns-seedlist-discovery/README.md diff --git a/src/test/spec/json/initial-dns-seedlist-discovery/load-balanced/loadBalanced-directConnection.json b/spec/initial-dns-seedlist-discovery/load-balanced/loadBalanced-directConnection.json similarity index 100% rename from src/test/spec/json/initial-dns-seedlist-discovery/load-balanced/loadBalanced-directConnection.json rename to spec/initial-dns-seedlist-discovery/load-balanced/loadBalanced-directConnection.json diff --git a/src/test/spec/json/initial-dns-seedlist-discovery/load-balanced/loadBalanced-directConnection.yml b/spec/initial-dns-seedlist-discovery/load-balanced/loadBalanced-directConnection.yml similarity index 100% rename from src/test/spec/json/initial-dns-seedlist-discovery/load-balanced/loadBalanced-directConnection.yml rename to spec/initial-dns-seedlist-discovery/load-balanced/loadBalanced-directConnection.yml diff --git a/src/test/spec/json/initial-dns-seedlist-discovery/load-balanced/loadBalanced-no-results.json b/spec/initial-dns-seedlist-discovery/load-balanced/loadBalanced-no-results.json similarity index 100% rename from src/test/spec/json/initial-dns-seedlist-discovery/load-balanced/loadBalanced-no-results.json rename to spec/initial-dns-seedlist-discovery/load-balanced/loadBalanced-no-results.json diff --git a/src/test/spec/json/initial-dns-seedlist-discovery/load-balanced/loadBalanced-no-results.yml b/spec/initial-dns-seedlist-discovery/load-balanced/loadBalanced-no-results.yml similarity index 100% rename from src/test/spec/json/initial-dns-seedlist-discovery/load-balanced/loadBalanced-no-results.yml rename to spec/initial-dns-seedlist-discovery/load-balanced/loadBalanced-no-results.yml diff --git a/src/test/spec/json/initial-dns-seedlist-discovery/load-balanced/loadBalanced-replicaSet-errors.json b/spec/initial-dns-seedlist-discovery/load-balanced/loadBalanced-replicaSet-errors.json similarity index 100% rename from src/test/spec/json/initial-dns-seedlist-discovery/load-balanced/loadBalanced-replicaSet-errors.json rename to spec/initial-dns-seedlist-discovery/load-balanced/loadBalanced-replicaSet-errors.json diff --git a/src/test/spec/json/initial-dns-seedlist-discovery/load-balanced/loadBalanced-replicaSet-errors.yml b/spec/initial-dns-seedlist-discovery/load-balanced/loadBalanced-replicaSet-errors.yml similarity index 100% rename from src/test/spec/json/initial-dns-seedlist-discovery/load-balanced/loadBalanced-replicaSet-errors.yml rename to spec/initial-dns-seedlist-discovery/load-balanced/loadBalanced-replicaSet-errors.yml diff --git a/src/test/spec/json/initial-dns-seedlist-discovery/load-balanced/loadBalanced-true-multiple-hosts.json b/spec/initial-dns-seedlist-discovery/load-balanced/loadBalanced-true-multiple-hosts.json similarity index 100% rename from src/test/spec/json/initial-dns-seedlist-discovery/load-balanced/loadBalanced-true-multiple-hosts.json rename to spec/initial-dns-seedlist-discovery/load-balanced/loadBalanced-true-multiple-hosts.json diff --git a/src/test/spec/json/initial-dns-seedlist-discovery/load-balanced/loadBalanced-true-multiple-hosts.yml b/spec/initial-dns-seedlist-discovery/load-balanced/loadBalanced-true-multiple-hosts.yml similarity index 100% rename from src/test/spec/json/initial-dns-seedlist-discovery/load-balanced/loadBalanced-true-multiple-hosts.yml rename to spec/initial-dns-seedlist-discovery/load-balanced/loadBalanced-true-multiple-hosts.yml diff --git a/src/test/spec/json/initial-dns-seedlist-discovery/load-balanced/loadBalanced-true-txt.json b/spec/initial-dns-seedlist-discovery/load-balanced/loadBalanced-true-txt.json similarity index 100% rename from src/test/spec/json/initial-dns-seedlist-discovery/load-balanced/loadBalanced-true-txt.json rename to spec/initial-dns-seedlist-discovery/load-balanced/loadBalanced-true-txt.json diff --git a/src/test/spec/json/initial-dns-seedlist-discovery/load-balanced/loadBalanced-true-txt.yml b/spec/initial-dns-seedlist-discovery/load-balanced/loadBalanced-true-txt.yml similarity index 100% rename from src/test/spec/json/initial-dns-seedlist-discovery/load-balanced/loadBalanced-true-txt.yml rename to spec/initial-dns-seedlist-discovery/load-balanced/loadBalanced-true-txt.yml diff --git a/src/test/spec/json/initial-dns-seedlist-discovery/load-balanced/srvMaxHosts-conflicts_with_loadBalanced-true-txt.json b/spec/initial-dns-seedlist-discovery/load-balanced/srvMaxHosts-conflicts_with_loadBalanced-true-txt.json similarity index 100% rename from src/test/spec/json/initial-dns-seedlist-discovery/load-balanced/srvMaxHosts-conflicts_with_loadBalanced-true-txt.json rename to spec/initial-dns-seedlist-discovery/load-balanced/srvMaxHosts-conflicts_with_loadBalanced-true-txt.json diff --git a/src/test/spec/json/initial-dns-seedlist-discovery/load-balanced/srvMaxHosts-conflicts_with_loadBalanced-true-txt.yml b/spec/initial-dns-seedlist-discovery/load-balanced/srvMaxHosts-conflicts_with_loadBalanced-true-txt.yml similarity index 100% rename from src/test/spec/json/initial-dns-seedlist-discovery/load-balanced/srvMaxHosts-conflicts_with_loadBalanced-true-txt.yml rename to spec/initial-dns-seedlist-discovery/load-balanced/srvMaxHosts-conflicts_with_loadBalanced-true-txt.yml diff --git a/src/test/spec/json/initial-dns-seedlist-discovery/load-balanced/srvMaxHosts-conflicts_with_loadBalanced-true.json b/spec/initial-dns-seedlist-discovery/load-balanced/srvMaxHosts-conflicts_with_loadBalanced-true.json similarity index 100% rename from src/test/spec/json/initial-dns-seedlist-discovery/load-balanced/srvMaxHosts-conflicts_with_loadBalanced-true.json rename to spec/initial-dns-seedlist-discovery/load-balanced/srvMaxHosts-conflicts_with_loadBalanced-true.json diff --git a/src/test/spec/json/initial-dns-seedlist-discovery/load-balanced/srvMaxHosts-conflicts_with_loadBalanced-true.yml b/spec/initial-dns-seedlist-discovery/load-balanced/srvMaxHosts-conflicts_with_loadBalanced-true.yml similarity index 100% rename from src/test/spec/json/initial-dns-seedlist-discovery/load-balanced/srvMaxHosts-conflicts_with_loadBalanced-true.yml rename to spec/initial-dns-seedlist-discovery/load-balanced/srvMaxHosts-conflicts_with_loadBalanced-true.yml diff --git a/src/test/spec/json/initial-dns-seedlist-discovery/load-balanced/srvMaxHosts-zero-txt.json b/spec/initial-dns-seedlist-discovery/load-balanced/srvMaxHosts-zero-txt.json similarity index 100% rename from src/test/spec/json/initial-dns-seedlist-discovery/load-balanced/srvMaxHosts-zero-txt.json rename to spec/initial-dns-seedlist-discovery/load-balanced/srvMaxHosts-zero-txt.json diff --git a/src/test/spec/json/initial-dns-seedlist-discovery/load-balanced/srvMaxHosts-zero-txt.yml b/spec/initial-dns-seedlist-discovery/load-balanced/srvMaxHosts-zero-txt.yml similarity index 100% rename from src/test/spec/json/initial-dns-seedlist-discovery/load-balanced/srvMaxHosts-zero-txt.yml rename to spec/initial-dns-seedlist-discovery/load-balanced/srvMaxHosts-zero-txt.yml diff --git a/src/test/spec/json/initial-dns-seedlist-discovery/load-balanced/srvMaxHosts-zero.json b/spec/initial-dns-seedlist-discovery/load-balanced/srvMaxHosts-zero.json similarity index 100% rename from src/test/spec/json/initial-dns-seedlist-discovery/load-balanced/srvMaxHosts-zero.json rename to spec/initial-dns-seedlist-discovery/load-balanced/srvMaxHosts-zero.json diff --git a/src/test/spec/json/initial-dns-seedlist-discovery/load-balanced/srvMaxHosts-zero.yml b/spec/initial-dns-seedlist-discovery/load-balanced/srvMaxHosts-zero.yml similarity index 100% rename from src/test/spec/json/initial-dns-seedlist-discovery/load-balanced/srvMaxHosts-zero.yml rename to spec/initial-dns-seedlist-discovery/load-balanced/srvMaxHosts-zero.yml diff --git a/src/test/spec/json/initial-dns-seedlist-discovery/replica-set/dbname-with-commas-escaped.json b/spec/initial-dns-seedlist-discovery/replica-set/dbname-with-commas-escaped.json similarity index 100% rename from src/test/spec/json/initial-dns-seedlist-discovery/replica-set/dbname-with-commas-escaped.json rename to spec/initial-dns-seedlist-discovery/replica-set/dbname-with-commas-escaped.json diff --git a/src/test/spec/json/initial-dns-seedlist-discovery/replica-set/dbname-with-commas-escaped.yml b/spec/initial-dns-seedlist-discovery/replica-set/dbname-with-commas-escaped.yml similarity index 100% rename from src/test/spec/json/initial-dns-seedlist-discovery/replica-set/dbname-with-commas-escaped.yml rename to spec/initial-dns-seedlist-discovery/replica-set/dbname-with-commas-escaped.yml diff --git a/src/test/spec/json/initial-dns-seedlist-discovery/replica-set/dbname-with-commas.json b/spec/initial-dns-seedlist-discovery/replica-set/dbname-with-commas.json similarity index 100% rename from src/test/spec/json/initial-dns-seedlist-discovery/replica-set/dbname-with-commas.json rename to spec/initial-dns-seedlist-discovery/replica-set/dbname-with-commas.json diff --git a/src/test/spec/json/initial-dns-seedlist-discovery/replica-set/dbname-with-commas.yml b/spec/initial-dns-seedlist-discovery/replica-set/dbname-with-commas.yml similarity index 100% rename from src/test/spec/json/initial-dns-seedlist-discovery/replica-set/dbname-with-commas.yml rename to spec/initial-dns-seedlist-discovery/replica-set/dbname-with-commas.yml diff --git a/src/test/spec/json/initial-dns-seedlist-discovery/replica-set/direct-connection-false.json b/spec/initial-dns-seedlist-discovery/replica-set/direct-connection-false.json similarity index 100% rename from src/test/spec/json/initial-dns-seedlist-discovery/replica-set/direct-connection-false.json rename to spec/initial-dns-seedlist-discovery/replica-set/direct-connection-false.json diff --git a/src/test/spec/json/initial-dns-seedlist-discovery/replica-set/direct-connection-false.yml b/spec/initial-dns-seedlist-discovery/replica-set/direct-connection-false.yml similarity index 100% rename from src/test/spec/json/initial-dns-seedlist-discovery/replica-set/direct-connection-false.yml rename to spec/initial-dns-seedlist-discovery/replica-set/direct-connection-false.yml diff --git a/src/test/spec/json/initial-dns-seedlist-discovery/replica-set/direct-connection-true.json b/spec/initial-dns-seedlist-discovery/replica-set/direct-connection-true.json similarity index 100% rename from src/test/spec/json/initial-dns-seedlist-discovery/replica-set/direct-connection-true.json rename to spec/initial-dns-seedlist-discovery/replica-set/direct-connection-true.json diff --git a/src/test/spec/json/initial-dns-seedlist-discovery/replica-set/direct-connection-true.yml b/spec/initial-dns-seedlist-discovery/replica-set/direct-connection-true.yml similarity index 100% rename from src/test/spec/json/initial-dns-seedlist-discovery/replica-set/direct-connection-true.yml rename to spec/initial-dns-seedlist-discovery/replica-set/direct-connection-true.yml diff --git a/src/test/spec/json/initial-dns-seedlist-discovery/replica-set/encoded-userinfo-and-db.json b/spec/initial-dns-seedlist-discovery/replica-set/encoded-userinfo-and-db.json similarity index 100% rename from src/test/spec/json/initial-dns-seedlist-discovery/replica-set/encoded-userinfo-and-db.json rename to spec/initial-dns-seedlist-discovery/replica-set/encoded-userinfo-and-db.json diff --git a/src/test/spec/json/initial-dns-seedlist-discovery/replica-set/encoded-userinfo-and-db.yml b/spec/initial-dns-seedlist-discovery/replica-set/encoded-userinfo-and-db.yml similarity index 100% rename from src/test/spec/json/initial-dns-seedlist-discovery/replica-set/encoded-userinfo-and-db.yml rename to spec/initial-dns-seedlist-discovery/replica-set/encoded-userinfo-and-db.yml diff --git a/src/test/spec/json/initial-dns-seedlist-discovery/replica-set/loadBalanced-false-txt.json b/spec/initial-dns-seedlist-discovery/replica-set/loadBalanced-false-txt.json similarity index 100% rename from src/test/spec/json/initial-dns-seedlist-discovery/replica-set/loadBalanced-false-txt.json rename to spec/initial-dns-seedlist-discovery/replica-set/loadBalanced-false-txt.json diff --git a/src/test/spec/json/initial-dns-seedlist-discovery/replica-set/loadBalanced-false-txt.yml b/spec/initial-dns-seedlist-discovery/replica-set/loadBalanced-false-txt.yml similarity index 100% rename from src/test/spec/json/initial-dns-seedlist-discovery/replica-set/loadBalanced-false-txt.yml rename to spec/initial-dns-seedlist-discovery/replica-set/loadBalanced-false-txt.yml diff --git a/src/test/spec/json/initial-dns-seedlist-discovery/replica-set/longer-parent-in-return.json b/spec/initial-dns-seedlist-discovery/replica-set/longer-parent-in-return.json similarity index 100% rename from src/test/spec/json/initial-dns-seedlist-discovery/replica-set/longer-parent-in-return.json rename to spec/initial-dns-seedlist-discovery/replica-set/longer-parent-in-return.json diff --git a/src/test/spec/json/initial-dns-seedlist-discovery/replica-set/longer-parent-in-return.yml b/spec/initial-dns-seedlist-discovery/replica-set/longer-parent-in-return.yml similarity index 100% rename from src/test/spec/json/initial-dns-seedlist-discovery/replica-set/longer-parent-in-return.yml rename to spec/initial-dns-seedlist-discovery/replica-set/longer-parent-in-return.yml diff --git a/src/test/spec/json/initial-dns-seedlist-discovery/replica-set/misformatted-option.json b/spec/initial-dns-seedlist-discovery/replica-set/misformatted-option.json similarity index 100% rename from src/test/spec/json/initial-dns-seedlist-discovery/replica-set/misformatted-option.json rename to spec/initial-dns-seedlist-discovery/replica-set/misformatted-option.json diff --git a/src/test/spec/json/initial-dns-seedlist-discovery/replica-set/misformatted-option.yml b/spec/initial-dns-seedlist-discovery/replica-set/misformatted-option.yml similarity index 100% rename from src/test/spec/json/initial-dns-seedlist-discovery/replica-set/misformatted-option.yml rename to spec/initial-dns-seedlist-discovery/replica-set/misformatted-option.yml diff --git a/src/test/spec/json/initial-dns-seedlist-discovery/replica-set/no-results.json b/spec/initial-dns-seedlist-discovery/replica-set/no-results.json similarity index 100% rename from src/test/spec/json/initial-dns-seedlist-discovery/replica-set/no-results.json rename to spec/initial-dns-seedlist-discovery/replica-set/no-results.json diff --git a/src/test/spec/json/initial-dns-seedlist-discovery/replica-set/no-results.yml b/spec/initial-dns-seedlist-discovery/replica-set/no-results.yml similarity index 100% rename from src/test/spec/json/initial-dns-seedlist-discovery/replica-set/no-results.yml rename to spec/initial-dns-seedlist-discovery/replica-set/no-results.yml diff --git a/src/test/spec/json/initial-dns-seedlist-discovery/replica-set/not-enough-parts.json b/spec/initial-dns-seedlist-discovery/replica-set/not-enough-parts.json similarity index 100% rename from src/test/spec/json/initial-dns-seedlist-discovery/replica-set/not-enough-parts.json rename to spec/initial-dns-seedlist-discovery/replica-set/not-enough-parts.json diff --git a/src/test/spec/json/initial-dns-seedlist-discovery/replica-set/not-enough-parts.yml b/spec/initial-dns-seedlist-discovery/replica-set/not-enough-parts.yml similarity index 100% rename from src/test/spec/json/initial-dns-seedlist-discovery/replica-set/not-enough-parts.yml rename to spec/initial-dns-seedlist-discovery/replica-set/not-enough-parts.yml diff --git a/src/test/spec/json/initial-dns-seedlist-discovery/replica-set/one-result-default-port.json b/spec/initial-dns-seedlist-discovery/replica-set/one-result-default-port.json similarity index 100% rename from src/test/spec/json/initial-dns-seedlist-discovery/replica-set/one-result-default-port.json rename to spec/initial-dns-seedlist-discovery/replica-set/one-result-default-port.json diff --git a/src/test/spec/json/initial-dns-seedlist-discovery/replica-set/one-result-default-port.yml b/spec/initial-dns-seedlist-discovery/replica-set/one-result-default-port.yml similarity index 100% rename from src/test/spec/json/initial-dns-seedlist-discovery/replica-set/one-result-default-port.yml rename to spec/initial-dns-seedlist-discovery/replica-set/one-result-default-port.yml diff --git a/src/test/spec/json/initial-dns-seedlist-discovery/replica-set/one-txt-record-multiple-strings.json b/spec/initial-dns-seedlist-discovery/replica-set/one-txt-record-multiple-strings.json similarity index 100% rename from src/test/spec/json/initial-dns-seedlist-discovery/replica-set/one-txt-record-multiple-strings.json rename to spec/initial-dns-seedlist-discovery/replica-set/one-txt-record-multiple-strings.json diff --git a/src/test/spec/json/initial-dns-seedlist-discovery/replica-set/one-txt-record-multiple-strings.yml b/spec/initial-dns-seedlist-discovery/replica-set/one-txt-record-multiple-strings.yml similarity index 100% rename from src/test/spec/json/initial-dns-seedlist-discovery/replica-set/one-txt-record-multiple-strings.yml rename to spec/initial-dns-seedlist-discovery/replica-set/one-txt-record-multiple-strings.yml diff --git a/src/test/spec/json/initial-dns-seedlist-discovery/replica-set/one-txt-record.json b/spec/initial-dns-seedlist-discovery/replica-set/one-txt-record.json similarity index 100% rename from src/test/spec/json/initial-dns-seedlist-discovery/replica-set/one-txt-record.json rename to spec/initial-dns-seedlist-discovery/replica-set/one-txt-record.json diff --git a/src/test/spec/json/initial-dns-seedlist-discovery/replica-set/one-txt-record.yml b/spec/initial-dns-seedlist-discovery/replica-set/one-txt-record.yml similarity index 100% rename from src/test/spec/json/initial-dns-seedlist-discovery/replica-set/one-txt-record.yml rename to spec/initial-dns-seedlist-discovery/replica-set/one-txt-record.yml diff --git a/src/test/spec/json/initial-dns-seedlist-discovery/replica-set/parent-part-mismatch1.json b/spec/initial-dns-seedlist-discovery/replica-set/parent-part-mismatch1.json similarity index 100% rename from src/test/spec/json/initial-dns-seedlist-discovery/replica-set/parent-part-mismatch1.json rename to spec/initial-dns-seedlist-discovery/replica-set/parent-part-mismatch1.json diff --git a/src/test/spec/json/initial-dns-seedlist-discovery/replica-set/parent-part-mismatch1.yml b/spec/initial-dns-seedlist-discovery/replica-set/parent-part-mismatch1.yml similarity index 100% rename from src/test/spec/json/initial-dns-seedlist-discovery/replica-set/parent-part-mismatch1.yml rename to spec/initial-dns-seedlist-discovery/replica-set/parent-part-mismatch1.yml diff --git a/src/test/spec/json/initial-dns-seedlist-discovery/replica-set/parent-part-mismatch2.json b/spec/initial-dns-seedlist-discovery/replica-set/parent-part-mismatch2.json similarity index 100% rename from src/test/spec/json/initial-dns-seedlist-discovery/replica-set/parent-part-mismatch2.json rename to spec/initial-dns-seedlist-discovery/replica-set/parent-part-mismatch2.json diff --git a/src/test/spec/json/initial-dns-seedlist-discovery/replica-set/parent-part-mismatch2.yml b/spec/initial-dns-seedlist-discovery/replica-set/parent-part-mismatch2.yml similarity index 100% rename from src/test/spec/json/initial-dns-seedlist-discovery/replica-set/parent-part-mismatch2.yml rename to spec/initial-dns-seedlist-discovery/replica-set/parent-part-mismatch2.yml diff --git a/src/test/spec/json/initial-dns-seedlist-discovery/replica-set/parent-part-mismatch3.json b/spec/initial-dns-seedlist-discovery/replica-set/parent-part-mismatch3.json similarity index 100% rename from src/test/spec/json/initial-dns-seedlist-discovery/replica-set/parent-part-mismatch3.json rename to spec/initial-dns-seedlist-discovery/replica-set/parent-part-mismatch3.json diff --git a/src/test/spec/json/initial-dns-seedlist-discovery/replica-set/parent-part-mismatch3.yml b/spec/initial-dns-seedlist-discovery/replica-set/parent-part-mismatch3.yml similarity index 100% rename from src/test/spec/json/initial-dns-seedlist-discovery/replica-set/parent-part-mismatch3.yml rename to spec/initial-dns-seedlist-discovery/replica-set/parent-part-mismatch3.yml diff --git a/src/test/spec/json/initial-dns-seedlist-discovery/replica-set/parent-part-mismatch4.json b/spec/initial-dns-seedlist-discovery/replica-set/parent-part-mismatch4.json similarity index 100% rename from src/test/spec/json/initial-dns-seedlist-discovery/replica-set/parent-part-mismatch4.json rename to spec/initial-dns-seedlist-discovery/replica-set/parent-part-mismatch4.json diff --git a/src/test/spec/json/initial-dns-seedlist-discovery/replica-set/parent-part-mismatch4.yml b/spec/initial-dns-seedlist-discovery/replica-set/parent-part-mismatch4.yml similarity index 100% rename from src/test/spec/json/initial-dns-seedlist-discovery/replica-set/parent-part-mismatch4.yml rename to spec/initial-dns-seedlist-discovery/replica-set/parent-part-mismatch4.yml diff --git a/src/test/spec/json/initial-dns-seedlist-discovery/replica-set/parent-part-mismatch5.json b/spec/initial-dns-seedlist-discovery/replica-set/parent-part-mismatch5.json similarity index 100% rename from src/test/spec/json/initial-dns-seedlist-discovery/replica-set/parent-part-mismatch5.json rename to spec/initial-dns-seedlist-discovery/replica-set/parent-part-mismatch5.json diff --git a/src/test/spec/json/initial-dns-seedlist-discovery/replica-set/parent-part-mismatch5.yml b/spec/initial-dns-seedlist-discovery/replica-set/parent-part-mismatch5.yml similarity index 100% rename from src/test/spec/json/initial-dns-seedlist-discovery/replica-set/parent-part-mismatch5.yml rename to spec/initial-dns-seedlist-discovery/replica-set/parent-part-mismatch5.yml diff --git a/src/test/spec/json/initial-dns-seedlist-discovery/replica-set/returned-parent-too-short.json b/spec/initial-dns-seedlist-discovery/replica-set/returned-parent-too-short.json similarity index 100% rename from src/test/spec/json/initial-dns-seedlist-discovery/replica-set/returned-parent-too-short.json rename to spec/initial-dns-seedlist-discovery/replica-set/returned-parent-too-short.json diff --git a/src/test/spec/json/initial-dns-seedlist-discovery/replica-set/returned-parent-too-short.yml b/spec/initial-dns-seedlist-discovery/replica-set/returned-parent-too-short.yml similarity index 100% rename from src/test/spec/json/initial-dns-seedlist-discovery/replica-set/returned-parent-too-short.yml rename to spec/initial-dns-seedlist-discovery/replica-set/returned-parent-too-short.yml diff --git a/src/test/spec/json/initial-dns-seedlist-discovery/replica-set/returned-parent-wrong.json b/spec/initial-dns-seedlist-discovery/replica-set/returned-parent-wrong.json similarity index 100% rename from src/test/spec/json/initial-dns-seedlist-discovery/replica-set/returned-parent-wrong.json rename to spec/initial-dns-seedlist-discovery/replica-set/returned-parent-wrong.json diff --git a/src/test/spec/json/initial-dns-seedlist-discovery/replica-set/returned-parent-wrong.yml b/spec/initial-dns-seedlist-discovery/replica-set/returned-parent-wrong.yml similarity index 100% rename from src/test/spec/json/initial-dns-seedlist-discovery/replica-set/returned-parent-wrong.yml rename to spec/initial-dns-seedlist-discovery/replica-set/returned-parent-wrong.yml diff --git a/src/test/spec/json/initial-dns-seedlist-discovery/replica-set/srv-service-name.json b/spec/initial-dns-seedlist-discovery/replica-set/srv-service-name.json similarity index 100% rename from src/test/spec/json/initial-dns-seedlist-discovery/replica-set/srv-service-name.json rename to spec/initial-dns-seedlist-discovery/replica-set/srv-service-name.json diff --git a/src/test/spec/json/initial-dns-seedlist-discovery/replica-set/srv-service-name.yml b/spec/initial-dns-seedlist-discovery/replica-set/srv-service-name.yml similarity index 100% rename from src/test/spec/json/initial-dns-seedlist-discovery/replica-set/srv-service-name.yml rename to spec/initial-dns-seedlist-discovery/replica-set/srv-service-name.yml diff --git a/src/test/spec/json/initial-dns-seedlist-discovery/replica-set/srvMaxHosts-conflicts_with_replicaSet-txt.json b/spec/initial-dns-seedlist-discovery/replica-set/srvMaxHosts-conflicts_with_replicaSet-txt.json similarity index 100% rename from src/test/spec/json/initial-dns-seedlist-discovery/replica-set/srvMaxHosts-conflicts_with_replicaSet-txt.json rename to spec/initial-dns-seedlist-discovery/replica-set/srvMaxHosts-conflicts_with_replicaSet-txt.json diff --git a/src/test/spec/json/initial-dns-seedlist-discovery/replica-set/srvMaxHosts-conflicts_with_replicaSet-txt.yml b/spec/initial-dns-seedlist-discovery/replica-set/srvMaxHosts-conflicts_with_replicaSet-txt.yml similarity index 100% rename from src/test/spec/json/initial-dns-seedlist-discovery/replica-set/srvMaxHosts-conflicts_with_replicaSet-txt.yml rename to spec/initial-dns-seedlist-discovery/replica-set/srvMaxHosts-conflicts_with_replicaSet-txt.yml diff --git a/src/test/spec/json/initial-dns-seedlist-discovery/replica-set/srvMaxHosts-conflicts_with_replicaSet.json b/spec/initial-dns-seedlist-discovery/replica-set/srvMaxHosts-conflicts_with_replicaSet.json similarity index 100% rename from src/test/spec/json/initial-dns-seedlist-discovery/replica-set/srvMaxHosts-conflicts_with_replicaSet.json rename to spec/initial-dns-seedlist-discovery/replica-set/srvMaxHosts-conflicts_with_replicaSet.json diff --git a/src/test/spec/json/initial-dns-seedlist-discovery/replica-set/srvMaxHosts-conflicts_with_replicaSet.yml b/spec/initial-dns-seedlist-discovery/replica-set/srvMaxHosts-conflicts_with_replicaSet.yml similarity index 100% rename from src/test/spec/json/initial-dns-seedlist-discovery/replica-set/srvMaxHosts-conflicts_with_replicaSet.yml rename to spec/initial-dns-seedlist-discovery/replica-set/srvMaxHosts-conflicts_with_replicaSet.yml diff --git a/src/test/spec/json/initial-dns-seedlist-discovery/replica-set/srvMaxHosts-equal_to_srv_records.json b/spec/initial-dns-seedlist-discovery/replica-set/srvMaxHosts-equal_to_srv_records.json similarity index 100% rename from src/test/spec/json/initial-dns-seedlist-discovery/replica-set/srvMaxHosts-equal_to_srv_records.json rename to spec/initial-dns-seedlist-discovery/replica-set/srvMaxHosts-equal_to_srv_records.json diff --git a/src/test/spec/json/initial-dns-seedlist-discovery/replica-set/srvMaxHosts-equal_to_srv_records.yml b/spec/initial-dns-seedlist-discovery/replica-set/srvMaxHosts-equal_to_srv_records.yml similarity index 100% rename from src/test/spec/json/initial-dns-seedlist-discovery/replica-set/srvMaxHosts-equal_to_srv_records.yml rename to spec/initial-dns-seedlist-discovery/replica-set/srvMaxHosts-equal_to_srv_records.yml diff --git a/src/test/spec/json/initial-dns-seedlist-discovery/replica-set/srvMaxHosts-greater_than_srv_records.json b/spec/initial-dns-seedlist-discovery/replica-set/srvMaxHosts-greater_than_srv_records.json similarity index 100% rename from src/test/spec/json/initial-dns-seedlist-discovery/replica-set/srvMaxHosts-greater_than_srv_records.json rename to spec/initial-dns-seedlist-discovery/replica-set/srvMaxHosts-greater_than_srv_records.json diff --git a/src/test/spec/json/initial-dns-seedlist-discovery/replica-set/srvMaxHosts-greater_than_srv_records.yml b/spec/initial-dns-seedlist-discovery/replica-set/srvMaxHosts-greater_than_srv_records.yml similarity index 100% rename from src/test/spec/json/initial-dns-seedlist-discovery/replica-set/srvMaxHosts-greater_than_srv_records.yml rename to spec/initial-dns-seedlist-discovery/replica-set/srvMaxHosts-greater_than_srv_records.yml diff --git a/src/test/spec/json/initial-dns-seedlist-discovery/replica-set/srvMaxHosts-less_than_srv_records.json b/spec/initial-dns-seedlist-discovery/replica-set/srvMaxHosts-less_than_srv_records.json similarity index 100% rename from src/test/spec/json/initial-dns-seedlist-discovery/replica-set/srvMaxHosts-less_than_srv_records.json rename to spec/initial-dns-seedlist-discovery/replica-set/srvMaxHosts-less_than_srv_records.json diff --git a/src/test/spec/json/initial-dns-seedlist-discovery/replica-set/srvMaxHosts-less_than_srv_records.yml b/spec/initial-dns-seedlist-discovery/replica-set/srvMaxHosts-less_than_srv_records.yml similarity index 100% rename from src/test/spec/json/initial-dns-seedlist-discovery/replica-set/srvMaxHosts-less_than_srv_records.yml rename to spec/initial-dns-seedlist-discovery/replica-set/srvMaxHosts-less_than_srv_records.yml diff --git a/src/test/spec/json/initial-dns-seedlist-discovery/replica-set/srvMaxHosts-zero-txt.json b/spec/initial-dns-seedlist-discovery/replica-set/srvMaxHosts-zero-txt.json similarity index 100% rename from src/test/spec/json/initial-dns-seedlist-discovery/replica-set/srvMaxHosts-zero-txt.json rename to spec/initial-dns-seedlist-discovery/replica-set/srvMaxHosts-zero-txt.json diff --git a/src/test/spec/json/initial-dns-seedlist-discovery/replica-set/srvMaxHosts-zero-txt.yml b/spec/initial-dns-seedlist-discovery/replica-set/srvMaxHosts-zero-txt.yml similarity index 100% rename from src/test/spec/json/initial-dns-seedlist-discovery/replica-set/srvMaxHosts-zero-txt.yml rename to spec/initial-dns-seedlist-discovery/replica-set/srvMaxHosts-zero-txt.yml diff --git a/src/test/spec/json/initial-dns-seedlist-discovery/replica-set/srvMaxHosts-zero.json b/spec/initial-dns-seedlist-discovery/replica-set/srvMaxHosts-zero.json similarity index 100% rename from src/test/spec/json/initial-dns-seedlist-discovery/replica-set/srvMaxHosts-zero.json rename to spec/initial-dns-seedlist-discovery/replica-set/srvMaxHosts-zero.json diff --git a/src/test/spec/json/initial-dns-seedlist-discovery/replica-set/srvMaxHosts-zero.yml b/spec/initial-dns-seedlist-discovery/replica-set/srvMaxHosts-zero.yml similarity index 100% rename from src/test/spec/json/initial-dns-seedlist-discovery/replica-set/srvMaxHosts-zero.yml rename to spec/initial-dns-seedlist-discovery/replica-set/srvMaxHosts-zero.yml diff --git a/src/test/spec/json/initial-dns-seedlist-discovery/replica-set/two-results-default-port.json b/spec/initial-dns-seedlist-discovery/replica-set/two-results-default-port.json similarity index 100% rename from src/test/spec/json/initial-dns-seedlist-discovery/replica-set/two-results-default-port.json rename to spec/initial-dns-seedlist-discovery/replica-set/two-results-default-port.json diff --git a/src/test/spec/json/initial-dns-seedlist-discovery/replica-set/two-results-default-port.yml b/spec/initial-dns-seedlist-discovery/replica-set/two-results-default-port.yml similarity index 100% rename from src/test/spec/json/initial-dns-seedlist-discovery/replica-set/two-results-default-port.yml rename to spec/initial-dns-seedlist-discovery/replica-set/two-results-default-port.yml diff --git a/src/test/spec/json/initial-dns-seedlist-discovery/replica-set/two-results-nonstandard-port.json b/spec/initial-dns-seedlist-discovery/replica-set/two-results-nonstandard-port.json similarity index 100% rename from src/test/spec/json/initial-dns-seedlist-discovery/replica-set/two-results-nonstandard-port.json rename to spec/initial-dns-seedlist-discovery/replica-set/two-results-nonstandard-port.json diff --git a/src/test/spec/json/initial-dns-seedlist-discovery/replica-set/two-results-nonstandard-port.yml b/spec/initial-dns-seedlist-discovery/replica-set/two-results-nonstandard-port.yml similarity index 100% rename from src/test/spec/json/initial-dns-seedlist-discovery/replica-set/two-results-nonstandard-port.yml rename to spec/initial-dns-seedlist-discovery/replica-set/two-results-nonstandard-port.yml diff --git a/src/test/spec/json/initial-dns-seedlist-discovery/replica-set/two-txt-records.json b/spec/initial-dns-seedlist-discovery/replica-set/two-txt-records.json similarity index 100% rename from src/test/spec/json/initial-dns-seedlist-discovery/replica-set/two-txt-records.json rename to spec/initial-dns-seedlist-discovery/replica-set/two-txt-records.json diff --git a/src/test/spec/json/initial-dns-seedlist-discovery/replica-set/two-txt-records.yml b/spec/initial-dns-seedlist-discovery/replica-set/two-txt-records.yml similarity index 100% rename from src/test/spec/json/initial-dns-seedlist-discovery/replica-set/two-txt-records.yml rename to spec/initial-dns-seedlist-discovery/replica-set/two-txt-records.yml diff --git a/src/test/spec/json/initial-dns-seedlist-discovery/replica-set/txt-record-not-allowed-option.json b/spec/initial-dns-seedlist-discovery/replica-set/txt-record-not-allowed-option.json similarity index 100% rename from src/test/spec/json/initial-dns-seedlist-discovery/replica-set/txt-record-not-allowed-option.json rename to spec/initial-dns-seedlist-discovery/replica-set/txt-record-not-allowed-option.json diff --git a/src/test/spec/json/initial-dns-seedlist-discovery/replica-set/txt-record-not-allowed-option.yml b/spec/initial-dns-seedlist-discovery/replica-set/txt-record-not-allowed-option.yml similarity index 100% rename from src/test/spec/json/initial-dns-seedlist-discovery/replica-set/txt-record-not-allowed-option.yml rename to spec/initial-dns-seedlist-discovery/replica-set/txt-record-not-allowed-option.yml diff --git a/src/test/spec/json/initial-dns-seedlist-discovery/replica-set/txt-record-with-overridden-ssl-option.json b/spec/initial-dns-seedlist-discovery/replica-set/txt-record-with-overridden-ssl-option.json similarity index 100% rename from src/test/spec/json/initial-dns-seedlist-discovery/replica-set/txt-record-with-overridden-ssl-option.json rename to spec/initial-dns-seedlist-discovery/replica-set/txt-record-with-overridden-ssl-option.json diff --git a/src/test/spec/json/initial-dns-seedlist-discovery/replica-set/txt-record-with-overridden-ssl-option.yml b/spec/initial-dns-seedlist-discovery/replica-set/txt-record-with-overridden-ssl-option.yml similarity index 100% rename from src/test/spec/json/initial-dns-seedlist-discovery/replica-set/txt-record-with-overridden-ssl-option.yml rename to spec/initial-dns-seedlist-discovery/replica-set/txt-record-with-overridden-ssl-option.yml diff --git a/src/test/spec/json/initial-dns-seedlist-discovery/replica-set/txt-record-with-overridden-uri-option.json b/spec/initial-dns-seedlist-discovery/replica-set/txt-record-with-overridden-uri-option.json similarity index 100% rename from src/test/spec/json/initial-dns-seedlist-discovery/replica-set/txt-record-with-overridden-uri-option.json rename to spec/initial-dns-seedlist-discovery/replica-set/txt-record-with-overridden-uri-option.json diff --git a/src/test/spec/json/initial-dns-seedlist-discovery/replica-set/txt-record-with-overridden-uri-option.yml b/spec/initial-dns-seedlist-discovery/replica-set/txt-record-with-overridden-uri-option.yml similarity index 100% rename from src/test/spec/json/initial-dns-seedlist-discovery/replica-set/txt-record-with-overridden-uri-option.yml rename to spec/initial-dns-seedlist-discovery/replica-set/txt-record-with-overridden-uri-option.yml diff --git a/src/test/spec/json/initial-dns-seedlist-discovery/replica-set/txt-record-with-unallowed-option.json b/spec/initial-dns-seedlist-discovery/replica-set/txt-record-with-unallowed-option.json similarity index 100% rename from src/test/spec/json/initial-dns-seedlist-discovery/replica-set/txt-record-with-unallowed-option.json rename to spec/initial-dns-seedlist-discovery/replica-set/txt-record-with-unallowed-option.json diff --git a/src/test/spec/json/initial-dns-seedlist-discovery/replica-set/txt-record-with-unallowed-option.yml b/spec/initial-dns-seedlist-discovery/replica-set/txt-record-with-unallowed-option.yml similarity index 100% rename from src/test/spec/json/initial-dns-seedlist-discovery/replica-set/txt-record-with-unallowed-option.yml rename to spec/initial-dns-seedlist-discovery/replica-set/txt-record-with-unallowed-option.yml diff --git a/src/test/spec/json/initial-dns-seedlist-discovery/replica-set/uri-with-admin-database.json b/spec/initial-dns-seedlist-discovery/replica-set/uri-with-admin-database.json similarity index 100% rename from src/test/spec/json/initial-dns-seedlist-discovery/replica-set/uri-with-admin-database.json rename to spec/initial-dns-seedlist-discovery/replica-set/uri-with-admin-database.json diff --git a/src/test/spec/json/initial-dns-seedlist-discovery/replica-set/uri-with-admin-database.yml b/spec/initial-dns-seedlist-discovery/replica-set/uri-with-admin-database.yml similarity index 100% rename from src/test/spec/json/initial-dns-seedlist-discovery/replica-set/uri-with-admin-database.yml rename to spec/initial-dns-seedlist-discovery/replica-set/uri-with-admin-database.yml diff --git a/src/test/spec/json/initial-dns-seedlist-discovery/replica-set/uri-with-auth.json b/spec/initial-dns-seedlist-discovery/replica-set/uri-with-auth.json similarity index 100% rename from src/test/spec/json/initial-dns-seedlist-discovery/replica-set/uri-with-auth.json rename to spec/initial-dns-seedlist-discovery/replica-set/uri-with-auth.json diff --git a/src/test/spec/json/initial-dns-seedlist-discovery/replica-set/uri-with-auth.yml b/spec/initial-dns-seedlist-discovery/replica-set/uri-with-auth.yml similarity index 100% rename from src/test/spec/json/initial-dns-seedlist-discovery/replica-set/uri-with-auth.yml rename to spec/initial-dns-seedlist-discovery/replica-set/uri-with-auth.yml diff --git a/src/test/spec/json/initial-dns-seedlist-discovery/replica-set/uri-with-port.json b/spec/initial-dns-seedlist-discovery/replica-set/uri-with-port.json similarity index 100% rename from src/test/spec/json/initial-dns-seedlist-discovery/replica-set/uri-with-port.json rename to spec/initial-dns-seedlist-discovery/replica-set/uri-with-port.json diff --git a/src/test/spec/json/initial-dns-seedlist-discovery/replica-set/uri-with-port.yml b/spec/initial-dns-seedlist-discovery/replica-set/uri-with-port.yml similarity index 100% rename from src/test/spec/json/initial-dns-seedlist-discovery/replica-set/uri-with-port.yml rename to spec/initial-dns-seedlist-discovery/replica-set/uri-with-port.yml diff --git a/src/test/spec/json/initial-dns-seedlist-discovery/replica-set/uri-with-two-hosts.json b/spec/initial-dns-seedlist-discovery/replica-set/uri-with-two-hosts.json similarity index 100% rename from src/test/spec/json/initial-dns-seedlist-discovery/replica-set/uri-with-two-hosts.json rename to spec/initial-dns-seedlist-discovery/replica-set/uri-with-two-hosts.json diff --git a/src/test/spec/json/initial-dns-seedlist-discovery/replica-set/uri-with-two-hosts.yml b/spec/initial-dns-seedlist-discovery/replica-set/uri-with-two-hosts.yml similarity index 100% rename from src/test/spec/json/initial-dns-seedlist-discovery/replica-set/uri-with-two-hosts.yml rename to spec/initial-dns-seedlist-discovery/replica-set/uri-with-two-hosts.yml diff --git a/src/test/spec/json/initial-dns-seedlist-discovery/sharded/srvMaxHosts-equal_to_srv_records.json b/spec/initial-dns-seedlist-discovery/sharded/srvMaxHosts-equal_to_srv_records.json similarity index 100% rename from src/test/spec/json/initial-dns-seedlist-discovery/sharded/srvMaxHosts-equal_to_srv_records.json rename to spec/initial-dns-seedlist-discovery/sharded/srvMaxHosts-equal_to_srv_records.json diff --git a/src/test/spec/json/initial-dns-seedlist-discovery/sharded/srvMaxHosts-equal_to_srv_records.yml b/spec/initial-dns-seedlist-discovery/sharded/srvMaxHosts-equal_to_srv_records.yml similarity index 100% rename from src/test/spec/json/initial-dns-seedlist-discovery/sharded/srvMaxHosts-equal_to_srv_records.yml rename to spec/initial-dns-seedlist-discovery/sharded/srvMaxHosts-equal_to_srv_records.yml diff --git a/src/test/spec/json/initial-dns-seedlist-discovery/sharded/srvMaxHosts-greater_than_srv_records.json b/spec/initial-dns-seedlist-discovery/sharded/srvMaxHosts-greater_than_srv_records.json similarity index 100% rename from src/test/spec/json/initial-dns-seedlist-discovery/sharded/srvMaxHosts-greater_than_srv_records.json rename to spec/initial-dns-seedlist-discovery/sharded/srvMaxHosts-greater_than_srv_records.json diff --git a/src/test/spec/json/initial-dns-seedlist-discovery/sharded/srvMaxHosts-greater_than_srv_records.yml b/spec/initial-dns-seedlist-discovery/sharded/srvMaxHosts-greater_than_srv_records.yml similarity index 100% rename from src/test/spec/json/initial-dns-seedlist-discovery/sharded/srvMaxHosts-greater_than_srv_records.yml rename to spec/initial-dns-seedlist-discovery/sharded/srvMaxHosts-greater_than_srv_records.yml diff --git a/src/test/spec/json/initial-dns-seedlist-discovery/sharded/srvMaxHosts-less_than_srv_records.json b/spec/initial-dns-seedlist-discovery/sharded/srvMaxHosts-less_than_srv_records.json similarity index 100% rename from src/test/spec/json/initial-dns-seedlist-discovery/sharded/srvMaxHosts-less_than_srv_records.json rename to spec/initial-dns-seedlist-discovery/sharded/srvMaxHosts-less_than_srv_records.json diff --git a/src/test/spec/json/initial-dns-seedlist-discovery/sharded/srvMaxHosts-less_than_srv_records.yml b/spec/initial-dns-seedlist-discovery/sharded/srvMaxHosts-less_than_srv_records.yml similarity index 100% rename from src/test/spec/json/initial-dns-seedlist-discovery/sharded/srvMaxHosts-less_than_srv_records.yml rename to spec/initial-dns-seedlist-discovery/sharded/srvMaxHosts-less_than_srv_records.yml diff --git a/src/test/spec/json/initial-dns-seedlist-discovery/sharded/srvMaxHosts-zero.json b/spec/initial-dns-seedlist-discovery/sharded/srvMaxHosts-zero.json similarity index 100% rename from src/test/spec/json/initial-dns-seedlist-discovery/sharded/srvMaxHosts-zero.json rename to spec/initial-dns-seedlist-discovery/sharded/srvMaxHosts-zero.json diff --git a/src/test/spec/json/initial-dns-seedlist-discovery/sharded/srvMaxHosts-zero.yml b/spec/initial-dns-seedlist-discovery/sharded/srvMaxHosts-zero.yml similarity index 100% rename from src/test/spec/json/initial-dns-seedlist-discovery/sharded/srvMaxHosts-zero.yml rename to spec/initial-dns-seedlist-discovery/sharded/srvMaxHosts-zero.yml diff --git a/src/test/spec/json/load-balancers/README.md b/spec/load-balancers/README.md similarity index 100% rename from src/test/spec/json/load-balancers/README.md rename to spec/load-balancers/README.md diff --git a/src/test/spec/json/load-balancers/cursors.json b/spec/load-balancers/cursors.json similarity index 100% rename from src/test/spec/json/load-balancers/cursors.json rename to spec/load-balancers/cursors.json diff --git a/src/test/spec/json/load-balancers/cursors.yml b/spec/load-balancers/cursors.yml similarity index 100% rename from src/test/spec/json/load-balancers/cursors.yml rename to spec/load-balancers/cursors.yml diff --git a/src/test/spec/json/load-balancers/event-monitoring.json b/spec/load-balancers/event-monitoring.json similarity index 100% rename from src/test/spec/json/load-balancers/event-monitoring.json rename to spec/load-balancers/event-monitoring.json diff --git a/src/test/spec/json/load-balancers/event-monitoring.yml b/spec/load-balancers/event-monitoring.yml similarity index 100% rename from src/test/spec/json/load-balancers/event-monitoring.yml rename to spec/load-balancers/event-monitoring.yml diff --git a/src/test/spec/json/load-balancers/lb-connection-establishment.json b/spec/load-balancers/lb-connection-establishment.json similarity index 100% rename from src/test/spec/json/load-balancers/lb-connection-establishment.json rename to spec/load-balancers/lb-connection-establishment.json diff --git a/src/test/spec/json/load-balancers/lb-connection-establishment.yml b/spec/load-balancers/lb-connection-establishment.yml similarity index 100% rename from src/test/spec/json/load-balancers/lb-connection-establishment.yml rename to spec/load-balancers/lb-connection-establishment.yml diff --git a/src/test/spec/json/load-balancers/non-lb-connection-establishment.json b/spec/load-balancers/non-lb-connection-establishment.json similarity index 100% rename from src/test/spec/json/load-balancers/non-lb-connection-establishment.json rename to spec/load-balancers/non-lb-connection-establishment.json diff --git a/src/test/spec/json/load-balancers/non-lb-connection-establishment.yml b/spec/load-balancers/non-lb-connection-establishment.yml similarity index 100% rename from src/test/spec/json/load-balancers/non-lb-connection-establishment.yml rename to spec/load-balancers/non-lb-connection-establishment.yml diff --git a/src/test/spec/json/load-balancers/sdam-error-handling.json b/spec/load-balancers/sdam-error-handling.json similarity index 100% rename from src/test/spec/json/load-balancers/sdam-error-handling.json rename to spec/load-balancers/sdam-error-handling.json diff --git a/src/test/spec/json/load-balancers/sdam-error-handling.yml b/spec/load-balancers/sdam-error-handling.yml similarity index 100% rename from src/test/spec/json/load-balancers/sdam-error-handling.yml rename to spec/load-balancers/sdam-error-handling.yml diff --git a/src/test/spec/json/load-balancers/server-selection.json b/spec/load-balancers/server-selection.json similarity index 100% rename from src/test/spec/json/load-balancers/server-selection.json rename to spec/load-balancers/server-selection.json diff --git a/src/test/spec/json/load-balancers/server-selection.yml b/spec/load-balancers/server-selection.yml similarity index 100% rename from src/test/spec/json/load-balancers/server-selection.yml rename to spec/load-balancers/server-selection.yml diff --git a/src/test/spec/json/load-balancers/transactions.json b/spec/load-balancers/transactions.json similarity index 100% rename from src/test/spec/json/load-balancers/transactions.json rename to spec/load-balancers/transactions.json diff --git a/src/test/spec/json/load-balancers/transactions.yml b/spec/load-balancers/transactions.yml similarity index 100% rename from src/test/spec/json/load-balancers/transactions.yml rename to spec/load-balancers/transactions.yml diff --git a/src/test/spec/json/load-balancers/wait-queue-timeouts.json b/spec/load-balancers/wait-queue-timeouts.json similarity index 100% rename from src/test/spec/json/load-balancers/wait-queue-timeouts.json rename to spec/load-balancers/wait-queue-timeouts.json diff --git a/src/test/spec/json/load-balancers/wait-queue-timeouts.yml b/spec/load-balancers/wait-queue-timeouts.yml similarity index 100% rename from src/test/spec/json/load-balancers/wait-queue-timeouts.yml rename to spec/load-balancers/wait-queue-timeouts.yml diff --git a/src/test/spec/json/max-staleness/README.rst b/spec/max-staleness/README.rst similarity index 100% rename from src/test/spec/json/max-staleness/README.rst rename to spec/max-staleness/README.rst diff --git a/src/test/spec/json/max-staleness/ReplicaSetNoPrimary/DefaultNoMaxStaleness.json b/spec/max-staleness/ReplicaSetNoPrimary/DefaultNoMaxStaleness.json similarity index 100% rename from src/test/spec/json/max-staleness/ReplicaSetNoPrimary/DefaultNoMaxStaleness.json rename to spec/max-staleness/ReplicaSetNoPrimary/DefaultNoMaxStaleness.json diff --git a/src/test/spec/json/max-staleness/ReplicaSetNoPrimary/DefaultNoMaxStaleness.yml b/spec/max-staleness/ReplicaSetNoPrimary/DefaultNoMaxStaleness.yml similarity index 100% rename from src/test/spec/json/max-staleness/ReplicaSetNoPrimary/DefaultNoMaxStaleness.yml rename to spec/max-staleness/ReplicaSetNoPrimary/DefaultNoMaxStaleness.yml diff --git a/src/test/spec/json/max-staleness/ReplicaSetNoPrimary/LastUpdateTime.json b/spec/max-staleness/ReplicaSetNoPrimary/LastUpdateTime.json similarity index 100% rename from src/test/spec/json/max-staleness/ReplicaSetNoPrimary/LastUpdateTime.json rename to spec/max-staleness/ReplicaSetNoPrimary/LastUpdateTime.json diff --git a/src/test/spec/json/max-staleness/ReplicaSetNoPrimary/LastUpdateTime.yml b/spec/max-staleness/ReplicaSetNoPrimary/LastUpdateTime.yml similarity index 100% rename from src/test/spec/json/max-staleness/ReplicaSetNoPrimary/LastUpdateTime.yml rename to spec/max-staleness/ReplicaSetNoPrimary/LastUpdateTime.yml diff --git a/src/test/spec/json/max-staleness/ReplicaSetNoPrimary/MaxStalenessTooSmall.json b/spec/max-staleness/ReplicaSetNoPrimary/MaxStalenessTooSmall.json similarity index 100% rename from src/test/spec/json/max-staleness/ReplicaSetNoPrimary/MaxStalenessTooSmall.json rename to spec/max-staleness/ReplicaSetNoPrimary/MaxStalenessTooSmall.json diff --git a/src/test/spec/json/max-staleness/ReplicaSetNoPrimary/MaxStalenessTooSmall.yml b/spec/max-staleness/ReplicaSetNoPrimary/MaxStalenessTooSmall.yml similarity index 100% rename from src/test/spec/json/max-staleness/ReplicaSetNoPrimary/MaxStalenessTooSmall.yml rename to spec/max-staleness/ReplicaSetNoPrimary/MaxStalenessTooSmall.yml diff --git a/src/test/spec/json/max-staleness/ReplicaSetNoPrimary/Nearest.json b/spec/max-staleness/ReplicaSetNoPrimary/Nearest.json similarity index 100% rename from src/test/spec/json/max-staleness/ReplicaSetNoPrimary/Nearest.json rename to spec/max-staleness/ReplicaSetNoPrimary/Nearest.json diff --git a/src/test/spec/json/max-staleness/ReplicaSetNoPrimary/Nearest.yml b/spec/max-staleness/ReplicaSetNoPrimary/Nearest.yml similarity index 100% rename from src/test/spec/json/max-staleness/ReplicaSetNoPrimary/Nearest.yml rename to spec/max-staleness/ReplicaSetNoPrimary/Nearest.yml diff --git a/src/test/spec/json/max-staleness/ReplicaSetNoPrimary/Nearest2.json b/spec/max-staleness/ReplicaSetNoPrimary/Nearest2.json similarity index 100% rename from src/test/spec/json/max-staleness/ReplicaSetNoPrimary/Nearest2.json rename to spec/max-staleness/ReplicaSetNoPrimary/Nearest2.json diff --git a/src/test/spec/json/max-staleness/ReplicaSetNoPrimary/Nearest2.yml b/spec/max-staleness/ReplicaSetNoPrimary/Nearest2.yml similarity index 100% rename from src/test/spec/json/max-staleness/ReplicaSetNoPrimary/Nearest2.yml rename to spec/max-staleness/ReplicaSetNoPrimary/Nearest2.yml diff --git a/src/test/spec/json/max-staleness/ReplicaSetNoPrimary/NoKnownServers.json b/spec/max-staleness/ReplicaSetNoPrimary/NoKnownServers.json similarity index 100% rename from src/test/spec/json/max-staleness/ReplicaSetNoPrimary/NoKnownServers.json rename to spec/max-staleness/ReplicaSetNoPrimary/NoKnownServers.json diff --git a/src/test/spec/json/max-staleness/ReplicaSetNoPrimary/NoKnownServers.yml b/spec/max-staleness/ReplicaSetNoPrimary/NoKnownServers.yml similarity index 100% rename from src/test/spec/json/max-staleness/ReplicaSetNoPrimary/NoKnownServers.yml rename to spec/max-staleness/ReplicaSetNoPrimary/NoKnownServers.yml diff --git a/src/test/spec/json/max-staleness/ReplicaSetNoPrimary/OneKnownTwoUnavailable.json b/spec/max-staleness/ReplicaSetNoPrimary/OneKnownTwoUnavailable.json similarity index 100% rename from src/test/spec/json/max-staleness/ReplicaSetNoPrimary/OneKnownTwoUnavailable.json rename to spec/max-staleness/ReplicaSetNoPrimary/OneKnownTwoUnavailable.json diff --git a/src/test/spec/json/max-staleness/ReplicaSetNoPrimary/OneKnownTwoUnavailable.yml b/spec/max-staleness/ReplicaSetNoPrimary/OneKnownTwoUnavailable.yml similarity index 100% rename from src/test/spec/json/max-staleness/ReplicaSetNoPrimary/OneKnownTwoUnavailable.yml rename to spec/max-staleness/ReplicaSetNoPrimary/OneKnownTwoUnavailable.yml diff --git a/src/test/spec/json/max-staleness/ReplicaSetNoPrimary/PrimaryPreferred.json b/spec/max-staleness/ReplicaSetNoPrimary/PrimaryPreferred.json similarity index 100% rename from src/test/spec/json/max-staleness/ReplicaSetNoPrimary/PrimaryPreferred.json rename to spec/max-staleness/ReplicaSetNoPrimary/PrimaryPreferred.json diff --git a/src/test/spec/json/max-staleness/ReplicaSetNoPrimary/PrimaryPreferred.yml b/spec/max-staleness/ReplicaSetNoPrimary/PrimaryPreferred.yml similarity index 100% rename from src/test/spec/json/max-staleness/ReplicaSetNoPrimary/PrimaryPreferred.yml rename to spec/max-staleness/ReplicaSetNoPrimary/PrimaryPreferred.yml diff --git a/src/test/spec/json/max-staleness/ReplicaSetNoPrimary/PrimaryPreferred_tags.json b/spec/max-staleness/ReplicaSetNoPrimary/PrimaryPreferred_tags.json similarity index 100% rename from src/test/spec/json/max-staleness/ReplicaSetNoPrimary/PrimaryPreferred_tags.json rename to spec/max-staleness/ReplicaSetNoPrimary/PrimaryPreferred_tags.json diff --git a/src/test/spec/json/max-staleness/ReplicaSetNoPrimary/PrimaryPreferred_tags.yml b/spec/max-staleness/ReplicaSetNoPrimary/PrimaryPreferred_tags.yml similarity index 100% rename from src/test/spec/json/max-staleness/ReplicaSetNoPrimary/PrimaryPreferred_tags.yml rename to spec/max-staleness/ReplicaSetNoPrimary/PrimaryPreferred_tags.yml diff --git a/src/test/spec/json/max-staleness/ReplicaSetNoPrimary/Secondary.json b/spec/max-staleness/ReplicaSetNoPrimary/Secondary.json similarity index 100% rename from src/test/spec/json/max-staleness/ReplicaSetNoPrimary/Secondary.json rename to spec/max-staleness/ReplicaSetNoPrimary/Secondary.json diff --git a/src/test/spec/json/max-staleness/ReplicaSetNoPrimary/Secondary.yml b/spec/max-staleness/ReplicaSetNoPrimary/Secondary.yml similarity index 100% rename from src/test/spec/json/max-staleness/ReplicaSetNoPrimary/Secondary.yml rename to spec/max-staleness/ReplicaSetNoPrimary/Secondary.yml diff --git a/src/test/spec/json/max-staleness/ReplicaSetNoPrimary/SecondaryPreferred.json b/spec/max-staleness/ReplicaSetNoPrimary/SecondaryPreferred.json similarity index 100% rename from src/test/spec/json/max-staleness/ReplicaSetNoPrimary/SecondaryPreferred.json rename to spec/max-staleness/ReplicaSetNoPrimary/SecondaryPreferred.json diff --git a/src/test/spec/json/max-staleness/ReplicaSetNoPrimary/SecondaryPreferred.yml b/spec/max-staleness/ReplicaSetNoPrimary/SecondaryPreferred.yml similarity index 100% rename from src/test/spec/json/max-staleness/ReplicaSetNoPrimary/SecondaryPreferred.yml rename to spec/max-staleness/ReplicaSetNoPrimary/SecondaryPreferred.yml diff --git a/src/test/spec/json/max-staleness/ReplicaSetNoPrimary/SecondaryPreferred_tags.json b/spec/max-staleness/ReplicaSetNoPrimary/SecondaryPreferred_tags.json similarity index 100% rename from src/test/spec/json/max-staleness/ReplicaSetNoPrimary/SecondaryPreferred_tags.json rename to spec/max-staleness/ReplicaSetNoPrimary/SecondaryPreferred_tags.json diff --git a/src/test/spec/json/max-staleness/ReplicaSetNoPrimary/SecondaryPreferred_tags.yml b/spec/max-staleness/ReplicaSetNoPrimary/SecondaryPreferred_tags.yml similarity index 100% rename from src/test/spec/json/max-staleness/ReplicaSetNoPrimary/SecondaryPreferred_tags.yml rename to spec/max-staleness/ReplicaSetNoPrimary/SecondaryPreferred_tags.yml diff --git a/src/test/spec/json/max-staleness/ReplicaSetNoPrimary/ZeroMaxStaleness.json b/spec/max-staleness/ReplicaSetNoPrimary/ZeroMaxStaleness.json similarity index 100% rename from src/test/spec/json/max-staleness/ReplicaSetNoPrimary/ZeroMaxStaleness.json rename to spec/max-staleness/ReplicaSetNoPrimary/ZeroMaxStaleness.json diff --git a/src/test/spec/json/max-staleness/ReplicaSetNoPrimary/ZeroMaxStaleness.yml b/spec/max-staleness/ReplicaSetNoPrimary/ZeroMaxStaleness.yml similarity index 100% rename from src/test/spec/json/max-staleness/ReplicaSetNoPrimary/ZeroMaxStaleness.yml rename to spec/max-staleness/ReplicaSetNoPrimary/ZeroMaxStaleness.yml diff --git a/src/test/spec/json/max-staleness/ReplicaSetWithPrimary/DefaultNoMaxStaleness.json b/spec/max-staleness/ReplicaSetWithPrimary/DefaultNoMaxStaleness.json similarity index 100% rename from src/test/spec/json/max-staleness/ReplicaSetWithPrimary/DefaultNoMaxStaleness.json rename to spec/max-staleness/ReplicaSetWithPrimary/DefaultNoMaxStaleness.json diff --git a/src/test/spec/json/max-staleness/ReplicaSetWithPrimary/DefaultNoMaxStaleness.yml b/spec/max-staleness/ReplicaSetWithPrimary/DefaultNoMaxStaleness.yml similarity index 100% rename from src/test/spec/json/max-staleness/ReplicaSetWithPrimary/DefaultNoMaxStaleness.yml rename to spec/max-staleness/ReplicaSetWithPrimary/DefaultNoMaxStaleness.yml diff --git a/src/test/spec/json/max-staleness/ReplicaSetWithPrimary/LastUpdateTime.json b/spec/max-staleness/ReplicaSetWithPrimary/LastUpdateTime.json similarity index 100% rename from src/test/spec/json/max-staleness/ReplicaSetWithPrimary/LastUpdateTime.json rename to spec/max-staleness/ReplicaSetWithPrimary/LastUpdateTime.json diff --git a/src/test/spec/json/max-staleness/ReplicaSetWithPrimary/LastUpdateTime.yml b/spec/max-staleness/ReplicaSetWithPrimary/LastUpdateTime.yml similarity index 100% rename from src/test/spec/json/max-staleness/ReplicaSetWithPrimary/LastUpdateTime.yml rename to spec/max-staleness/ReplicaSetWithPrimary/LastUpdateTime.yml diff --git a/src/test/spec/json/max-staleness/ReplicaSetWithPrimary/LongHeartbeat.json b/spec/max-staleness/ReplicaSetWithPrimary/LongHeartbeat.json similarity index 100% rename from src/test/spec/json/max-staleness/ReplicaSetWithPrimary/LongHeartbeat.json rename to spec/max-staleness/ReplicaSetWithPrimary/LongHeartbeat.json diff --git a/src/test/spec/json/max-staleness/ReplicaSetWithPrimary/LongHeartbeat.yml b/spec/max-staleness/ReplicaSetWithPrimary/LongHeartbeat.yml similarity index 100% rename from src/test/spec/json/max-staleness/ReplicaSetWithPrimary/LongHeartbeat.yml rename to spec/max-staleness/ReplicaSetWithPrimary/LongHeartbeat.yml diff --git a/src/test/spec/json/max-staleness/ReplicaSetWithPrimary/LongHeartbeat2.json b/spec/max-staleness/ReplicaSetWithPrimary/LongHeartbeat2.json similarity index 100% rename from src/test/spec/json/max-staleness/ReplicaSetWithPrimary/LongHeartbeat2.json rename to spec/max-staleness/ReplicaSetWithPrimary/LongHeartbeat2.json diff --git a/src/test/spec/json/max-staleness/ReplicaSetWithPrimary/LongHeartbeat2.yml b/spec/max-staleness/ReplicaSetWithPrimary/LongHeartbeat2.yml similarity index 100% rename from src/test/spec/json/max-staleness/ReplicaSetWithPrimary/LongHeartbeat2.yml rename to spec/max-staleness/ReplicaSetWithPrimary/LongHeartbeat2.yml diff --git a/src/test/spec/json/max-staleness/ReplicaSetWithPrimary/MaxStalenessTooSmall.json b/spec/max-staleness/ReplicaSetWithPrimary/MaxStalenessTooSmall.json similarity index 100% rename from src/test/spec/json/max-staleness/ReplicaSetWithPrimary/MaxStalenessTooSmall.json rename to spec/max-staleness/ReplicaSetWithPrimary/MaxStalenessTooSmall.json diff --git a/src/test/spec/json/max-staleness/ReplicaSetWithPrimary/MaxStalenessTooSmall.yml b/spec/max-staleness/ReplicaSetWithPrimary/MaxStalenessTooSmall.yml similarity index 100% rename from src/test/spec/json/max-staleness/ReplicaSetWithPrimary/MaxStalenessTooSmall.yml rename to spec/max-staleness/ReplicaSetWithPrimary/MaxStalenessTooSmall.yml diff --git a/src/test/spec/json/max-staleness/ReplicaSetWithPrimary/MaxStalenessWithModePrimary.json b/spec/max-staleness/ReplicaSetWithPrimary/MaxStalenessWithModePrimary.json similarity index 100% rename from src/test/spec/json/max-staleness/ReplicaSetWithPrimary/MaxStalenessWithModePrimary.json rename to spec/max-staleness/ReplicaSetWithPrimary/MaxStalenessWithModePrimary.json diff --git a/src/test/spec/json/max-staleness/ReplicaSetWithPrimary/MaxStalenessWithModePrimary.yml b/spec/max-staleness/ReplicaSetWithPrimary/MaxStalenessWithModePrimary.yml similarity index 100% rename from src/test/spec/json/max-staleness/ReplicaSetWithPrimary/MaxStalenessWithModePrimary.yml rename to spec/max-staleness/ReplicaSetWithPrimary/MaxStalenessWithModePrimary.yml diff --git a/src/test/spec/json/max-staleness/ReplicaSetWithPrimary/Nearest.json b/spec/max-staleness/ReplicaSetWithPrimary/Nearest.json similarity index 100% rename from src/test/spec/json/max-staleness/ReplicaSetWithPrimary/Nearest.json rename to spec/max-staleness/ReplicaSetWithPrimary/Nearest.json diff --git a/src/test/spec/json/max-staleness/ReplicaSetWithPrimary/Nearest.yml b/spec/max-staleness/ReplicaSetWithPrimary/Nearest.yml similarity index 100% rename from src/test/spec/json/max-staleness/ReplicaSetWithPrimary/Nearest.yml rename to spec/max-staleness/ReplicaSetWithPrimary/Nearest.yml diff --git a/src/test/spec/json/max-staleness/ReplicaSetWithPrimary/Nearest2.json b/spec/max-staleness/ReplicaSetWithPrimary/Nearest2.json similarity index 100% rename from src/test/spec/json/max-staleness/ReplicaSetWithPrimary/Nearest2.json rename to spec/max-staleness/ReplicaSetWithPrimary/Nearest2.json diff --git a/src/test/spec/json/max-staleness/ReplicaSetWithPrimary/Nearest2.yml b/spec/max-staleness/ReplicaSetWithPrimary/Nearest2.yml similarity index 100% rename from src/test/spec/json/max-staleness/ReplicaSetWithPrimary/Nearest2.yml rename to spec/max-staleness/ReplicaSetWithPrimary/Nearest2.yml diff --git a/src/test/spec/json/max-staleness/ReplicaSetWithPrimary/Nearest_tags.json b/spec/max-staleness/ReplicaSetWithPrimary/Nearest_tags.json similarity index 100% rename from src/test/spec/json/max-staleness/ReplicaSetWithPrimary/Nearest_tags.json rename to spec/max-staleness/ReplicaSetWithPrimary/Nearest_tags.json diff --git a/src/test/spec/json/max-staleness/ReplicaSetWithPrimary/Nearest_tags.yml b/spec/max-staleness/ReplicaSetWithPrimary/Nearest_tags.yml similarity index 100% rename from src/test/spec/json/max-staleness/ReplicaSetWithPrimary/Nearest_tags.yml rename to spec/max-staleness/ReplicaSetWithPrimary/Nearest_tags.yml diff --git a/src/test/spec/json/max-staleness/ReplicaSetWithPrimary/PrimaryPreferred.json b/spec/max-staleness/ReplicaSetWithPrimary/PrimaryPreferred.json similarity index 100% rename from src/test/spec/json/max-staleness/ReplicaSetWithPrimary/PrimaryPreferred.json rename to spec/max-staleness/ReplicaSetWithPrimary/PrimaryPreferred.json diff --git a/src/test/spec/json/max-staleness/ReplicaSetWithPrimary/PrimaryPreferred.yml b/spec/max-staleness/ReplicaSetWithPrimary/PrimaryPreferred.yml similarity index 100% rename from src/test/spec/json/max-staleness/ReplicaSetWithPrimary/PrimaryPreferred.yml rename to spec/max-staleness/ReplicaSetWithPrimary/PrimaryPreferred.yml diff --git a/src/test/spec/json/max-staleness/ReplicaSetWithPrimary/SecondaryPreferred.json b/spec/max-staleness/ReplicaSetWithPrimary/SecondaryPreferred.json similarity index 100% rename from src/test/spec/json/max-staleness/ReplicaSetWithPrimary/SecondaryPreferred.json rename to spec/max-staleness/ReplicaSetWithPrimary/SecondaryPreferred.json diff --git a/src/test/spec/json/max-staleness/ReplicaSetWithPrimary/SecondaryPreferred.yml b/spec/max-staleness/ReplicaSetWithPrimary/SecondaryPreferred.yml similarity index 100% rename from src/test/spec/json/max-staleness/ReplicaSetWithPrimary/SecondaryPreferred.yml rename to spec/max-staleness/ReplicaSetWithPrimary/SecondaryPreferred.yml diff --git a/src/test/spec/json/max-staleness/ReplicaSetWithPrimary/SecondaryPreferred_tags.json b/spec/max-staleness/ReplicaSetWithPrimary/SecondaryPreferred_tags.json similarity index 100% rename from src/test/spec/json/max-staleness/ReplicaSetWithPrimary/SecondaryPreferred_tags.json rename to spec/max-staleness/ReplicaSetWithPrimary/SecondaryPreferred_tags.json diff --git a/src/test/spec/json/max-staleness/ReplicaSetWithPrimary/SecondaryPreferred_tags.yml b/spec/max-staleness/ReplicaSetWithPrimary/SecondaryPreferred_tags.yml similarity index 100% rename from src/test/spec/json/max-staleness/ReplicaSetWithPrimary/SecondaryPreferred_tags.yml rename to spec/max-staleness/ReplicaSetWithPrimary/SecondaryPreferred_tags.yml diff --git a/src/test/spec/json/max-staleness/ReplicaSetWithPrimary/SecondaryPreferred_tags2.json b/spec/max-staleness/ReplicaSetWithPrimary/SecondaryPreferred_tags2.json similarity index 100% rename from src/test/spec/json/max-staleness/ReplicaSetWithPrimary/SecondaryPreferred_tags2.json rename to spec/max-staleness/ReplicaSetWithPrimary/SecondaryPreferred_tags2.json diff --git a/src/test/spec/json/max-staleness/ReplicaSetWithPrimary/SecondaryPreferred_tags2.yml b/spec/max-staleness/ReplicaSetWithPrimary/SecondaryPreferred_tags2.yml similarity index 100% rename from src/test/spec/json/max-staleness/ReplicaSetWithPrimary/SecondaryPreferred_tags2.yml rename to spec/max-staleness/ReplicaSetWithPrimary/SecondaryPreferred_tags2.yml diff --git a/src/test/spec/json/max-staleness/ReplicaSetWithPrimary/Secondary_tags.json b/spec/max-staleness/ReplicaSetWithPrimary/Secondary_tags.json similarity index 100% rename from src/test/spec/json/max-staleness/ReplicaSetWithPrimary/Secondary_tags.json rename to spec/max-staleness/ReplicaSetWithPrimary/Secondary_tags.json diff --git a/src/test/spec/json/max-staleness/ReplicaSetWithPrimary/Secondary_tags.yml b/spec/max-staleness/ReplicaSetWithPrimary/Secondary_tags.yml similarity index 100% rename from src/test/spec/json/max-staleness/ReplicaSetWithPrimary/Secondary_tags.yml rename to spec/max-staleness/ReplicaSetWithPrimary/Secondary_tags.yml diff --git a/src/test/spec/json/max-staleness/ReplicaSetWithPrimary/Secondary_tags2.json b/spec/max-staleness/ReplicaSetWithPrimary/Secondary_tags2.json similarity index 100% rename from src/test/spec/json/max-staleness/ReplicaSetWithPrimary/Secondary_tags2.json rename to spec/max-staleness/ReplicaSetWithPrimary/Secondary_tags2.json diff --git a/src/test/spec/json/max-staleness/ReplicaSetWithPrimary/Secondary_tags2.yml b/spec/max-staleness/ReplicaSetWithPrimary/Secondary_tags2.yml similarity index 100% rename from src/test/spec/json/max-staleness/ReplicaSetWithPrimary/Secondary_tags2.yml rename to spec/max-staleness/ReplicaSetWithPrimary/Secondary_tags2.yml diff --git a/src/test/spec/json/max-staleness/ReplicaSetWithPrimary/ZeroMaxStaleness.json b/spec/max-staleness/ReplicaSetWithPrimary/ZeroMaxStaleness.json similarity index 100% rename from src/test/spec/json/max-staleness/ReplicaSetWithPrimary/ZeroMaxStaleness.json rename to spec/max-staleness/ReplicaSetWithPrimary/ZeroMaxStaleness.json diff --git a/src/test/spec/json/max-staleness/ReplicaSetWithPrimary/ZeroMaxStaleness.yml b/spec/max-staleness/ReplicaSetWithPrimary/ZeroMaxStaleness.yml similarity index 100% rename from src/test/spec/json/max-staleness/ReplicaSetWithPrimary/ZeroMaxStaleness.yml rename to spec/max-staleness/ReplicaSetWithPrimary/ZeroMaxStaleness.yml diff --git a/src/test/spec/json/max-staleness/Sharded/SmallMaxStaleness.json b/spec/max-staleness/Sharded/SmallMaxStaleness.json similarity index 100% rename from src/test/spec/json/max-staleness/Sharded/SmallMaxStaleness.json rename to spec/max-staleness/Sharded/SmallMaxStaleness.json diff --git a/src/test/spec/json/max-staleness/Sharded/SmallMaxStaleness.yml b/spec/max-staleness/Sharded/SmallMaxStaleness.yml similarity index 100% rename from src/test/spec/json/max-staleness/Sharded/SmallMaxStaleness.yml rename to spec/max-staleness/Sharded/SmallMaxStaleness.yml diff --git a/src/test/spec/json/max-staleness/Single/SmallMaxStaleness.json b/spec/max-staleness/Single/SmallMaxStaleness.json similarity index 100% rename from src/test/spec/json/max-staleness/Single/SmallMaxStaleness.json rename to spec/max-staleness/Single/SmallMaxStaleness.json diff --git a/src/test/spec/json/max-staleness/Single/SmallMaxStaleness.yml b/spec/max-staleness/Single/SmallMaxStaleness.yml similarity index 100% rename from src/test/spec/json/max-staleness/Single/SmallMaxStaleness.yml rename to spec/max-staleness/Single/SmallMaxStaleness.yml diff --git a/src/test/spec/json/max-staleness/Unknown/SmallMaxStaleness.json b/spec/max-staleness/Unknown/SmallMaxStaleness.json similarity index 100% rename from src/test/spec/json/max-staleness/Unknown/SmallMaxStaleness.json rename to spec/max-staleness/Unknown/SmallMaxStaleness.json diff --git a/src/test/spec/json/max-staleness/Unknown/SmallMaxStaleness.yml b/spec/max-staleness/Unknown/SmallMaxStaleness.yml similarity index 100% rename from src/test/spec/json/max-staleness/Unknown/SmallMaxStaleness.yml rename to spec/max-staleness/Unknown/SmallMaxStaleness.yml diff --git a/src/test/spec/json/mongodb-handshake/README.md b/spec/mongodb-handshake/README.md similarity index 100% rename from src/test/spec/json/mongodb-handshake/README.md rename to spec/mongodb-handshake/README.md diff --git a/src/test/spec/json/mongodb-handshake/unified/metadata-not-propagated.json b/spec/mongodb-handshake/unified/metadata-not-propagated.json similarity index 100% rename from src/test/spec/json/mongodb-handshake/unified/metadata-not-propagated.json rename to spec/mongodb-handshake/unified/metadata-not-propagated.json diff --git a/src/test/spec/json/mongodb-handshake/unified/metadata-not-propagated.yml b/spec/mongodb-handshake/unified/metadata-not-propagated.yml similarity index 100% rename from src/test/spec/json/mongodb-handshake/unified/metadata-not-propagated.yml rename to spec/mongodb-handshake/unified/metadata-not-propagated.yml diff --git a/src/test/spec/json/open-telemetry/README.md b/spec/open-telemetry/README.md similarity index 100% rename from src/test/spec/json/open-telemetry/README.md rename to spec/open-telemetry/README.md diff --git a/src/test/spec/json/open-telemetry/operation/aggregate.json b/spec/open-telemetry/operation/aggregate.json similarity index 100% rename from src/test/spec/json/open-telemetry/operation/aggregate.json rename to spec/open-telemetry/operation/aggregate.json diff --git a/src/test/spec/json/open-telemetry/operation/aggregate.yml b/spec/open-telemetry/operation/aggregate.yml similarity index 100% rename from src/test/spec/json/open-telemetry/operation/aggregate.yml rename to spec/open-telemetry/operation/aggregate.yml diff --git a/src/test/spec/json/open-telemetry/operation/atlas_search.json b/spec/open-telemetry/operation/atlas_search.json similarity index 100% rename from src/test/spec/json/open-telemetry/operation/atlas_search.json rename to spec/open-telemetry/operation/atlas_search.json diff --git a/src/test/spec/json/open-telemetry/operation/atlas_search.yml b/spec/open-telemetry/operation/atlas_search.yml similarity index 100% rename from src/test/spec/json/open-telemetry/operation/atlas_search.yml rename to spec/open-telemetry/operation/atlas_search.yml diff --git a/src/test/spec/json/open-telemetry/operation/bulk_write.json b/spec/open-telemetry/operation/bulk_write.json similarity index 100% rename from src/test/spec/json/open-telemetry/operation/bulk_write.json rename to spec/open-telemetry/operation/bulk_write.json diff --git a/src/test/spec/json/open-telemetry/operation/bulk_write.yml b/spec/open-telemetry/operation/bulk_write.yml similarity index 100% rename from src/test/spec/json/open-telemetry/operation/bulk_write.yml rename to spec/open-telemetry/operation/bulk_write.yml diff --git a/src/test/spec/json/open-telemetry/operation/count.json b/spec/open-telemetry/operation/count.json similarity index 100% rename from src/test/spec/json/open-telemetry/operation/count.json rename to spec/open-telemetry/operation/count.json diff --git a/src/test/spec/json/open-telemetry/operation/count.yml b/spec/open-telemetry/operation/count.yml similarity index 100% rename from src/test/spec/json/open-telemetry/operation/count.yml rename to spec/open-telemetry/operation/count.yml diff --git a/src/test/spec/json/open-telemetry/operation/create_collection.json b/spec/open-telemetry/operation/create_collection.json similarity index 100% rename from src/test/spec/json/open-telemetry/operation/create_collection.json rename to spec/open-telemetry/operation/create_collection.json diff --git a/src/test/spec/json/open-telemetry/operation/create_collection.yml b/spec/open-telemetry/operation/create_collection.yml similarity index 100% rename from src/test/spec/json/open-telemetry/operation/create_collection.yml rename to spec/open-telemetry/operation/create_collection.yml diff --git a/src/test/spec/json/open-telemetry/operation/create_indexes.json b/spec/open-telemetry/operation/create_indexes.json similarity index 100% rename from src/test/spec/json/open-telemetry/operation/create_indexes.json rename to spec/open-telemetry/operation/create_indexes.json diff --git a/src/test/spec/json/open-telemetry/operation/create_indexes.yml b/spec/open-telemetry/operation/create_indexes.yml similarity index 100% rename from src/test/spec/json/open-telemetry/operation/create_indexes.yml rename to spec/open-telemetry/operation/create_indexes.yml diff --git a/src/test/spec/json/open-telemetry/operation/delete.json b/spec/open-telemetry/operation/delete.json similarity index 100% rename from src/test/spec/json/open-telemetry/operation/delete.json rename to spec/open-telemetry/operation/delete.json diff --git a/src/test/spec/json/open-telemetry/operation/delete.yml b/spec/open-telemetry/operation/delete.yml similarity index 100% rename from src/test/spec/json/open-telemetry/operation/delete.yml rename to spec/open-telemetry/operation/delete.yml diff --git a/src/test/spec/json/open-telemetry/operation/distinct.json b/spec/open-telemetry/operation/distinct.json similarity index 100% rename from src/test/spec/json/open-telemetry/operation/distinct.json rename to spec/open-telemetry/operation/distinct.json diff --git a/src/test/spec/json/open-telemetry/operation/distinct.yml b/spec/open-telemetry/operation/distinct.yml similarity index 100% rename from src/test/spec/json/open-telemetry/operation/distinct.yml rename to spec/open-telemetry/operation/distinct.yml diff --git a/src/test/spec/json/open-telemetry/operation/drop_collection.json b/spec/open-telemetry/operation/drop_collection.json similarity index 100% rename from src/test/spec/json/open-telemetry/operation/drop_collection.json rename to spec/open-telemetry/operation/drop_collection.json diff --git a/src/test/spec/json/open-telemetry/operation/drop_collection.yml b/spec/open-telemetry/operation/drop_collection.yml similarity index 100% rename from src/test/spec/json/open-telemetry/operation/drop_collection.yml rename to spec/open-telemetry/operation/drop_collection.yml diff --git a/src/test/spec/json/open-telemetry/operation/drop_indexes.json b/spec/open-telemetry/operation/drop_indexes.json similarity index 100% rename from src/test/spec/json/open-telemetry/operation/drop_indexes.json rename to spec/open-telemetry/operation/drop_indexes.json diff --git a/src/test/spec/json/open-telemetry/operation/drop_indexes.yml b/spec/open-telemetry/operation/drop_indexes.yml similarity index 100% rename from src/test/spec/json/open-telemetry/operation/drop_indexes.yml rename to spec/open-telemetry/operation/drop_indexes.yml diff --git a/src/test/spec/json/open-telemetry/operation/find.json b/spec/open-telemetry/operation/find.json similarity index 100% rename from src/test/spec/json/open-telemetry/operation/find.json rename to spec/open-telemetry/operation/find.json diff --git a/src/test/spec/json/open-telemetry/operation/find.yml b/spec/open-telemetry/operation/find.yml similarity index 100% rename from src/test/spec/json/open-telemetry/operation/find.yml rename to spec/open-telemetry/operation/find.yml diff --git a/src/test/spec/json/open-telemetry/operation/find_and_modify.json b/spec/open-telemetry/operation/find_and_modify.json similarity index 100% rename from src/test/spec/json/open-telemetry/operation/find_and_modify.json rename to spec/open-telemetry/operation/find_and_modify.json diff --git a/src/test/spec/json/open-telemetry/operation/find_and_modify.yml b/spec/open-telemetry/operation/find_and_modify.yml similarity index 100% rename from src/test/spec/json/open-telemetry/operation/find_and_modify.yml rename to spec/open-telemetry/operation/find_and_modify.yml diff --git a/src/test/spec/json/open-telemetry/operation/find_without_query_text.json b/spec/open-telemetry/operation/find_without_query_text.json similarity index 100% rename from src/test/spec/json/open-telemetry/operation/find_without_query_text.json rename to spec/open-telemetry/operation/find_without_query_text.json diff --git a/src/test/spec/json/open-telemetry/operation/find_without_query_text.yml b/spec/open-telemetry/operation/find_without_query_text.yml similarity index 100% rename from src/test/spec/json/open-telemetry/operation/find_without_query_text.yml rename to spec/open-telemetry/operation/find_without_query_text.yml diff --git a/src/test/spec/json/open-telemetry/operation/insert.json b/spec/open-telemetry/operation/insert.json similarity index 100% rename from src/test/spec/json/open-telemetry/operation/insert.json rename to spec/open-telemetry/operation/insert.json diff --git a/src/test/spec/json/open-telemetry/operation/insert.yml b/spec/open-telemetry/operation/insert.yml similarity index 100% rename from src/test/spec/json/open-telemetry/operation/insert.yml rename to spec/open-telemetry/operation/insert.yml diff --git a/src/test/spec/json/open-telemetry/operation/list_collections.json b/spec/open-telemetry/operation/list_collections.json similarity index 100% rename from src/test/spec/json/open-telemetry/operation/list_collections.json rename to spec/open-telemetry/operation/list_collections.json diff --git a/src/test/spec/json/open-telemetry/operation/list_collections.yml b/spec/open-telemetry/operation/list_collections.yml similarity index 100% rename from src/test/spec/json/open-telemetry/operation/list_collections.yml rename to spec/open-telemetry/operation/list_collections.yml diff --git a/src/test/spec/json/open-telemetry/operation/list_databases.json b/spec/open-telemetry/operation/list_databases.json similarity index 100% rename from src/test/spec/json/open-telemetry/operation/list_databases.json rename to spec/open-telemetry/operation/list_databases.json diff --git a/src/test/spec/json/open-telemetry/operation/list_databases.yml b/spec/open-telemetry/operation/list_databases.yml similarity index 100% rename from src/test/spec/json/open-telemetry/operation/list_databases.yml rename to spec/open-telemetry/operation/list_databases.yml diff --git a/src/test/spec/json/open-telemetry/operation/list_indexes.json b/spec/open-telemetry/operation/list_indexes.json similarity index 100% rename from src/test/spec/json/open-telemetry/operation/list_indexes.json rename to spec/open-telemetry/operation/list_indexes.json diff --git a/src/test/spec/json/open-telemetry/operation/list_indexes.yml b/spec/open-telemetry/operation/list_indexes.yml similarity index 100% rename from src/test/spec/json/open-telemetry/operation/list_indexes.yml rename to spec/open-telemetry/operation/list_indexes.yml diff --git a/src/test/spec/json/open-telemetry/operation/map_reduce.json b/spec/open-telemetry/operation/map_reduce.json similarity index 100% rename from src/test/spec/json/open-telemetry/operation/map_reduce.json rename to spec/open-telemetry/operation/map_reduce.json diff --git a/src/test/spec/json/open-telemetry/operation/map_reduce.yml b/spec/open-telemetry/operation/map_reduce.yml similarity index 100% rename from src/test/spec/json/open-telemetry/operation/map_reduce.yml rename to spec/open-telemetry/operation/map_reduce.yml diff --git a/src/test/spec/json/open-telemetry/operation/retries.json b/spec/open-telemetry/operation/retries.json similarity index 100% rename from src/test/spec/json/open-telemetry/operation/retries.json rename to spec/open-telemetry/operation/retries.json diff --git a/src/test/spec/json/open-telemetry/operation/retries.yml b/spec/open-telemetry/operation/retries.yml similarity index 100% rename from src/test/spec/json/open-telemetry/operation/retries.yml rename to spec/open-telemetry/operation/retries.yml diff --git a/src/test/spec/json/open-telemetry/operation/update.json b/spec/open-telemetry/operation/update.json similarity index 100% rename from src/test/spec/json/open-telemetry/operation/update.json rename to spec/open-telemetry/operation/update.json diff --git a/src/test/spec/json/open-telemetry/operation/update.yml b/spec/open-telemetry/operation/update.yml similarity index 100% rename from src/test/spec/json/open-telemetry/operation/update.yml rename to spec/open-telemetry/operation/update.yml diff --git a/src/test/spec/json/open-telemetry/transaction/convenient.json b/spec/open-telemetry/transaction/convenient.json similarity index 100% rename from src/test/spec/json/open-telemetry/transaction/convenient.json rename to spec/open-telemetry/transaction/convenient.json diff --git a/src/test/spec/json/open-telemetry/transaction/convenient.yml b/spec/open-telemetry/transaction/convenient.yml similarity index 100% rename from src/test/spec/json/open-telemetry/transaction/convenient.yml rename to spec/open-telemetry/transaction/convenient.yml diff --git a/src/test/spec/json/open-telemetry/transaction/core_api.json b/spec/open-telemetry/transaction/core_api.json similarity index 100% rename from src/test/spec/json/open-telemetry/transaction/core_api.json rename to spec/open-telemetry/transaction/core_api.json diff --git a/src/test/spec/json/open-telemetry/transaction/core_api.yml b/spec/open-telemetry/transaction/core_api.yml similarity index 100% rename from src/test/spec/json/open-telemetry/transaction/core_api.yml rename to spec/open-telemetry/transaction/core_api.yml diff --git a/src/test/spec/json/read-write-concern/README.rst b/spec/read-write-concern/README.rst similarity index 100% rename from src/test/spec/json/read-write-concern/README.rst rename to spec/read-write-concern/README.rst diff --git a/src/test/spec/json/read-write-concern/connection-string/read-concern.json b/spec/read-write-concern/connection-string/read-concern.json similarity index 100% rename from src/test/spec/json/read-write-concern/connection-string/read-concern.json rename to spec/read-write-concern/connection-string/read-concern.json diff --git a/src/test/spec/json/read-write-concern/connection-string/read-concern.yml b/spec/read-write-concern/connection-string/read-concern.yml similarity index 100% rename from src/test/spec/json/read-write-concern/connection-string/read-concern.yml rename to spec/read-write-concern/connection-string/read-concern.yml diff --git a/src/test/spec/json/read-write-concern/connection-string/write-concern.json b/spec/read-write-concern/connection-string/write-concern.json similarity index 100% rename from src/test/spec/json/read-write-concern/connection-string/write-concern.json rename to spec/read-write-concern/connection-string/write-concern.json diff --git a/src/test/spec/json/read-write-concern/connection-string/write-concern.yml b/spec/read-write-concern/connection-string/write-concern.yml similarity index 100% rename from src/test/spec/json/read-write-concern/connection-string/write-concern.yml rename to spec/read-write-concern/connection-string/write-concern.yml diff --git a/src/test/spec/json/read-write-concern/document/read-concern.json b/spec/read-write-concern/document/read-concern.json similarity index 100% rename from src/test/spec/json/read-write-concern/document/read-concern.json rename to spec/read-write-concern/document/read-concern.json diff --git a/src/test/spec/json/read-write-concern/document/read-concern.yml b/spec/read-write-concern/document/read-concern.yml similarity index 100% rename from src/test/spec/json/read-write-concern/document/read-concern.yml rename to spec/read-write-concern/document/read-concern.yml diff --git a/src/test/spec/json/read-write-concern/document/write-concern.json b/spec/read-write-concern/document/write-concern.json similarity index 100% rename from src/test/spec/json/read-write-concern/document/write-concern.json rename to spec/read-write-concern/document/write-concern.json diff --git a/src/test/spec/json/read-write-concern/document/write-concern.yml b/spec/read-write-concern/document/write-concern.yml similarity index 100% rename from src/test/spec/json/read-write-concern/document/write-concern.yml rename to spec/read-write-concern/document/write-concern.yml diff --git a/src/test/spec/json/read-write-concern/operation/default-write-concern-2.6.json b/spec/read-write-concern/operation/default-write-concern-2.6.json similarity index 100% rename from src/test/spec/json/read-write-concern/operation/default-write-concern-2.6.json rename to spec/read-write-concern/operation/default-write-concern-2.6.json diff --git a/src/test/spec/json/read-write-concern/operation/default-write-concern-2.6.yml b/spec/read-write-concern/operation/default-write-concern-2.6.yml similarity index 100% rename from src/test/spec/json/read-write-concern/operation/default-write-concern-2.6.yml rename to spec/read-write-concern/operation/default-write-concern-2.6.yml diff --git a/src/test/spec/json/read-write-concern/operation/default-write-concern-3.2.json b/spec/read-write-concern/operation/default-write-concern-3.2.json similarity index 100% rename from src/test/spec/json/read-write-concern/operation/default-write-concern-3.2.json rename to spec/read-write-concern/operation/default-write-concern-3.2.json diff --git a/src/test/spec/json/read-write-concern/operation/default-write-concern-3.2.yml b/spec/read-write-concern/operation/default-write-concern-3.2.yml similarity index 100% rename from src/test/spec/json/read-write-concern/operation/default-write-concern-3.2.yml rename to spec/read-write-concern/operation/default-write-concern-3.2.yml diff --git a/src/test/spec/json/read-write-concern/operation/default-write-concern-3.4.json b/spec/read-write-concern/operation/default-write-concern-3.4.json similarity index 100% rename from src/test/spec/json/read-write-concern/operation/default-write-concern-3.4.json rename to spec/read-write-concern/operation/default-write-concern-3.4.json diff --git a/src/test/spec/json/read-write-concern/operation/default-write-concern-3.4.yml b/spec/read-write-concern/operation/default-write-concern-3.4.yml similarity index 100% rename from src/test/spec/json/read-write-concern/operation/default-write-concern-3.4.yml rename to spec/read-write-concern/operation/default-write-concern-3.4.yml diff --git a/src/test/spec/json/read-write-concern/operation/default-write-concern-4.2.json b/spec/read-write-concern/operation/default-write-concern-4.2.json similarity index 100% rename from src/test/spec/json/read-write-concern/operation/default-write-concern-4.2.json rename to spec/read-write-concern/operation/default-write-concern-4.2.json diff --git a/src/test/spec/json/read-write-concern/operation/default-write-concern-4.2.yml b/spec/read-write-concern/operation/default-write-concern-4.2.yml similarity index 100% rename from src/test/spec/json/read-write-concern/operation/default-write-concern-4.2.yml rename to spec/read-write-concern/operation/default-write-concern-4.2.yml diff --git a/src/test/spec/json/retryable-reads/README.md b/spec/retryable-reads/README.md similarity index 100% rename from src/test/spec/json/retryable-reads/README.md rename to spec/retryable-reads/README.md diff --git a/src/test/spec/json/retryable-reads/etc/templates/handshakeError.yml.template b/spec/retryable-reads/etc/templates/handshakeError.yml.template similarity index 100% rename from src/test/spec/json/retryable-reads/etc/templates/handshakeError.yml.template rename to spec/retryable-reads/etc/templates/handshakeError.yml.template diff --git a/src/test/spec/json/retryable-reads/unified/aggregate-merge.json b/spec/retryable-reads/unified/aggregate-merge.json similarity index 100% rename from src/test/spec/json/retryable-reads/unified/aggregate-merge.json rename to spec/retryable-reads/unified/aggregate-merge.json diff --git a/src/test/spec/json/retryable-reads/unified/aggregate-merge.yml b/spec/retryable-reads/unified/aggregate-merge.yml similarity index 100% rename from src/test/spec/json/retryable-reads/unified/aggregate-merge.yml rename to spec/retryable-reads/unified/aggregate-merge.yml diff --git a/src/test/spec/json/retryable-reads/unified/aggregate-serverErrors.json b/spec/retryable-reads/unified/aggregate-serverErrors.json similarity index 100% rename from src/test/spec/json/retryable-reads/unified/aggregate-serverErrors.json rename to spec/retryable-reads/unified/aggregate-serverErrors.json diff --git a/src/test/spec/json/retryable-reads/unified/aggregate-serverErrors.yml b/spec/retryable-reads/unified/aggregate-serverErrors.yml similarity index 100% rename from src/test/spec/json/retryable-reads/unified/aggregate-serverErrors.yml rename to spec/retryable-reads/unified/aggregate-serverErrors.yml diff --git a/src/test/spec/json/retryable-reads/unified/aggregate.json b/spec/retryable-reads/unified/aggregate.json similarity index 100% rename from src/test/spec/json/retryable-reads/unified/aggregate.json rename to spec/retryable-reads/unified/aggregate.json diff --git a/src/test/spec/json/retryable-reads/unified/aggregate.yml b/spec/retryable-reads/unified/aggregate.yml similarity index 100% rename from src/test/spec/json/retryable-reads/unified/aggregate.yml rename to spec/retryable-reads/unified/aggregate.yml diff --git a/src/test/spec/json/retryable-reads/unified/changeStreams-client.watch-serverErrors.json b/spec/retryable-reads/unified/changeStreams-client.watch-serverErrors.json similarity index 100% rename from src/test/spec/json/retryable-reads/unified/changeStreams-client.watch-serverErrors.json rename to spec/retryable-reads/unified/changeStreams-client.watch-serverErrors.json diff --git a/src/test/spec/json/retryable-reads/unified/changeStreams-client.watch-serverErrors.yml b/spec/retryable-reads/unified/changeStreams-client.watch-serverErrors.yml similarity index 100% rename from src/test/spec/json/retryable-reads/unified/changeStreams-client.watch-serverErrors.yml rename to spec/retryable-reads/unified/changeStreams-client.watch-serverErrors.yml diff --git a/src/test/spec/json/retryable-reads/unified/changeStreams-client.watch.json b/spec/retryable-reads/unified/changeStreams-client.watch.json similarity index 100% rename from src/test/spec/json/retryable-reads/unified/changeStreams-client.watch.json rename to spec/retryable-reads/unified/changeStreams-client.watch.json diff --git a/src/test/spec/json/retryable-reads/unified/changeStreams-client.watch.yml b/spec/retryable-reads/unified/changeStreams-client.watch.yml similarity index 100% rename from src/test/spec/json/retryable-reads/unified/changeStreams-client.watch.yml rename to spec/retryable-reads/unified/changeStreams-client.watch.yml diff --git a/src/test/spec/json/retryable-reads/unified/changeStreams-db.coll.watch-serverErrors.json b/spec/retryable-reads/unified/changeStreams-db.coll.watch-serverErrors.json similarity index 100% rename from src/test/spec/json/retryable-reads/unified/changeStreams-db.coll.watch-serverErrors.json rename to spec/retryable-reads/unified/changeStreams-db.coll.watch-serverErrors.json diff --git a/src/test/spec/json/retryable-reads/unified/changeStreams-db.coll.watch-serverErrors.yml b/spec/retryable-reads/unified/changeStreams-db.coll.watch-serverErrors.yml similarity index 100% rename from src/test/spec/json/retryable-reads/unified/changeStreams-db.coll.watch-serverErrors.yml rename to spec/retryable-reads/unified/changeStreams-db.coll.watch-serverErrors.yml diff --git a/src/test/spec/json/retryable-reads/unified/changeStreams-db.coll.watch.json b/spec/retryable-reads/unified/changeStreams-db.coll.watch.json similarity index 100% rename from src/test/spec/json/retryable-reads/unified/changeStreams-db.coll.watch.json rename to spec/retryable-reads/unified/changeStreams-db.coll.watch.json diff --git a/src/test/spec/json/retryable-reads/unified/changeStreams-db.coll.watch.yml b/spec/retryable-reads/unified/changeStreams-db.coll.watch.yml similarity index 100% rename from src/test/spec/json/retryable-reads/unified/changeStreams-db.coll.watch.yml rename to spec/retryable-reads/unified/changeStreams-db.coll.watch.yml diff --git a/src/test/spec/json/retryable-reads/unified/changeStreams-db.watch-serverErrors.json b/spec/retryable-reads/unified/changeStreams-db.watch-serverErrors.json similarity index 100% rename from src/test/spec/json/retryable-reads/unified/changeStreams-db.watch-serverErrors.json rename to spec/retryable-reads/unified/changeStreams-db.watch-serverErrors.json diff --git a/src/test/spec/json/retryable-reads/unified/changeStreams-db.watch-serverErrors.yml b/spec/retryable-reads/unified/changeStreams-db.watch-serverErrors.yml similarity index 100% rename from src/test/spec/json/retryable-reads/unified/changeStreams-db.watch-serverErrors.yml rename to spec/retryable-reads/unified/changeStreams-db.watch-serverErrors.yml diff --git a/src/test/spec/json/retryable-reads/unified/changeStreams-db.watch.json b/spec/retryable-reads/unified/changeStreams-db.watch.json similarity index 100% rename from src/test/spec/json/retryable-reads/unified/changeStreams-db.watch.json rename to spec/retryable-reads/unified/changeStreams-db.watch.json diff --git a/src/test/spec/json/retryable-reads/unified/changeStreams-db.watch.yml b/spec/retryable-reads/unified/changeStreams-db.watch.yml similarity index 100% rename from src/test/spec/json/retryable-reads/unified/changeStreams-db.watch.yml rename to spec/retryable-reads/unified/changeStreams-db.watch.yml diff --git a/src/test/spec/json/retryable-reads/unified/count-serverErrors.json b/spec/retryable-reads/unified/count-serverErrors.json similarity index 100% rename from src/test/spec/json/retryable-reads/unified/count-serverErrors.json rename to spec/retryable-reads/unified/count-serverErrors.json diff --git a/src/test/spec/json/retryable-reads/unified/count-serverErrors.yml b/spec/retryable-reads/unified/count-serverErrors.yml similarity index 100% rename from src/test/spec/json/retryable-reads/unified/count-serverErrors.yml rename to spec/retryable-reads/unified/count-serverErrors.yml diff --git a/src/test/spec/json/retryable-reads/unified/count.json b/spec/retryable-reads/unified/count.json similarity index 100% rename from src/test/spec/json/retryable-reads/unified/count.json rename to spec/retryable-reads/unified/count.json diff --git a/src/test/spec/json/retryable-reads/unified/count.yml b/spec/retryable-reads/unified/count.yml similarity index 100% rename from src/test/spec/json/retryable-reads/unified/count.yml rename to spec/retryable-reads/unified/count.yml diff --git a/src/test/spec/json/retryable-reads/unified/countDocuments-serverErrors.json b/spec/retryable-reads/unified/countDocuments-serverErrors.json similarity index 100% rename from src/test/spec/json/retryable-reads/unified/countDocuments-serverErrors.json rename to spec/retryable-reads/unified/countDocuments-serverErrors.json diff --git a/src/test/spec/json/retryable-reads/unified/countDocuments-serverErrors.yml b/spec/retryable-reads/unified/countDocuments-serverErrors.yml similarity index 100% rename from src/test/spec/json/retryable-reads/unified/countDocuments-serverErrors.yml rename to spec/retryable-reads/unified/countDocuments-serverErrors.yml diff --git a/src/test/spec/json/retryable-reads/unified/countDocuments.json b/spec/retryable-reads/unified/countDocuments.json similarity index 100% rename from src/test/spec/json/retryable-reads/unified/countDocuments.json rename to spec/retryable-reads/unified/countDocuments.json diff --git a/src/test/spec/json/retryable-reads/unified/countDocuments.yml b/spec/retryable-reads/unified/countDocuments.yml similarity index 100% rename from src/test/spec/json/retryable-reads/unified/countDocuments.yml rename to spec/retryable-reads/unified/countDocuments.yml diff --git a/src/test/spec/json/retryable-reads/unified/distinct-serverErrors.json b/spec/retryable-reads/unified/distinct-serverErrors.json similarity index 100% rename from src/test/spec/json/retryable-reads/unified/distinct-serverErrors.json rename to spec/retryable-reads/unified/distinct-serverErrors.json diff --git a/src/test/spec/json/retryable-reads/unified/distinct-serverErrors.yml b/spec/retryable-reads/unified/distinct-serverErrors.yml similarity index 100% rename from src/test/spec/json/retryable-reads/unified/distinct-serverErrors.yml rename to spec/retryable-reads/unified/distinct-serverErrors.yml diff --git a/src/test/spec/json/retryable-reads/unified/distinct.json b/spec/retryable-reads/unified/distinct.json similarity index 100% rename from src/test/spec/json/retryable-reads/unified/distinct.json rename to spec/retryable-reads/unified/distinct.json diff --git a/src/test/spec/json/retryable-reads/unified/distinct.yml b/spec/retryable-reads/unified/distinct.yml similarity index 100% rename from src/test/spec/json/retryable-reads/unified/distinct.yml rename to spec/retryable-reads/unified/distinct.yml diff --git a/src/test/spec/json/retryable-reads/unified/estimatedDocumentCount-serverErrors.json b/spec/retryable-reads/unified/estimatedDocumentCount-serverErrors.json similarity index 100% rename from src/test/spec/json/retryable-reads/unified/estimatedDocumentCount-serverErrors.json rename to spec/retryable-reads/unified/estimatedDocumentCount-serverErrors.json diff --git a/src/test/spec/json/retryable-reads/unified/estimatedDocumentCount-serverErrors.yml b/spec/retryable-reads/unified/estimatedDocumentCount-serverErrors.yml similarity index 100% rename from src/test/spec/json/retryable-reads/unified/estimatedDocumentCount-serverErrors.yml rename to spec/retryable-reads/unified/estimatedDocumentCount-serverErrors.yml diff --git a/src/test/spec/json/retryable-reads/unified/estimatedDocumentCount.json b/spec/retryable-reads/unified/estimatedDocumentCount.json similarity index 100% rename from src/test/spec/json/retryable-reads/unified/estimatedDocumentCount.json rename to spec/retryable-reads/unified/estimatedDocumentCount.json diff --git a/src/test/spec/json/retryable-reads/unified/estimatedDocumentCount.yml b/spec/retryable-reads/unified/estimatedDocumentCount.yml similarity index 100% rename from src/test/spec/json/retryable-reads/unified/estimatedDocumentCount.yml rename to spec/retryable-reads/unified/estimatedDocumentCount.yml diff --git a/src/test/spec/json/retryable-reads/unified/exceededTimeLimit.json b/spec/retryable-reads/unified/exceededTimeLimit.json similarity index 100% rename from src/test/spec/json/retryable-reads/unified/exceededTimeLimit.json rename to spec/retryable-reads/unified/exceededTimeLimit.json diff --git a/src/test/spec/json/retryable-reads/unified/exceededTimeLimit.yml b/spec/retryable-reads/unified/exceededTimeLimit.yml similarity index 100% rename from src/test/spec/json/retryable-reads/unified/exceededTimeLimit.yml rename to spec/retryable-reads/unified/exceededTimeLimit.yml diff --git a/src/test/spec/json/retryable-reads/unified/find-serverErrors.json b/spec/retryable-reads/unified/find-serverErrors.json similarity index 100% rename from src/test/spec/json/retryable-reads/unified/find-serverErrors.json rename to spec/retryable-reads/unified/find-serverErrors.json diff --git a/src/test/spec/json/retryable-reads/unified/find-serverErrors.yml b/spec/retryable-reads/unified/find-serverErrors.yml similarity index 100% rename from src/test/spec/json/retryable-reads/unified/find-serverErrors.yml rename to spec/retryable-reads/unified/find-serverErrors.yml diff --git a/src/test/spec/json/retryable-reads/unified/find.json b/spec/retryable-reads/unified/find.json similarity index 100% rename from src/test/spec/json/retryable-reads/unified/find.json rename to spec/retryable-reads/unified/find.json diff --git a/src/test/spec/json/retryable-reads/unified/find.yml b/spec/retryable-reads/unified/find.yml similarity index 100% rename from src/test/spec/json/retryable-reads/unified/find.yml rename to spec/retryable-reads/unified/find.yml diff --git a/src/test/spec/json/retryable-reads/unified/findOne-serverErrors.json b/spec/retryable-reads/unified/findOne-serverErrors.json similarity index 100% rename from src/test/spec/json/retryable-reads/unified/findOne-serverErrors.json rename to spec/retryable-reads/unified/findOne-serverErrors.json diff --git a/src/test/spec/json/retryable-reads/unified/findOne-serverErrors.yml b/spec/retryable-reads/unified/findOne-serverErrors.yml similarity index 100% rename from src/test/spec/json/retryable-reads/unified/findOne-serverErrors.yml rename to spec/retryable-reads/unified/findOne-serverErrors.yml diff --git a/src/test/spec/json/retryable-reads/unified/findOne.json b/spec/retryable-reads/unified/findOne.json similarity index 100% rename from src/test/spec/json/retryable-reads/unified/findOne.json rename to spec/retryable-reads/unified/findOne.json diff --git a/src/test/spec/json/retryable-reads/unified/findOne.yml b/spec/retryable-reads/unified/findOne.yml similarity index 100% rename from src/test/spec/json/retryable-reads/unified/findOne.yml rename to spec/retryable-reads/unified/findOne.yml diff --git a/src/test/spec/json/retryable-reads/unified/gridfs-download-serverErrors.json b/spec/retryable-reads/unified/gridfs-download-serverErrors.json similarity index 100% rename from src/test/spec/json/retryable-reads/unified/gridfs-download-serverErrors.json rename to spec/retryable-reads/unified/gridfs-download-serverErrors.json diff --git a/src/test/spec/json/retryable-reads/unified/gridfs-download-serverErrors.yml b/spec/retryable-reads/unified/gridfs-download-serverErrors.yml similarity index 100% rename from src/test/spec/json/retryable-reads/unified/gridfs-download-serverErrors.yml rename to spec/retryable-reads/unified/gridfs-download-serverErrors.yml diff --git a/src/test/spec/json/retryable-reads/unified/gridfs-download.json b/spec/retryable-reads/unified/gridfs-download.json similarity index 100% rename from src/test/spec/json/retryable-reads/unified/gridfs-download.json rename to spec/retryable-reads/unified/gridfs-download.json diff --git a/src/test/spec/json/retryable-reads/unified/gridfs-download.yml b/spec/retryable-reads/unified/gridfs-download.yml similarity index 100% rename from src/test/spec/json/retryable-reads/unified/gridfs-download.yml rename to spec/retryable-reads/unified/gridfs-download.yml diff --git a/src/test/spec/json/retryable-reads/unified/gridfs-downloadByName-serverErrors.json b/spec/retryable-reads/unified/gridfs-downloadByName-serverErrors.json similarity index 100% rename from src/test/spec/json/retryable-reads/unified/gridfs-downloadByName-serverErrors.json rename to spec/retryable-reads/unified/gridfs-downloadByName-serverErrors.json diff --git a/src/test/spec/json/retryable-reads/unified/gridfs-downloadByName-serverErrors.yml b/spec/retryable-reads/unified/gridfs-downloadByName-serverErrors.yml similarity index 100% rename from src/test/spec/json/retryable-reads/unified/gridfs-downloadByName-serverErrors.yml rename to spec/retryable-reads/unified/gridfs-downloadByName-serverErrors.yml diff --git a/src/test/spec/json/retryable-reads/unified/gridfs-downloadByName.json b/spec/retryable-reads/unified/gridfs-downloadByName.json similarity index 100% rename from src/test/spec/json/retryable-reads/unified/gridfs-downloadByName.json rename to spec/retryable-reads/unified/gridfs-downloadByName.json diff --git a/src/test/spec/json/retryable-reads/unified/gridfs-downloadByName.yml b/spec/retryable-reads/unified/gridfs-downloadByName.yml similarity index 100% rename from src/test/spec/json/retryable-reads/unified/gridfs-downloadByName.yml rename to spec/retryable-reads/unified/gridfs-downloadByName.yml diff --git a/src/test/spec/json/retryable-reads/unified/handshakeError.json b/spec/retryable-reads/unified/handshakeError.json similarity index 100% rename from src/test/spec/json/retryable-reads/unified/handshakeError.json rename to spec/retryable-reads/unified/handshakeError.json diff --git a/src/test/spec/json/retryable-reads/unified/handshakeError.yml b/spec/retryable-reads/unified/handshakeError.yml similarity index 100% rename from src/test/spec/json/retryable-reads/unified/handshakeError.yml rename to spec/retryable-reads/unified/handshakeError.yml diff --git a/src/test/spec/json/retryable-reads/unified/listCollectionNames-serverErrors.json b/spec/retryable-reads/unified/listCollectionNames-serverErrors.json similarity index 100% rename from src/test/spec/json/retryable-reads/unified/listCollectionNames-serverErrors.json rename to spec/retryable-reads/unified/listCollectionNames-serverErrors.json diff --git a/src/test/spec/json/retryable-reads/unified/listCollectionNames-serverErrors.yml b/spec/retryable-reads/unified/listCollectionNames-serverErrors.yml similarity index 100% rename from src/test/spec/json/retryable-reads/unified/listCollectionNames-serverErrors.yml rename to spec/retryable-reads/unified/listCollectionNames-serverErrors.yml diff --git a/src/test/spec/json/retryable-reads/unified/listCollectionNames.json b/spec/retryable-reads/unified/listCollectionNames.json similarity index 100% rename from src/test/spec/json/retryable-reads/unified/listCollectionNames.json rename to spec/retryable-reads/unified/listCollectionNames.json diff --git a/src/test/spec/json/retryable-reads/unified/listCollectionNames.yml b/spec/retryable-reads/unified/listCollectionNames.yml similarity index 100% rename from src/test/spec/json/retryable-reads/unified/listCollectionNames.yml rename to spec/retryable-reads/unified/listCollectionNames.yml diff --git a/src/test/spec/json/retryable-reads/unified/listCollectionObjects-serverErrors.json b/spec/retryable-reads/unified/listCollectionObjects-serverErrors.json similarity index 100% rename from src/test/spec/json/retryable-reads/unified/listCollectionObjects-serverErrors.json rename to spec/retryable-reads/unified/listCollectionObjects-serverErrors.json diff --git a/src/test/spec/json/retryable-reads/unified/listCollectionObjects-serverErrors.yml b/spec/retryable-reads/unified/listCollectionObjects-serverErrors.yml similarity index 100% rename from src/test/spec/json/retryable-reads/unified/listCollectionObjects-serverErrors.yml rename to spec/retryable-reads/unified/listCollectionObjects-serverErrors.yml diff --git a/src/test/spec/json/retryable-reads/unified/listCollectionObjects.json b/spec/retryable-reads/unified/listCollectionObjects.json similarity index 100% rename from src/test/spec/json/retryable-reads/unified/listCollectionObjects.json rename to spec/retryable-reads/unified/listCollectionObjects.json diff --git a/src/test/spec/json/retryable-reads/unified/listCollectionObjects.yml b/spec/retryable-reads/unified/listCollectionObjects.yml similarity index 100% rename from src/test/spec/json/retryable-reads/unified/listCollectionObjects.yml rename to spec/retryable-reads/unified/listCollectionObjects.yml diff --git a/src/test/spec/json/retryable-reads/unified/listCollections-serverErrors.json b/spec/retryable-reads/unified/listCollections-serverErrors.json similarity index 100% rename from src/test/spec/json/retryable-reads/unified/listCollections-serverErrors.json rename to spec/retryable-reads/unified/listCollections-serverErrors.json diff --git a/src/test/spec/json/retryable-reads/unified/listCollections-serverErrors.yml b/spec/retryable-reads/unified/listCollections-serverErrors.yml similarity index 100% rename from src/test/spec/json/retryable-reads/unified/listCollections-serverErrors.yml rename to spec/retryable-reads/unified/listCollections-serverErrors.yml diff --git a/src/test/spec/json/retryable-reads/unified/listCollections.json b/spec/retryable-reads/unified/listCollections.json similarity index 100% rename from src/test/spec/json/retryable-reads/unified/listCollections.json rename to spec/retryable-reads/unified/listCollections.json diff --git a/src/test/spec/json/retryable-reads/unified/listCollections.yml b/spec/retryable-reads/unified/listCollections.yml similarity index 100% rename from src/test/spec/json/retryable-reads/unified/listCollections.yml rename to spec/retryable-reads/unified/listCollections.yml diff --git a/src/test/spec/json/retryable-reads/unified/listDatabaseNames-serverErrors.json b/spec/retryable-reads/unified/listDatabaseNames-serverErrors.json similarity index 100% rename from src/test/spec/json/retryable-reads/unified/listDatabaseNames-serverErrors.json rename to spec/retryable-reads/unified/listDatabaseNames-serverErrors.json diff --git a/src/test/spec/json/retryable-reads/unified/listDatabaseNames-serverErrors.yml b/spec/retryable-reads/unified/listDatabaseNames-serverErrors.yml similarity index 100% rename from src/test/spec/json/retryable-reads/unified/listDatabaseNames-serverErrors.yml rename to spec/retryable-reads/unified/listDatabaseNames-serverErrors.yml diff --git a/src/test/spec/json/retryable-reads/unified/listDatabaseNames.json b/spec/retryable-reads/unified/listDatabaseNames.json similarity index 100% rename from src/test/spec/json/retryable-reads/unified/listDatabaseNames.json rename to spec/retryable-reads/unified/listDatabaseNames.json diff --git a/src/test/spec/json/retryable-reads/unified/listDatabaseNames.yml b/spec/retryable-reads/unified/listDatabaseNames.yml similarity index 100% rename from src/test/spec/json/retryable-reads/unified/listDatabaseNames.yml rename to spec/retryable-reads/unified/listDatabaseNames.yml diff --git a/src/test/spec/json/retryable-reads/unified/listDatabaseObjects-serverErrors.json b/spec/retryable-reads/unified/listDatabaseObjects-serverErrors.json similarity index 100% rename from src/test/spec/json/retryable-reads/unified/listDatabaseObjects-serverErrors.json rename to spec/retryable-reads/unified/listDatabaseObjects-serverErrors.json diff --git a/src/test/spec/json/retryable-reads/unified/listDatabaseObjects-serverErrors.yml b/spec/retryable-reads/unified/listDatabaseObjects-serverErrors.yml similarity index 100% rename from src/test/spec/json/retryable-reads/unified/listDatabaseObjects-serverErrors.yml rename to spec/retryable-reads/unified/listDatabaseObjects-serverErrors.yml diff --git a/src/test/spec/json/retryable-reads/unified/listDatabaseObjects.json b/spec/retryable-reads/unified/listDatabaseObjects.json similarity index 100% rename from src/test/spec/json/retryable-reads/unified/listDatabaseObjects.json rename to spec/retryable-reads/unified/listDatabaseObjects.json diff --git a/src/test/spec/json/retryable-reads/unified/listDatabaseObjects.yml b/spec/retryable-reads/unified/listDatabaseObjects.yml similarity index 100% rename from src/test/spec/json/retryable-reads/unified/listDatabaseObjects.yml rename to spec/retryable-reads/unified/listDatabaseObjects.yml diff --git a/src/test/spec/json/retryable-reads/unified/listDatabases-serverErrors.json b/spec/retryable-reads/unified/listDatabases-serverErrors.json similarity index 100% rename from src/test/spec/json/retryable-reads/unified/listDatabases-serverErrors.json rename to spec/retryable-reads/unified/listDatabases-serverErrors.json diff --git a/src/test/spec/json/retryable-reads/unified/listDatabases-serverErrors.yml b/spec/retryable-reads/unified/listDatabases-serverErrors.yml similarity index 100% rename from src/test/spec/json/retryable-reads/unified/listDatabases-serverErrors.yml rename to spec/retryable-reads/unified/listDatabases-serverErrors.yml diff --git a/src/test/spec/json/retryable-reads/unified/listDatabases.json b/spec/retryable-reads/unified/listDatabases.json similarity index 100% rename from src/test/spec/json/retryable-reads/unified/listDatabases.json rename to spec/retryable-reads/unified/listDatabases.json diff --git a/src/test/spec/json/retryable-reads/unified/listDatabases.yml b/spec/retryable-reads/unified/listDatabases.yml similarity index 100% rename from src/test/spec/json/retryable-reads/unified/listDatabases.yml rename to spec/retryable-reads/unified/listDatabases.yml diff --git a/src/test/spec/json/retryable-reads/unified/listIndexNames-serverErrors.json b/spec/retryable-reads/unified/listIndexNames-serverErrors.json similarity index 100% rename from src/test/spec/json/retryable-reads/unified/listIndexNames-serverErrors.json rename to spec/retryable-reads/unified/listIndexNames-serverErrors.json diff --git a/src/test/spec/json/retryable-reads/unified/listIndexNames-serverErrors.yml b/spec/retryable-reads/unified/listIndexNames-serverErrors.yml similarity index 100% rename from src/test/spec/json/retryable-reads/unified/listIndexNames-serverErrors.yml rename to spec/retryable-reads/unified/listIndexNames-serverErrors.yml diff --git a/src/test/spec/json/retryable-reads/unified/listIndexNames.json b/spec/retryable-reads/unified/listIndexNames.json similarity index 100% rename from src/test/spec/json/retryable-reads/unified/listIndexNames.json rename to spec/retryable-reads/unified/listIndexNames.json diff --git a/src/test/spec/json/retryable-reads/unified/listIndexNames.yml b/spec/retryable-reads/unified/listIndexNames.yml similarity index 100% rename from src/test/spec/json/retryable-reads/unified/listIndexNames.yml rename to spec/retryable-reads/unified/listIndexNames.yml diff --git a/src/test/spec/json/retryable-reads/unified/listIndexes-serverErrors.json b/spec/retryable-reads/unified/listIndexes-serverErrors.json similarity index 100% rename from src/test/spec/json/retryable-reads/unified/listIndexes-serverErrors.json rename to spec/retryable-reads/unified/listIndexes-serverErrors.json diff --git a/src/test/spec/json/retryable-reads/unified/listIndexes-serverErrors.yml b/spec/retryable-reads/unified/listIndexes-serverErrors.yml similarity index 100% rename from src/test/spec/json/retryable-reads/unified/listIndexes-serverErrors.yml rename to spec/retryable-reads/unified/listIndexes-serverErrors.yml diff --git a/src/test/spec/json/retryable-reads/unified/listIndexes.json b/spec/retryable-reads/unified/listIndexes.json similarity index 100% rename from src/test/spec/json/retryable-reads/unified/listIndexes.json rename to spec/retryable-reads/unified/listIndexes.json diff --git a/src/test/spec/json/retryable-reads/unified/listIndexes.yml b/spec/retryable-reads/unified/listIndexes.yml similarity index 100% rename from src/test/spec/json/retryable-reads/unified/listIndexes.yml rename to spec/retryable-reads/unified/listIndexes.yml diff --git a/src/test/spec/json/retryable-reads/unified/mapReduce.json b/spec/retryable-reads/unified/mapReduce.json similarity index 100% rename from src/test/spec/json/retryable-reads/unified/mapReduce.json rename to spec/retryable-reads/unified/mapReduce.json diff --git a/src/test/spec/json/retryable-reads/unified/mapReduce.yml b/spec/retryable-reads/unified/mapReduce.yml similarity index 100% rename from src/test/spec/json/retryable-reads/unified/mapReduce.yml rename to spec/retryable-reads/unified/mapReduce.yml diff --git a/src/test/spec/json/retryable-reads/unified/readConcernMajorityNotAvailableYet.json b/spec/retryable-reads/unified/readConcernMajorityNotAvailableYet.json similarity index 100% rename from src/test/spec/json/retryable-reads/unified/readConcernMajorityNotAvailableYet.json rename to spec/retryable-reads/unified/readConcernMajorityNotAvailableYet.json diff --git a/src/test/spec/json/retryable-reads/unified/readConcernMajorityNotAvailableYet.yml b/spec/retryable-reads/unified/readConcernMajorityNotAvailableYet.yml similarity index 100% rename from src/test/spec/json/retryable-reads/unified/readConcernMajorityNotAvailableYet.yml rename to spec/retryable-reads/unified/readConcernMajorityNotAvailableYet.yml diff --git a/src/test/spec/json/retryable-writes/README.md b/spec/retryable-writes/README.md similarity index 100% rename from src/test/spec/json/retryable-writes/README.md rename to spec/retryable-writes/README.md diff --git a/src/test/spec/json/retryable-writes/etc/templates/handshakeError.yml.template b/spec/retryable-writes/etc/templates/handshakeError.yml.template similarity index 100% rename from src/test/spec/json/retryable-writes/etc/templates/handshakeError.yml.template rename to spec/retryable-writes/etc/templates/handshakeError.yml.template diff --git a/src/test/spec/json/retryable-writes/unified/aggregate-out-merge.json b/spec/retryable-writes/unified/aggregate-out-merge.json similarity index 100% rename from src/test/spec/json/retryable-writes/unified/aggregate-out-merge.json rename to spec/retryable-writes/unified/aggregate-out-merge.json diff --git a/src/test/spec/json/retryable-writes/unified/aggregate-out-merge.yml b/spec/retryable-writes/unified/aggregate-out-merge.yml similarity index 100% rename from src/test/spec/json/retryable-writes/unified/aggregate-out-merge.yml rename to spec/retryable-writes/unified/aggregate-out-merge.yml diff --git a/src/test/spec/json/retryable-writes/unified/bulkWrite-errorLabels.json b/spec/retryable-writes/unified/bulkWrite-errorLabels.json similarity index 100% rename from src/test/spec/json/retryable-writes/unified/bulkWrite-errorLabels.json rename to spec/retryable-writes/unified/bulkWrite-errorLabels.json diff --git a/src/test/spec/json/retryable-writes/unified/bulkWrite-errorLabels.yml b/spec/retryable-writes/unified/bulkWrite-errorLabels.yml similarity index 100% rename from src/test/spec/json/retryable-writes/unified/bulkWrite-errorLabels.yml rename to spec/retryable-writes/unified/bulkWrite-errorLabels.yml diff --git a/src/test/spec/json/retryable-writes/unified/bulkWrite-serverErrors.json b/spec/retryable-writes/unified/bulkWrite-serverErrors.json similarity index 100% rename from src/test/spec/json/retryable-writes/unified/bulkWrite-serverErrors.json rename to spec/retryable-writes/unified/bulkWrite-serverErrors.json diff --git a/src/test/spec/json/retryable-writes/unified/bulkWrite-serverErrors.yml b/spec/retryable-writes/unified/bulkWrite-serverErrors.yml similarity index 100% rename from src/test/spec/json/retryable-writes/unified/bulkWrite-serverErrors.yml rename to spec/retryable-writes/unified/bulkWrite-serverErrors.yml diff --git a/src/test/spec/json/retryable-writes/unified/bulkWrite.json b/spec/retryable-writes/unified/bulkWrite.json similarity index 100% rename from src/test/spec/json/retryable-writes/unified/bulkWrite.json rename to spec/retryable-writes/unified/bulkWrite.json diff --git a/src/test/spec/json/retryable-writes/unified/bulkWrite.yml b/spec/retryable-writes/unified/bulkWrite.yml similarity index 100% rename from src/test/spec/json/retryable-writes/unified/bulkWrite.yml rename to spec/retryable-writes/unified/bulkWrite.yml diff --git a/src/test/spec/json/retryable-writes/unified/client-bulkWrite-clientErrors.json b/spec/retryable-writes/unified/client-bulkWrite-clientErrors.json similarity index 100% rename from src/test/spec/json/retryable-writes/unified/client-bulkWrite-clientErrors.json rename to spec/retryable-writes/unified/client-bulkWrite-clientErrors.json diff --git a/src/test/spec/json/retryable-writes/unified/client-bulkWrite-clientErrors.yml b/spec/retryable-writes/unified/client-bulkWrite-clientErrors.yml similarity index 100% rename from src/test/spec/json/retryable-writes/unified/client-bulkWrite-clientErrors.yml rename to spec/retryable-writes/unified/client-bulkWrite-clientErrors.yml diff --git a/src/test/spec/json/retryable-writes/unified/client-bulkWrite-serverErrors.json b/spec/retryable-writes/unified/client-bulkWrite-serverErrors.json similarity index 100% rename from src/test/spec/json/retryable-writes/unified/client-bulkWrite-serverErrors.json rename to spec/retryable-writes/unified/client-bulkWrite-serverErrors.json diff --git a/src/test/spec/json/retryable-writes/unified/client-bulkWrite-serverErrors.yml b/spec/retryable-writes/unified/client-bulkWrite-serverErrors.yml similarity index 100% rename from src/test/spec/json/retryable-writes/unified/client-bulkWrite-serverErrors.yml rename to spec/retryable-writes/unified/client-bulkWrite-serverErrors.yml diff --git a/src/test/spec/json/retryable-writes/unified/deleteMany.json b/spec/retryable-writes/unified/deleteMany.json similarity index 100% rename from src/test/spec/json/retryable-writes/unified/deleteMany.json rename to spec/retryable-writes/unified/deleteMany.json diff --git a/src/test/spec/json/retryable-writes/unified/deleteMany.yml b/spec/retryable-writes/unified/deleteMany.yml similarity index 100% rename from src/test/spec/json/retryable-writes/unified/deleteMany.yml rename to spec/retryable-writes/unified/deleteMany.yml diff --git a/src/test/spec/json/retryable-writes/unified/deleteOne-errorLabels.json b/spec/retryable-writes/unified/deleteOne-errorLabels.json similarity index 100% rename from src/test/spec/json/retryable-writes/unified/deleteOne-errorLabels.json rename to spec/retryable-writes/unified/deleteOne-errorLabels.json diff --git a/src/test/spec/json/retryable-writes/unified/deleteOne-errorLabels.yml b/spec/retryable-writes/unified/deleteOne-errorLabels.yml similarity index 100% rename from src/test/spec/json/retryable-writes/unified/deleteOne-errorLabels.yml rename to spec/retryable-writes/unified/deleteOne-errorLabels.yml diff --git a/src/test/spec/json/retryable-writes/unified/deleteOne-serverErrors.json b/spec/retryable-writes/unified/deleteOne-serverErrors.json similarity index 100% rename from src/test/spec/json/retryable-writes/unified/deleteOne-serverErrors.json rename to spec/retryable-writes/unified/deleteOne-serverErrors.json diff --git a/src/test/spec/json/retryable-writes/unified/deleteOne-serverErrors.yml b/spec/retryable-writes/unified/deleteOne-serverErrors.yml similarity index 100% rename from src/test/spec/json/retryable-writes/unified/deleteOne-serverErrors.yml rename to spec/retryable-writes/unified/deleteOne-serverErrors.yml diff --git a/src/test/spec/json/retryable-writes/unified/deleteOne.json b/spec/retryable-writes/unified/deleteOne.json similarity index 100% rename from src/test/spec/json/retryable-writes/unified/deleteOne.json rename to spec/retryable-writes/unified/deleteOne.json diff --git a/src/test/spec/json/retryable-writes/unified/deleteOne.yml b/spec/retryable-writes/unified/deleteOne.yml similarity index 100% rename from src/test/spec/json/retryable-writes/unified/deleteOne.yml rename to spec/retryable-writes/unified/deleteOne.yml diff --git a/src/test/spec/json/retryable-writes/unified/findOneAndDelete-errorLabels.json b/spec/retryable-writes/unified/findOneAndDelete-errorLabels.json similarity index 100% rename from src/test/spec/json/retryable-writes/unified/findOneAndDelete-errorLabels.json rename to spec/retryable-writes/unified/findOneAndDelete-errorLabels.json diff --git a/src/test/spec/json/retryable-writes/unified/findOneAndDelete-errorLabels.yml b/spec/retryable-writes/unified/findOneAndDelete-errorLabels.yml similarity index 100% rename from src/test/spec/json/retryable-writes/unified/findOneAndDelete-errorLabels.yml rename to spec/retryable-writes/unified/findOneAndDelete-errorLabels.yml diff --git a/src/test/spec/json/retryable-writes/unified/findOneAndDelete-serverErrors.json b/spec/retryable-writes/unified/findOneAndDelete-serverErrors.json similarity index 100% rename from src/test/spec/json/retryable-writes/unified/findOneAndDelete-serverErrors.json rename to spec/retryable-writes/unified/findOneAndDelete-serverErrors.json diff --git a/src/test/spec/json/retryable-writes/unified/findOneAndDelete-serverErrors.yml b/spec/retryable-writes/unified/findOneAndDelete-serverErrors.yml similarity index 100% rename from src/test/spec/json/retryable-writes/unified/findOneAndDelete-serverErrors.yml rename to spec/retryable-writes/unified/findOneAndDelete-serverErrors.yml diff --git a/src/test/spec/json/retryable-writes/unified/findOneAndDelete.json b/spec/retryable-writes/unified/findOneAndDelete.json similarity index 100% rename from src/test/spec/json/retryable-writes/unified/findOneAndDelete.json rename to spec/retryable-writes/unified/findOneAndDelete.json diff --git a/src/test/spec/json/retryable-writes/unified/findOneAndDelete.yml b/spec/retryable-writes/unified/findOneAndDelete.yml similarity index 100% rename from src/test/spec/json/retryable-writes/unified/findOneAndDelete.yml rename to spec/retryable-writes/unified/findOneAndDelete.yml diff --git a/src/test/spec/json/retryable-writes/unified/findOneAndReplace-errorLabels.json b/spec/retryable-writes/unified/findOneAndReplace-errorLabels.json similarity index 100% rename from src/test/spec/json/retryable-writes/unified/findOneAndReplace-errorLabels.json rename to spec/retryable-writes/unified/findOneAndReplace-errorLabels.json diff --git a/src/test/spec/json/retryable-writes/unified/findOneAndReplace-errorLabels.yml b/spec/retryable-writes/unified/findOneAndReplace-errorLabels.yml similarity index 100% rename from src/test/spec/json/retryable-writes/unified/findOneAndReplace-errorLabels.yml rename to spec/retryable-writes/unified/findOneAndReplace-errorLabels.yml diff --git a/src/test/spec/json/retryable-writes/unified/findOneAndReplace-serverErrors.json b/spec/retryable-writes/unified/findOneAndReplace-serverErrors.json similarity index 100% rename from src/test/spec/json/retryable-writes/unified/findOneAndReplace-serverErrors.json rename to spec/retryable-writes/unified/findOneAndReplace-serverErrors.json diff --git a/src/test/spec/json/retryable-writes/unified/findOneAndReplace-serverErrors.yml b/spec/retryable-writes/unified/findOneAndReplace-serverErrors.yml similarity index 100% rename from src/test/spec/json/retryable-writes/unified/findOneAndReplace-serverErrors.yml rename to spec/retryable-writes/unified/findOneAndReplace-serverErrors.yml diff --git a/src/test/spec/json/retryable-writes/unified/findOneAndReplace.json b/spec/retryable-writes/unified/findOneAndReplace.json similarity index 100% rename from src/test/spec/json/retryable-writes/unified/findOneAndReplace.json rename to spec/retryable-writes/unified/findOneAndReplace.json diff --git a/src/test/spec/json/retryable-writes/unified/findOneAndReplace.yml b/spec/retryable-writes/unified/findOneAndReplace.yml similarity index 100% rename from src/test/spec/json/retryable-writes/unified/findOneAndReplace.yml rename to spec/retryable-writes/unified/findOneAndReplace.yml diff --git a/src/test/spec/json/retryable-writes/unified/findOneAndUpdate-errorLabels.json b/spec/retryable-writes/unified/findOneAndUpdate-errorLabels.json similarity index 100% rename from src/test/spec/json/retryable-writes/unified/findOneAndUpdate-errorLabels.json rename to spec/retryable-writes/unified/findOneAndUpdate-errorLabels.json diff --git a/src/test/spec/json/retryable-writes/unified/findOneAndUpdate-errorLabels.yml b/spec/retryable-writes/unified/findOneAndUpdate-errorLabels.yml similarity index 100% rename from src/test/spec/json/retryable-writes/unified/findOneAndUpdate-errorLabels.yml rename to spec/retryable-writes/unified/findOneAndUpdate-errorLabels.yml diff --git a/src/test/spec/json/retryable-writes/unified/findOneAndUpdate-serverErrors.json b/spec/retryable-writes/unified/findOneAndUpdate-serverErrors.json similarity index 100% rename from src/test/spec/json/retryable-writes/unified/findOneAndUpdate-serverErrors.json rename to spec/retryable-writes/unified/findOneAndUpdate-serverErrors.json diff --git a/src/test/spec/json/retryable-writes/unified/findOneAndUpdate-serverErrors.yml b/spec/retryable-writes/unified/findOneAndUpdate-serverErrors.yml similarity index 100% rename from src/test/spec/json/retryable-writes/unified/findOneAndUpdate-serverErrors.yml rename to spec/retryable-writes/unified/findOneAndUpdate-serverErrors.yml diff --git a/src/test/spec/json/retryable-writes/unified/findOneAndUpdate.json b/spec/retryable-writes/unified/findOneAndUpdate.json similarity index 100% rename from src/test/spec/json/retryable-writes/unified/findOneAndUpdate.json rename to spec/retryable-writes/unified/findOneAndUpdate.json diff --git a/src/test/spec/json/retryable-writes/unified/findOneAndUpdate.yml b/spec/retryable-writes/unified/findOneAndUpdate.yml similarity index 100% rename from src/test/spec/json/retryable-writes/unified/findOneAndUpdate.yml rename to spec/retryable-writes/unified/findOneAndUpdate.yml diff --git a/src/test/spec/json/retryable-writes/unified/handshakeError.json b/spec/retryable-writes/unified/handshakeError.json similarity index 100% rename from src/test/spec/json/retryable-writes/unified/handshakeError.json rename to spec/retryable-writes/unified/handshakeError.json diff --git a/src/test/spec/json/retryable-writes/unified/handshakeError.yml b/spec/retryable-writes/unified/handshakeError.yml similarity index 100% rename from src/test/spec/json/retryable-writes/unified/handshakeError.yml rename to spec/retryable-writes/unified/handshakeError.yml diff --git a/src/test/spec/json/retryable-writes/unified/insertMany-errorLabels.json b/spec/retryable-writes/unified/insertMany-errorLabels.json similarity index 100% rename from src/test/spec/json/retryable-writes/unified/insertMany-errorLabels.json rename to spec/retryable-writes/unified/insertMany-errorLabels.json diff --git a/src/test/spec/json/retryable-writes/unified/insertMany-errorLabels.yml b/spec/retryable-writes/unified/insertMany-errorLabels.yml similarity index 100% rename from src/test/spec/json/retryable-writes/unified/insertMany-errorLabels.yml rename to spec/retryable-writes/unified/insertMany-errorLabels.yml diff --git a/src/test/spec/json/retryable-writes/unified/insertMany-serverErrors.json b/spec/retryable-writes/unified/insertMany-serverErrors.json similarity index 100% rename from src/test/spec/json/retryable-writes/unified/insertMany-serverErrors.json rename to spec/retryable-writes/unified/insertMany-serverErrors.json diff --git a/src/test/spec/json/retryable-writes/unified/insertMany-serverErrors.yml b/spec/retryable-writes/unified/insertMany-serverErrors.yml similarity index 100% rename from src/test/spec/json/retryable-writes/unified/insertMany-serverErrors.yml rename to spec/retryable-writes/unified/insertMany-serverErrors.yml diff --git a/src/test/spec/json/retryable-writes/unified/insertMany.json b/spec/retryable-writes/unified/insertMany.json similarity index 100% rename from src/test/spec/json/retryable-writes/unified/insertMany.json rename to spec/retryable-writes/unified/insertMany.json diff --git a/src/test/spec/json/retryable-writes/unified/insertMany.yml b/spec/retryable-writes/unified/insertMany.yml similarity index 100% rename from src/test/spec/json/retryable-writes/unified/insertMany.yml rename to spec/retryable-writes/unified/insertMany.yml diff --git a/src/test/spec/json/retryable-writes/unified/insertOne-errorLabels.json b/spec/retryable-writes/unified/insertOne-errorLabels.json similarity index 100% rename from src/test/spec/json/retryable-writes/unified/insertOne-errorLabels.json rename to spec/retryable-writes/unified/insertOne-errorLabels.json diff --git a/src/test/spec/json/retryable-writes/unified/insertOne-errorLabels.yml b/spec/retryable-writes/unified/insertOne-errorLabels.yml similarity index 100% rename from src/test/spec/json/retryable-writes/unified/insertOne-errorLabels.yml rename to spec/retryable-writes/unified/insertOne-errorLabels.yml diff --git a/src/test/spec/json/retryable-writes/unified/insertOne-noWritesPerformedError.json b/spec/retryable-writes/unified/insertOne-noWritesPerformedError.json similarity index 100% rename from src/test/spec/json/retryable-writes/unified/insertOne-noWritesPerformedError.json rename to spec/retryable-writes/unified/insertOne-noWritesPerformedError.json diff --git a/src/test/spec/json/retryable-writes/unified/insertOne-noWritesPerformedError.yml b/spec/retryable-writes/unified/insertOne-noWritesPerformedError.yml similarity index 100% rename from src/test/spec/json/retryable-writes/unified/insertOne-noWritesPerformedError.yml rename to spec/retryable-writes/unified/insertOne-noWritesPerformedError.yml diff --git a/src/test/spec/json/retryable-writes/unified/insertOne-serverErrors.json b/spec/retryable-writes/unified/insertOne-serverErrors.json similarity index 100% rename from src/test/spec/json/retryable-writes/unified/insertOne-serverErrors.json rename to spec/retryable-writes/unified/insertOne-serverErrors.json diff --git a/src/test/spec/json/retryable-writes/unified/insertOne-serverErrors.yml b/spec/retryable-writes/unified/insertOne-serverErrors.yml similarity index 100% rename from src/test/spec/json/retryable-writes/unified/insertOne-serverErrors.yml rename to spec/retryable-writes/unified/insertOne-serverErrors.yml diff --git a/src/test/spec/json/retryable-writes/unified/insertOne.json b/spec/retryable-writes/unified/insertOne.json similarity index 100% rename from src/test/spec/json/retryable-writes/unified/insertOne.json rename to spec/retryable-writes/unified/insertOne.json diff --git a/src/test/spec/json/retryable-writes/unified/insertOne.yml b/spec/retryable-writes/unified/insertOne.yml similarity index 100% rename from src/test/spec/json/retryable-writes/unified/insertOne.yml rename to spec/retryable-writes/unified/insertOne.yml diff --git a/src/test/spec/json/retryable-writes/unified/replaceOne-errorLabels.json b/spec/retryable-writes/unified/replaceOne-errorLabels.json similarity index 100% rename from src/test/spec/json/retryable-writes/unified/replaceOne-errorLabels.json rename to spec/retryable-writes/unified/replaceOne-errorLabels.json diff --git a/src/test/spec/json/retryable-writes/unified/replaceOne-errorLabels.yml b/spec/retryable-writes/unified/replaceOne-errorLabels.yml similarity index 100% rename from src/test/spec/json/retryable-writes/unified/replaceOne-errorLabels.yml rename to spec/retryable-writes/unified/replaceOne-errorLabels.yml diff --git a/src/test/spec/json/retryable-writes/unified/replaceOne-serverErrors.json b/spec/retryable-writes/unified/replaceOne-serverErrors.json similarity index 100% rename from src/test/spec/json/retryable-writes/unified/replaceOne-serverErrors.json rename to spec/retryable-writes/unified/replaceOne-serverErrors.json diff --git a/src/test/spec/json/retryable-writes/unified/replaceOne-serverErrors.yml b/spec/retryable-writes/unified/replaceOne-serverErrors.yml similarity index 100% rename from src/test/spec/json/retryable-writes/unified/replaceOne-serverErrors.yml rename to spec/retryable-writes/unified/replaceOne-serverErrors.yml diff --git a/src/test/spec/json/retryable-writes/unified/replaceOne.json b/spec/retryable-writes/unified/replaceOne.json similarity index 100% rename from src/test/spec/json/retryable-writes/unified/replaceOne.json rename to spec/retryable-writes/unified/replaceOne.json diff --git a/src/test/spec/json/retryable-writes/unified/replaceOne.yml b/spec/retryable-writes/unified/replaceOne.yml similarity index 100% rename from src/test/spec/json/retryable-writes/unified/replaceOne.yml rename to spec/retryable-writes/unified/replaceOne.yml diff --git a/src/test/spec/json/retryable-writes/unified/unacknowledged-write-concern.json b/spec/retryable-writes/unified/unacknowledged-write-concern.json similarity index 100% rename from src/test/spec/json/retryable-writes/unified/unacknowledged-write-concern.json rename to spec/retryable-writes/unified/unacknowledged-write-concern.json diff --git a/src/test/spec/json/retryable-writes/unified/unacknowledged-write-concern.yml b/spec/retryable-writes/unified/unacknowledged-write-concern.yml similarity index 100% rename from src/test/spec/json/retryable-writes/unified/unacknowledged-write-concern.yml rename to spec/retryable-writes/unified/unacknowledged-write-concern.yml diff --git a/src/test/spec/json/retryable-writes/unified/updateMany.json b/spec/retryable-writes/unified/updateMany.json similarity index 100% rename from src/test/spec/json/retryable-writes/unified/updateMany.json rename to spec/retryable-writes/unified/updateMany.json diff --git a/src/test/spec/json/retryable-writes/unified/updateMany.yml b/spec/retryable-writes/unified/updateMany.yml similarity index 100% rename from src/test/spec/json/retryable-writes/unified/updateMany.yml rename to spec/retryable-writes/unified/updateMany.yml diff --git a/src/test/spec/json/retryable-writes/unified/updateOne-errorLabels.json b/spec/retryable-writes/unified/updateOne-errorLabels.json similarity index 100% rename from src/test/spec/json/retryable-writes/unified/updateOne-errorLabels.json rename to spec/retryable-writes/unified/updateOne-errorLabels.json diff --git a/src/test/spec/json/retryable-writes/unified/updateOne-errorLabels.yml b/spec/retryable-writes/unified/updateOne-errorLabels.yml similarity index 100% rename from src/test/spec/json/retryable-writes/unified/updateOne-errorLabels.yml rename to spec/retryable-writes/unified/updateOne-errorLabels.yml diff --git a/src/test/spec/json/retryable-writes/unified/updateOne-serverErrors.json b/spec/retryable-writes/unified/updateOne-serverErrors.json similarity index 100% rename from src/test/spec/json/retryable-writes/unified/updateOne-serverErrors.json rename to spec/retryable-writes/unified/updateOne-serverErrors.json diff --git a/src/test/spec/json/retryable-writes/unified/updateOne-serverErrors.yml b/spec/retryable-writes/unified/updateOne-serverErrors.yml similarity index 100% rename from src/test/spec/json/retryable-writes/unified/updateOne-serverErrors.yml rename to spec/retryable-writes/unified/updateOne-serverErrors.yml diff --git a/src/test/spec/json/retryable-writes/unified/updateOne.json b/spec/retryable-writes/unified/updateOne.json similarity index 100% rename from src/test/spec/json/retryable-writes/unified/updateOne.json rename to spec/retryable-writes/unified/updateOne.json diff --git a/src/test/spec/json/retryable-writes/unified/updateOne.yml b/spec/retryable-writes/unified/updateOne.yml similarity index 100% rename from src/test/spec/json/retryable-writes/unified/updateOne.yml rename to spec/retryable-writes/unified/updateOne.yml diff --git a/src/test/spec/json/run-command/README.rst b/spec/run-command/README.rst similarity index 100% rename from src/test/spec/json/run-command/README.rst rename to spec/run-command/README.rst diff --git a/src/test/spec/json/run-command/unified/runCommand.json b/spec/run-command/unified/runCommand.json similarity index 100% rename from src/test/spec/json/run-command/unified/runCommand.json rename to spec/run-command/unified/runCommand.json diff --git a/src/test/spec/json/run-command/unified/runCommand.yml b/spec/run-command/unified/runCommand.yml similarity index 100% rename from src/test/spec/json/run-command/unified/runCommand.yml rename to spec/run-command/unified/runCommand.yml diff --git a/src/test/spec/json/run-command/unified/runCursorCommand.json b/spec/run-command/unified/runCursorCommand.json similarity index 100% rename from src/test/spec/json/run-command/unified/runCursorCommand.json rename to spec/run-command/unified/runCursorCommand.json diff --git a/src/test/spec/json/run-command/unified/runCursorCommand.yml b/spec/run-command/unified/runCursorCommand.yml similarity index 100% rename from src/test/spec/json/run-command/unified/runCursorCommand.yml rename to spec/run-command/unified/runCursorCommand.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/README.md b/spec/server-discovery-and-monitoring/README.md similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/README.md rename to spec/server-discovery-and-monitoring/README.md diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/error_handling_handshake.json b/spec/server-discovery-and-monitoring/errors/error_handling_handshake.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/error_handling_handshake.json rename to spec/server-discovery-and-monitoring/errors/error_handling_handshake.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/error_handling_handshake.yml b/spec/server-discovery-and-monitoring/errors/error_handling_handshake.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/error_handling_handshake.yml rename to spec/server-discovery-and-monitoring/errors/error_handling_handshake.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/generate-error-tests.py b/spec/server-discovery-and-monitoring/errors/generate-error-tests.py similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/generate-error-tests.py rename to spec/server-discovery-and-monitoring/errors/generate-error-tests.py diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/non-stale-network-error.json b/spec/server-discovery-and-monitoring/errors/non-stale-network-error.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/non-stale-network-error.json rename to spec/server-discovery-and-monitoring/errors/non-stale-network-error.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/non-stale-network-error.yml b/spec/server-discovery-and-monitoring/errors/non-stale-network-error.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/non-stale-network-error.yml rename to spec/server-discovery-and-monitoring/errors/non-stale-network-error.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/non-stale-network-timeout-error.json b/spec/server-discovery-and-monitoring/errors/non-stale-network-timeout-error.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/non-stale-network-timeout-error.json rename to spec/server-discovery-and-monitoring/errors/non-stale-network-timeout-error.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/non-stale-network-timeout-error.yml b/spec/server-discovery-and-monitoring/errors/non-stale-network-timeout-error.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/non-stale-network-timeout-error.yml rename to spec/server-discovery-and-monitoring/errors/non-stale-network-timeout-error.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/non-stale-topologyVersion-greater-InterruptedAtShutdown.json b/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-greater-InterruptedAtShutdown.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/non-stale-topologyVersion-greater-InterruptedAtShutdown.json rename to spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-greater-InterruptedAtShutdown.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/non-stale-topologyVersion-greater-InterruptedAtShutdown.yml b/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-greater-InterruptedAtShutdown.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/non-stale-topologyVersion-greater-InterruptedAtShutdown.yml rename to spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-greater-InterruptedAtShutdown.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/non-stale-topologyVersion-greater-InterruptedDueToReplStateChange.json b/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-greater-InterruptedDueToReplStateChange.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/non-stale-topologyVersion-greater-InterruptedDueToReplStateChange.json rename to spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-greater-InterruptedDueToReplStateChange.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/non-stale-topologyVersion-greater-InterruptedDueToReplStateChange.yml b/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-greater-InterruptedDueToReplStateChange.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/non-stale-topologyVersion-greater-InterruptedDueToReplStateChange.yml rename to spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-greater-InterruptedDueToReplStateChange.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/non-stale-topologyVersion-greater-LegacyNotPrimary.json b/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-greater-LegacyNotPrimary.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/non-stale-topologyVersion-greater-LegacyNotPrimary.json rename to spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-greater-LegacyNotPrimary.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/non-stale-topologyVersion-greater-LegacyNotPrimary.yml b/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-greater-LegacyNotPrimary.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/non-stale-topologyVersion-greater-LegacyNotPrimary.yml rename to spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-greater-LegacyNotPrimary.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/non-stale-topologyVersion-greater-NotPrimaryNoSecondaryOk.json b/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-greater-NotPrimaryNoSecondaryOk.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/non-stale-topologyVersion-greater-NotPrimaryNoSecondaryOk.json rename to spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-greater-NotPrimaryNoSecondaryOk.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/non-stale-topologyVersion-greater-NotPrimaryNoSecondaryOk.yml b/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-greater-NotPrimaryNoSecondaryOk.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/non-stale-topologyVersion-greater-NotPrimaryNoSecondaryOk.yml rename to spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-greater-NotPrimaryNoSecondaryOk.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/non-stale-topologyVersion-greater-NotPrimaryOrSecondary.json b/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-greater-NotPrimaryOrSecondary.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/non-stale-topologyVersion-greater-NotPrimaryOrSecondary.json rename to spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-greater-NotPrimaryOrSecondary.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/non-stale-topologyVersion-greater-NotPrimaryOrSecondary.yml b/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-greater-NotPrimaryOrSecondary.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/non-stale-topologyVersion-greater-NotPrimaryOrSecondary.yml rename to spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-greater-NotPrimaryOrSecondary.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/non-stale-topologyVersion-greater-NotWritablePrimary.json b/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-greater-NotWritablePrimary.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/non-stale-topologyVersion-greater-NotWritablePrimary.json rename to spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-greater-NotWritablePrimary.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/non-stale-topologyVersion-greater-NotWritablePrimary.yml b/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-greater-NotWritablePrimary.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/non-stale-topologyVersion-greater-NotWritablePrimary.yml rename to spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-greater-NotWritablePrimary.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/non-stale-topologyVersion-greater-PrimarySteppedDown.json b/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-greater-PrimarySteppedDown.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/non-stale-topologyVersion-greater-PrimarySteppedDown.json rename to spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-greater-PrimarySteppedDown.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/non-stale-topologyVersion-greater-PrimarySteppedDown.yml b/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-greater-PrimarySteppedDown.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/non-stale-topologyVersion-greater-PrimarySteppedDown.yml rename to spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-greater-PrimarySteppedDown.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/non-stale-topologyVersion-greater-ShutdownInProgress.json b/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-greater-ShutdownInProgress.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/non-stale-topologyVersion-greater-ShutdownInProgress.json rename to spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-greater-ShutdownInProgress.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/non-stale-topologyVersion-greater-ShutdownInProgress.yml b/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-greater-ShutdownInProgress.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/non-stale-topologyVersion-greater-ShutdownInProgress.yml rename to spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-greater-ShutdownInProgress.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/non-stale-topologyVersion-missing-InterruptedAtShutdown.json b/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-missing-InterruptedAtShutdown.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/non-stale-topologyVersion-missing-InterruptedAtShutdown.json rename to spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-missing-InterruptedAtShutdown.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/non-stale-topologyVersion-missing-InterruptedAtShutdown.yml b/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-missing-InterruptedAtShutdown.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/non-stale-topologyVersion-missing-InterruptedAtShutdown.yml rename to spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-missing-InterruptedAtShutdown.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/non-stale-topologyVersion-missing-InterruptedDueToReplStateChange.json b/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-missing-InterruptedDueToReplStateChange.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/non-stale-topologyVersion-missing-InterruptedDueToReplStateChange.json rename to spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-missing-InterruptedDueToReplStateChange.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/non-stale-topologyVersion-missing-InterruptedDueToReplStateChange.yml b/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-missing-InterruptedDueToReplStateChange.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/non-stale-topologyVersion-missing-InterruptedDueToReplStateChange.yml rename to spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-missing-InterruptedDueToReplStateChange.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/non-stale-topologyVersion-missing-LegacyNotPrimary.json b/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-missing-LegacyNotPrimary.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/non-stale-topologyVersion-missing-LegacyNotPrimary.json rename to spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-missing-LegacyNotPrimary.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/non-stale-topologyVersion-missing-LegacyNotPrimary.yml b/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-missing-LegacyNotPrimary.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/non-stale-topologyVersion-missing-LegacyNotPrimary.yml rename to spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-missing-LegacyNotPrimary.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/non-stale-topologyVersion-missing-NotPrimaryNoSecondaryOk.json b/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-missing-NotPrimaryNoSecondaryOk.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/non-stale-topologyVersion-missing-NotPrimaryNoSecondaryOk.json rename to spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-missing-NotPrimaryNoSecondaryOk.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/non-stale-topologyVersion-missing-NotPrimaryNoSecondaryOk.yml b/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-missing-NotPrimaryNoSecondaryOk.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/non-stale-topologyVersion-missing-NotPrimaryNoSecondaryOk.yml rename to spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-missing-NotPrimaryNoSecondaryOk.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/non-stale-topologyVersion-missing-NotPrimaryOrSecondary.json b/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-missing-NotPrimaryOrSecondary.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/non-stale-topologyVersion-missing-NotPrimaryOrSecondary.json rename to spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-missing-NotPrimaryOrSecondary.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/non-stale-topologyVersion-missing-NotPrimaryOrSecondary.yml b/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-missing-NotPrimaryOrSecondary.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/non-stale-topologyVersion-missing-NotPrimaryOrSecondary.yml rename to spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-missing-NotPrimaryOrSecondary.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/non-stale-topologyVersion-missing-NotWritablePrimary.json b/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-missing-NotWritablePrimary.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/non-stale-topologyVersion-missing-NotWritablePrimary.json rename to spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-missing-NotWritablePrimary.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/non-stale-topologyVersion-missing-NotWritablePrimary.yml b/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-missing-NotWritablePrimary.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/non-stale-topologyVersion-missing-NotWritablePrimary.yml rename to spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-missing-NotWritablePrimary.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/non-stale-topologyVersion-missing-PrimarySteppedDown.json b/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-missing-PrimarySteppedDown.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/non-stale-topologyVersion-missing-PrimarySteppedDown.json rename to spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-missing-PrimarySteppedDown.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/non-stale-topologyVersion-missing-PrimarySteppedDown.yml b/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-missing-PrimarySteppedDown.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/non-stale-topologyVersion-missing-PrimarySteppedDown.yml rename to spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-missing-PrimarySteppedDown.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/non-stale-topologyVersion-missing-ShutdownInProgress.json b/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-missing-ShutdownInProgress.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/non-stale-topologyVersion-missing-ShutdownInProgress.json rename to spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-missing-ShutdownInProgress.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/non-stale-topologyVersion-missing-ShutdownInProgress.yml b/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-missing-ShutdownInProgress.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/non-stale-topologyVersion-missing-ShutdownInProgress.yml rename to spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-missing-ShutdownInProgress.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/non-stale-topologyVersion-proccessId-changed-InterruptedAtShutdown.json b/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-proccessId-changed-InterruptedAtShutdown.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/non-stale-topologyVersion-proccessId-changed-InterruptedAtShutdown.json rename to spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-proccessId-changed-InterruptedAtShutdown.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/non-stale-topologyVersion-proccessId-changed-InterruptedAtShutdown.yml b/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-proccessId-changed-InterruptedAtShutdown.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/non-stale-topologyVersion-proccessId-changed-InterruptedAtShutdown.yml rename to spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-proccessId-changed-InterruptedAtShutdown.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/non-stale-topologyVersion-proccessId-changed-InterruptedDueToReplStateChange.json b/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-proccessId-changed-InterruptedDueToReplStateChange.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/non-stale-topologyVersion-proccessId-changed-InterruptedDueToReplStateChange.json rename to spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-proccessId-changed-InterruptedDueToReplStateChange.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/non-stale-topologyVersion-proccessId-changed-InterruptedDueToReplStateChange.yml b/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-proccessId-changed-InterruptedDueToReplStateChange.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/non-stale-topologyVersion-proccessId-changed-InterruptedDueToReplStateChange.yml rename to spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-proccessId-changed-InterruptedDueToReplStateChange.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/non-stale-topologyVersion-proccessId-changed-LegacyNotPrimary.json b/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-proccessId-changed-LegacyNotPrimary.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/non-stale-topologyVersion-proccessId-changed-LegacyNotPrimary.json rename to spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-proccessId-changed-LegacyNotPrimary.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/non-stale-topologyVersion-proccessId-changed-LegacyNotPrimary.yml b/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-proccessId-changed-LegacyNotPrimary.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/non-stale-topologyVersion-proccessId-changed-LegacyNotPrimary.yml rename to spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-proccessId-changed-LegacyNotPrimary.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/non-stale-topologyVersion-proccessId-changed-NotPrimaryNoSecondaryOk.json b/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-proccessId-changed-NotPrimaryNoSecondaryOk.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/non-stale-topologyVersion-proccessId-changed-NotPrimaryNoSecondaryOk.json rename to spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-proccessId-changed-NotPrimaryNoSecondaryOk.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/non-stale-topologyVersion-proccessId-changed-NotPrimaryNoSecondaryOk.yml b/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-proccessId-changed-NotPrimaryNoSecondaryOk.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/non-stale-topologyVersion-proccessId-changed-NotPrimaryNoSecondaryOk.yml rename to spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-proccessId-changed-NotPrimaryNoSecondaryOk.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/non-stale-topologyVersion-proccessId-changed-NotPrimaryOrSecondary.json b/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-proccessId-changed-NotPrimaryOrSecondary.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/non-stale-topologyVersion-proccessId-changed-NotPrimaryOrSecondary.json rename to spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-proccessId-changed-NotPrimaryOrSecondary.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/non-stale-topologyVersion-proccessId-changed-NotPrimaryOrSecondary.yml b/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-proccessId-changed-NotPrimaryOrSecondary.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/non-stale-topologyVersion-proccessId-changed-NotPrimaryOrSecondary.yml rename to spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-proccessId-changed-NotPrimaryOrSecondary.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/non-stale-topologyVersion-proccessId-changed-NotWritablePrimary.json b/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-proccessId-changed-NotWritablePrimary.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/non-stale-topologyVersion-proccessId-changed-NotWritablePrimary.json rename to spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-proccessId-changed-NotWritablePrimary.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/non-stale-topologyVersion-proccessId-changed-NotWritablePrimary.yml b/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-proccessId-changed-NotWritablePrimary.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/non-stale-topologyVersion-proccessId-changed-NotWritablePrimary.yml rename to spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-proccessId-changed-NotWritablePrimary.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/non-stale-topologyVersion-proccessId-changed-PrimarySteppedDown.json b/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-proccessId-changed-PrimarySteppedDown.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/non-stale-topologyVersion-proccessId-changed-PrimarySteppedDown.json rename to spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-proccessId-changed-PrimarySteppedDown.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/non-stale-topologyVersion-proccessId-changed-PrimarySteppedDown.yml b/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-proccessId-changed-PrimarySteppedDown.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/non-stale-topologyVersion-proccessId-changed-PrimarySteppedDown.yml rename to spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-proccessId-changed-PrimarySteppedDown.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/non-stale-topologyVersion-proccessId-changed-ShutdownInProgress.json b/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-proccessId-changed-ShutdownInProgress.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/non-stale-topologyVersion-proccessId-changed-ShutdownInProgress.json rename to spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-proccessId-changed-ShutdownInProgress.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/non-stale-topologyVersion-proccessId-changed-ShutdownInProgress.yml b/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-proccessId-changed-ShutdownInProgress.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/non-stale-topologyVersion-proccessId-changed-ShutdownInProgress.yml rename to spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-proccessId-changed-ShutdownInProgress.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/non-stale-topologyVersion.yml.template b/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion.yml.template similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/non-stale-topologyVersion.yml.template rename to spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion.yml.template diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/post-42-InterruptedAtShutdown.json b/spec/server-discovery-and-monitoring/errors/post-42-InterruptedAtShutdown.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/post-42-InterruptedAtShutdown.json rename to spec/server-discovery-and-monitoring/errors/post-42-InterruptedAtShutdown.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/post-42-InterruptedAtShutdown.yml b/spec/server-discovery-and-monitoring/errors/post-42-InterruptedAtShutdown.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/post-42-InterruptedAtShutdown.yml rename to spec/server-discovery-and-monitoring/errors/post-42-InterruptedAtShutdown.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/post-42-InterruptedDueToReplStateChange.json b/spec/server-discovery-and-monitoring/errors/post-42-InterruptedDueToReplStateChange.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/post-42-InterruptedDueToReplStateChange.json rename to spec/server-discovery-and-monitoring/errors/post-42-InterruptedDueToReplStateChange.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/post-42-InterruptedDueToReplStateChange.yml b/spec/server-discovery-and-monitoring/errors/post-42-InterruptedDueToReplStateChange.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/post-42-InterruptedDueToReplStateChange.yml rename to spec/server-discovery-and-monitoring/errors/post-42-InterruptedDueToReplStateChange.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/post-42-LegacyNotPrimary.json b/spec/server-discovery-and-monitoring/errors/post-42-LegacyNotPrimary.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/post-42-LegacyNotPrimary.json rename to spec/server-discovery-and-monitoring/errors/post-42-LegacyNotPrimary.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/post-42-LegacyNotPrimary.yml b/spec/server-discovery-and-monitoring/errors/post-42-LegacyNotPrimary.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/post-42-LegacyNotPrimary.yml rename to spec/server-discovery-and-monitoring/errors/post-42-LegacyNotPrimary.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/post-42-NotPrimaryNoSecondaryOk.json b/spec/server-discovery-and-monitoring/errors/post-42-NotPrimaryNoSecondaryOk.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/post-42-NotPrimaryNoSecondaryOk.json rename to spec/server-discovery-and-monitoring/errors/post-42-NotPrimaryNoSecondaryOk.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/post-42-NotPrimaryNoSecondaryOk.yml b/spec/server-discovery-and-monitoring/errors/post-42-NotPrimaryNoSecondaryOk.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/post-42-NotPrimaryNoSecondaryOk.yml rename to spec/server-discovery-and-monitoring/errors/post-42-NotPrimaryNoSecondaryOk.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/post-42-NotPrimaryOrSecondary.json b/spec/server-discovery-and-monitoring/errors/post-42-NotPrimaryOrSecondary.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/post-42-NotPrimaryOrSecondary.json rename to spec/server-discovery-and-monitoring/errors/post-42-NotPrimaryOrSecondary.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/post-42-NotPrimaryOrSecondary.yml b/spec/server-discovery-and-monitoring/errors/post-42-NotPrimaryOrSecondary.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/post-42-NotPrimaryOrSecondary.yml rename to spec/server-discovery-and-monitoring/errors/post-42-NotPrimaryOrSecondary.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/post-42-NotWritablePrimary.json b/spec/server-discovery-and-monitoring/errors/post-42-NotWritablePrimary.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/post-42-NotWritablePrimary.json rename to spec/server-discovery-and-monitoring/errors/post-42-NotWritablePrimary.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/post-42-NotWritablePrimary.yml b/spec/server-discovery-and-monitoring/errors/post-42-NotWritablePrimary.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/post-42-NotWritablePrimary.yml rename to spec/server-discovery-and-monitoring/errors/post-42-NotWritablePrimary.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/post-42-PrimarySteppedDown.json b/spec/server-discovery-and-monitoring/errors/post-42-PrimarySteppedDown.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/post-42-PrimarySteppedDown.json rename to spec/server-discovery-and-monitoring/errors/post-42-PrimarySteppedDown.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/post-42-PrimarySteppedDown.yml b/spec/server-discovery-and-monitoring/errors/post-42-PrimarySteppedDown.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/post-42-PrimarySteppedDown.yml rename to spec/server-discovery-and-monitoring/errors/post-42-PrimarySteppedDown.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/post-42-ShutdownInProgress.json b/spec/server-discovery-and-monitoring/errors/post-42-ShutdownInProgress.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/post-42-ShutdownInProgress.json rename to spec/server-discovery-and-monitoring/errors/post-42-ShutdownInProgress.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/post-42-ShutdownInProgress.yml b/spec/server-discovery-and-monitoring/errors/post-42-ShutdownInProgress.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/post-42-ShutdownInProgress.yml rename to spec/server-discovery-and-monitoring/errors/post-42-ShutdownInProgress.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/post-42.yml.template b/spec/server-discovery-and-monitoring/errors/post-42.yml.template similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/post-42.yml.template rename to spec/server-discovery-and-monitoring/errors/post-42.yml.template diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/pre-42-InterruptedAtShutdown.json b/spec/server-discovery-and-monitoring/errors/pre-42-InterruptedAtShutdown.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/pre-42-InterruptedAtShutdown.json rename to spec/server-discovery-and-monitoring/errors/pre-42-InterruptedAtShutdown.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/pre-42-InterruptedAtShutdown.yml b/spec/server-discovery-and-monitoring/errors/pre-42-InterruptedAtShutdown.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/pre-42-InterruptedAtShutdown.yml rename to spec/server-discovery-and-monitoring/errors/pre-42-InterruptedAtShutdown.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/pre-42-InterruptedDueToReplStateChange.json b/spec/server-discovery-and-monitoring/errors/pre-42-InterruptedDueToReplStateChange.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/pre-42-InterruptedDueToReplStateChange.json rename to spec/server-discovery-and-monitoring/errors/pre-42-InterruptedDueToReplStateChange.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/pre-42-InterruptedDueToReplStateChange.yml b/spec/server-discovery-and-monitoring/errors/pre-42-InterruptedDueToReplStateChange.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/pre-42-InterruptedDueToReplStateChange.yml rename to spec/server-discovery-and-monitoring/errors/pre-42-InterruptedDueToReplStateChange.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/pre-42-LegacyNotPrimary.json b/spec/server-discovery-and-monitoring/errors/pre-42-LegacyNotPrimary.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/pre-42-LegacyNotPrimary.json rename to spec/server-discovery-and-monitoring/errors/pre-42-LegacyNotPrimary.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/pre-42-LegacyNotPrimary.yml b/spec/server-discovery-and-monitoring/errors/pre-42-LegacyNotPrimary.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/pre-42-LegacyNotPrimary.yml rename to spec/server-discovery-and-monitoring/errors/pre-42-LegacyNotPrimary.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/pre-42-NotPrimaryNoSecondaryOk.json b/spec/server-discovery-and-monitoring/errors/pre-42-NotPrimaryNoSecondaryOk.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/pre-42-NotPrimaryNoSecondaryOk.json rename to spec/server-discovery-and-monitoring/errors/pre-42-NotPrimaryNoSecondaryOk.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/pre-42-NotPrimaryNoSecondaryOk.yml b/spec/server-discovery-and-monitoring/errors/pre-42-NotPrimaryNoSecondaryOk.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/pre-42-NotPrimaryNoSecondaryOk.yml rename to spec/server-discovery-and-monitoring/errors/pre-42-NotPrimaryNoSecondaryOk.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/pre-42-NotPrimaryOrSecondary.json b/spec/server-discovery-and-monitoring/errors/pre-42-NotPrimaryOrSecondary.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/pre-42-NotPrimaryOrSecondary.json rename to spec/server-discovery-and-monitoring/errors/pre-42-NotPrimaryOrSecondary.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/pre-42-NotPrimaryOrSecondary.yml b/spec/server-discovery-and-monitoring/errors/pre-42-NotPrimaryOrSecondary.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/pre-42-NotPrimaryOrSecondary.yml rename to spec/server-discovery-and-monitoring/errors/pre-42-NotPrimaryOrSecondary.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/pre-42-NotWritablePrimary.json b/spec/server-discovery-and-monitoring/errors/pre-42-NotWritablePrimary.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/pre-42-NotWritablePrimary.json rename to spec/server-discovery-and-monitoring/errors/pre-42-NotWritablePrimary.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/pre-42-NotWritablePrimary.yml b/spec/server-discovery-and-monitoring/errors/pre-42-NotWritablePrimary.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/pre-42-NotWritablePrimary.yml rename to spec/server-discovery-and-monitoring/errors/pre-42-NotWritablePrimary.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/pre-42-PrimarySteppedDown.json b/spec/server-discovery-and-monitoring/errors/pre-42-PrimarySteppedDown.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/pre-42-PrimarySteppedDown.json rename to spec/server-discovery-and-monitoring/errors/pre-42-PrimarySteppedDown.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/pre-42-PrimarySteppedDown.yml b/spec/server-discovery-and-monitoring/errors/pre-42-PrimarySteppedDown.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/pre-42-PrimarySteppedDown.yml rename to spec/server-discovery-and-monitoring/errors/pre-42-PrimarySteppedDown.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/pre-42-ShutdownInProgress.json b/spec/server-discovery-and-monitoring/errors/pre-42-ShutdownInProgress.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/pre-42-ShutdownInProgress.json rename to spec/server-discovery-and-monitoring/errors/pre-42-ShutdownInProgress.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/pre-42-ShutdownInProgress.yml b/spec/server-discovery-and-monitoring/errors/pre-42-ShutdownInProgress.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/pre-42-ShutdownInProgress.yml rename to spec/server-discovery-and-monitoring/errors/pre-42-ShutdownInProgress.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/pre-42.yml.template b/spec/server-discovery-and-monitoring/errors/pre-42.yml.template similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/pre-42.yml.template rename to spec/server-discovery-and-monitoring/errors/pre-42.yml.template diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/prefer-error-code.json b/spec/server-discovery-and-monitoring/errors/prefer-error-code.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/prefer-error-code.json rename to spec/server-discovery-and-monitoring/errors/prefer-error-code.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/prefer-error-code.yml b/spec/server-discovery-and-monitoring/errors/prefer-error-code.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/prefer-error-code.yml rename to spec/server-discovery-and-monitoring/errors/prefer-error-code.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/stale-generation-InterruptedAtShutdown.json b/spec/server-discovery-and-monitoring/errors/stale-generation-InterruptedAtShutdown.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/stale-generation-InterruptedAtShutdown.json rename to spec/server-discovery-and-monitoring/errors/stale-generation-InterruptedAtShutdown.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/stale-generation-InterruptedAtShutdown.yml b/spec/server-discovery-and-monitoring/errors/stale-generation-InterruptedAtShutdown.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/stale-generation-InterruptedAtShutdown.yml rename to spec/server-discovery-and-monitoring/errors/stale-generation-InterruptedAtShutdown.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/stale-generation-InterruptedDueToReplStateChange.json b/spec/server-discovery-and-monitoring/errors/stale-generation-InterruptedDueToReplStateChange.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/stale-generation-InterruptedDueToReplStateChange.json rename to spec/server-discovery-and-monitoring/errors/stale-generation-InterruptedDueToReplStateChange.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/stale-generation-InterruptedDueToReplStateChange.yml b/spec/server-discovery-and-monitoring/errors/stale-generation-InterruptedDueToReplStateChange.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/stale-generation-InterruptedDueToReplStateChange.yml rename to spec/server-discovery-and-monitoring/errors/stale-generation-InterruptedDueToReplStateChange.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/stale-generation-NotPrimaryNoSecondaryOk.json b/spec/server-discovery-and-monitoring/errors/stale-generation-NotPrimaryNoSecondaryOk.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/stale-generation-NotPrimaryNoSecondaryOk.json rename to spec/server-discovery-and-monitoring/errors/stale-generation-NotPrimaryNoSecondaryOk.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/stale-generation-NotPrimaryNoSecondaryOk.yml b/spec/server-discovery-and-monitoring/errors/stale-generation-NotPrimaryNoSecondaryOk.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/stale-generation-NotPrimaryNoSecondaryOk.yml rename to spec/server-discovery-and-monitoring/errors/stale-generation-NotPrimaryNoSecondaryOk.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/stale-generation-NotPrimaryOrSecondary.json b/spec/server-discovery-and-monitoring/errors/stale-generation-NotPrimaryOrSecondary.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/stale-generation-NotPrimaryOrSecondary.json rename to spec/server-discovery-and-monitoring/errors/stale-generation-NotPrimaryOrSecondary.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/stale-generation-NotPrimaryOrSecondary.yml b/spec/server-discovery-and-monitoring/errors/stale-generation-NotPrimaryOrSecondary.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/stale-generation-NotPrimaryOrSecondary.yml rename to spec/server-discovery-and-monitoring/errors/stale-generation-NotPrimaryOrSecondary.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/stale-generation-NotWritablePrimary.json b/spec/server-discovery-and-monitoring/errors/stale-generation-NotWritablePrimary.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/stale-generation-NotWritablePrimary.json rename to spec/server-discovery-and-monitoring/errors/stale-generation-NotWritablePrimary.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/stale-generation-NotWritablePrimary.yml b/spec/server-discovery-and-monitoring/errors/stale-generation-NotWritablePrimary.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/stale-generation-NotWritablePrimary.yml rename to spec/server-discovery-and-monitoring/errors/stale-generation-NotWritablePrimary.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/stale-generation-PrimarySteppedDown.json b/spec/server-discovery-and-monitoring/errors/stale-generation-PrimarySteppedDown.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/stale-generation-PrimarySteppedDown.json rename to spec/server-discovery-and-monitoring/errors/stale-generation-PrimarySteppedDown.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/stale-generation-PrimarySteppedDown.yml b/spec/server-discovery-and-monitoring/errors/stale-generation-PrimarySteppedDown.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/stale-generation-PrimarySteppedDown.yml rename to spec/server-discovery-and-monitoring/errors/stale-generation-PrimarySteppedDown.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/stale-generation-ShutdownInProgress.json b/spec/server-discovery-and-monitoring/errors/stale-generation-ShutdownInProgress.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/stale-generation-ShutdownInProgress.json rename to spec/server-discovery-and-monitoring/errors/stale-generation-ShutdownInProgress.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/stale-generation-ShutdownInProgress.yml b/spec/server-discovery-and-monitoring/errors/stale-generation-ShutdownInProgress.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/stale-generation-ShutdownInProgress.yml rename to spec/server-discovery-and-monitoring/errors/stale-generation-ShutdownInProgress.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-InterruptedAtShutdown.json b/spec/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-InterruptedAtShutdown.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-InterruptedAtShutdown.json rename to spec/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-InterruptedAtShutdown.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-InterruptedAtShutdown.yml b/spec/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-InterruptedAtShutdown.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-InterruptedAtShutdown.yml rename to spec/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-InterruptedAtShutdown.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-InterruptedDueToReplStateChange.json b/spec/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-InterruptedDueToReplStateChange.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-InterruptedDueToReplStateChange.json rename to spec/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-InterruptedDueToReplStateChange.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-InterruptedDueToReplStateChange.yml b/spec/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-InterruptedDueToReplStateChange.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-InterruptedDueToReplStateChange.yml rename to spec/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-InterruptedDueToReplStateChange.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-LegacyNotPrimary.json b/spec/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-LegacyNotPrimary.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-LegacyNotPrimary.json rename to spec/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-LegacyNotPrimary.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-LegacyNotPrimary.yml b/spec/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-LegacyNotPrimary.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-LegacyNotPrimary.yml rename to spec/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-LegacyNotPrimary.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-NotPrimaryNoSecondaryOk.json b/spec/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-NotPrimaryNoSecondaryOk.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-NotPrimaryNoSecondaryOk.json rename to spec/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-NotPrimaryNoSecondaryOk.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-NotPrimaryNoSecondaryOk.yml b/spec/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-NotPrimaryNoSecondaryOk.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-NotPrimaryNoSecondaryOk.yml rename to spec/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-NotPrimaryNoSecondaryOk.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-NotPrimaryOrSecondary.json b/spec/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-NotPrimaryOrSecondary.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-NotPrimaryOrSecondary.json rename to spec/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-NotPrimaryOrSecondary.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-NotPrimaryOrSecondary.yml b/spec/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-NotPrimaryOrSecondary.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-NotPrimaryOrSecondary.yml rename to spec/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-NotPrimaryOrSecondary.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-NotWritablePrimary.json b/spec/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-NotWritablePrimary.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-NotWritablePrimary.json rename to spec/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-NotWritablePrimary.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-NotWritablePrimary.yml b/spec/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-NotWritablePrimary.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-NotWritablePrimary.yml rename to spec/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-NotWritablePrimary.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-PrimarySteppedDown.json b/spec/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-PrimarySteppedDown.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-PrimarySteppedDown.json rename to spec/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-PrimarySteppedDown.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-PrimarySteppedDown.yml b/spec/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-PrimarySteppedDown.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-PrimarySteppedDown.yml rename to spec/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-PrimarySteppedDown.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-ShutdownInProgress.json b/spec/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-ShutdownInProgress.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-ShutdownInProgress.json rename to spec/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-ShutdownInProgress.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-ShutdownInProgress.yml b/spec/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-ShutdownInProgress.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-ShutdownInProgress.yml rename to spec/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-ShutdownInProgress.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-network.json b/spec/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-network.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-network.json rename to spec/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-network.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-network.yml b/spec/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-network.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-network.yml rename to spec/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-network.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-timeout.json b/spec/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-timeout.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-timeout.json rename to spec/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-timeout.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-timeout.yml b/spec/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-timeout.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-timeout.yml rename to spec/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-timeout.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-InterruptedAtShutdown.json b/spec/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-InterruptedAtShutdown.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-InterruptedAtShutdown.json rename to spec/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-InterruptedAtShutdown.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-InterruptedAtShutdown.yml b/spec/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-InterruptedAtShutdown.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-InterruptedAtShutdown.yml rename to spec/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-InterruptedAtShutdown.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-InterruptedDueToReplStateChange.json b/spec/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-InterruptedDueToReplStateChange.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-InterruptedDueToReplStateChange.json rename to spec/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-InterruptedDueToReplStateChange.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-InterruptedDueToReplStateChange.yml b/spec/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-InterruptedDueToReplStateChange.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-InterruptedDueToReplStateChange.yml rename to spec/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-InterruptedDueToReplStateChange.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-LegacyNotPrimary.json b/spec/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-LegacyNotPrimary.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-LegacyNotPrimary.json rename to spec/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-LegacyNotPrimary.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-LegacyNotPrimary.yml b/spec/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-LegacyNotPrimary.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-LegacyNotPrimary.yml rename to spec/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-LegacyNotPrimary.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-NotPrimaryNoSecondaryOk.json b/spec/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-NotPrimaryNoSecondaryOk.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-NotPrimaryNoSecondaryOk.json rename to spec/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-NotPrimaryNoSecondaryOk.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-NotPrimaryNoSecondaryOk.yml b/spec/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-NotPrimaryNoSecondaryOk.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-NotPrimaryNoSecondaryOk.yml rename to spec/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-NotPrimaryNoSecondaryOk.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-NotPrimaryOrSecondary.json b/spec/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-NotPrimaryOrSecondary.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-NotPrimaryOrSecondary.json rename to spec/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-NotPrimaryOrSecondary.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-NotPrimaryOrSecondary.yml b/spec/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-NotPrimaryOrSecondary.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-NotPrimaryOrSecondary.yml rename to spec/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-NotPrimaryOrSecondary.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-NotWritablePrimary.json b/spec/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-NotWritablePrimary.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-NotWritablePrimary.json rename to spec/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-NotWritablePrimary.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-NotWritablePrimary.yml b/spec/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-NotWritablePrimary.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-NotWritablePrimary.yml rename to spec/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-NotWritablePrimary.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-PrimarySteppedDown.json b/spec/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-PrimarySteppedDown.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-PrimarySteppedDown.json rename to spec/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-PrimarySteppedDown.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-PrimarySteppedDown.yml b/spec/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-PrimarySteppedDown.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-PrimarySteppedDown.yml rename to spec/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-PrimarySteppedDown.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-ShutdownInProgress.json b/spec/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-ShutdownInProgress.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-ShutdownInProgress.json rename to spec/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-ShutdownInProgress.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-ShutdownInProgress.yml b/spec/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-ShutdownInProgress.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-ShutdownInProgress.yml rename to spec/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-ShutdownInProgress.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-network.json b/spec/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-network.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-network.json rename to spec/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-network.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-network.yml b/spec/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-network.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-network.yml rename to spec/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-network.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-timeout.json b/spec/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-timeout.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-timeout.json rename to spec/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-timeout.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-timeout.yml b/spec/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-timeout.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-timeout.yml rename to spec/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-timeout.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/stale-generation.yml.template b/spec/server-discovery-and-monitoring/errors/stale-generation.yml.template similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/stale-generation.yml.template rename to spec/server-discovery-and-monitoring/errors/stale-generation.yml.template diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/stale-topologyVersion-InterruptedAtShutdown.json b/spec/server-discovery-and-monitoring/errors/stale-topologyVersion-InterruptedAtShutdown.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/stale-topologyVersion-InterruptedAtShutdown.json rename to spec/server-discovery-and-monitoring/errors/stale-topologyVersion-InterruptedAtShutdown.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/stale-topologyVersion-InterruptedAtShutdown.yml b/spec/server-discovery-and-monitoring/errors/stale-topologyVersion-InterruptedAtShutdown.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/stale-topologyVersion-InterruptedAtShutdown.yml rename to spec/server-discovery-and-monitoring/errors/stale-topologyVersion-InterruptedAtShutdown.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/stale-topologyVersion-InterruptedDueToReplStateChange.json b/spec/server-discovery-and-monitoring/errors/stale-topologyVersion-InterruptedDueToReplStateChange.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/stale-topologyVersion-InterruptedDueToReplStateChange.json rename to spec/server-discovery-and-monitoring/errors/stale-topologyVersion-InterruptedDueToReplStateChange.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/stale-topologyVersion-InterruptedDueToReplStateChange.yml b/spec/server-discovery-and-monitoring/errors/stale-topologyVersion-InterruptedDueToReplStateChange.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/stale-topologyVersion-InterruptedDueToReplStateChange.yml rename to spec/server-discovery-and-monitoring/errors/stale-topologyVersion-InterruptedDueToReplStateChange.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/stale-topologyVersion-LegacyNotPrimary.json b/spec/server-discovery-and-monitoring/errors/stale-topologyVersion-LegacyNotPrimary.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/stale-topologyVersion-LegacyNotPrimary.json rename to spec/server-discovery-and-monitoring/errors/stale-topologyVersion-LegacyNotPrimary.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/stale-topologyVersion-LegacyNotPrimary.yml b/spec/server-discovery-and-monitoring/errors/stale-topologyVersion-LegacyNotPrimary.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/stale-topologyVersion-LegacyNotPrimary.yml rename to spec/server-discovery-and-monitoring/errors/stale-topologyVersion-LegacyNotPrimary.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/stale-topologyVersion-NotPrimaryNoSecondaryOk.json b/spec/server-discovery-and-monitoring/errors/stale-topologyVersion-NotPrimaryNoSecondaryOk.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/stale-topologyVersion-NotPrimaryNoSecondaryOk.json rename to spec/server-discovery-and-monitoring/errors/stale-topologyVersion-NotPrimaryNoSecondaryOk.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/stale-topologyVersion-NotPrimaryNoSecondaryOk.yml b/spec/server-discovery-and-monitoring/errors/stale-topologyVersion-NotPrimaryNoSecondaryOk.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/stale-topologyVersion-NotPrimaryNoSecondaryOk.yml rename to spec/server-discovery-and-monitoring/errors/stale-topologyVersion-NotPrimaryNoSecondaryOk.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/stale-topologyVersion-NotPrimaryOrSecondary.json b/spec/server-discovery-and-monitoring/errors/stale-topologyVersion-NotPrimaryOrSecondary.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/stale-topologyVersion-NotPrimaryOrSecondary.json rename to spec/server-discovery-and-monitoring/errors/stale-topologyVersion-NotPrimaryOrSecondary.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/stale-topologyVersion-NotPrimaryOrSecondary.yml b/spec/server-discovery-and-monitoring/errors/stale-topologyVersion-NotPrimaryOrSecondary.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/stale-topologyVersion-NotPrimaryOrSecondary.yml rename to spec/server-discovery-and-monitoring/errors/stale-topologyVersion-NotPrimaryOrSecondary.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/stale-topologyVersion-NotWritablePrimary.json b/spec/server-discovery-and-monitoring/errors/stale-topologyVersion-NotWritablePrimary.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/stale-topologyVersion-NotWritablePrimary.json rename to spec/server-discovery-and-monitoring/errors/stale-topologyVersion-NotWritablePrimary.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/stale-topologyVersion-NotWritablePrimary.yml b/spec/server-discovery-and-monitoring/errors/stale-topologyVersion-NotWritablePrimary.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/stale-topologyVersion-NotWritablePrimary.yml rename to spec/server-discovery-and-monitoring/errors/stale-topologyVersion-NotWritablePrimary.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/stale-topologyVersion-PrimarySteppedDown.json b/spec/server-discovery-and-monitoring/errors/stale-topologyVersion-PrimarySteppedDown.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/stale-topologyVersion-PrimarySteppedDown.json rename to spec/server-discovery-and-monitoring/errors/stale-topologyVersion-PrimarySteppedDown.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/stale-topologyVersion-PrimarySteppedDown.yml b/spec/server-discovery-and-monitoring/errors/stale-topologyVersion-PrimarySteppedDown.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/stale-topologyVersion-PrimarySteppedDown.yml rename to spec/server-discovery-and-monitoring/errors/stale-topologyVersion-PrimarySteppedDown.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/stale-topologyVersion-ShutdownInProgress.json b/spec/server-discovery-and-monitoring/errors/stale-topologyVersion-ShutdownInProgress.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/stale-topologyVersion-ShutdownInProgress.json rename to spec/server-discovery-and-monitoring/errors/stale-topologyVersion-ShutdownInProgress.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/stale-topologyVersion-ShutdownInProgress.yml b/spec/server-discovery-and-monitoring/errors/stale-topologyVersion-ShutdownInProgress.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/stale-topologyVersion-ShutdownInProgress.yml rename to spec/server-discovery-and-monitoring/errors/stale-topologyVersion-ShutdownInProgress.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/stale-topologyVersion.yml.template b/spec/server-discovery-and-monitoring/errors/stale-topologyVersion.yml.template similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/stale-topologyVersion.yml.template rename to spec/server-discovery-and-monitoring/errors/stale-topologyVersion.yml.template diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/write_errors_ignored.json b/spec/server-discovery-and-monitoring/errors/write_errors_ignored.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/write_errors_ignored.json rename to spec/server-discovery-and-monitoring/errors/write_errors_ignored.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/errors/write_errors_ignored.yml b/spec/server-discovery-and-monitoring/errors/write_errors_ignored.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/errors/write_errors_ignored.yml rename to spec/server-discovery-and-monitoring/errors/write_errors_ignored.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/load-balanced/discover_load_balancer.json b/spec/server-discovery-and-monitoring/load-balanced/discover_load_balancer.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/load-balanced/discover_load_balancer.json rename to spec/server-discovery-and-monitoring/load-balanced/discover_load_balancer.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/load-balanced/discover_load_balancer.yml b/spec/server-discovery-and-monitoring/load-balanced/discover_load_balancer.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/load-balanced/discover_load_balancer.yml rename to spec/server-discovery-and-monitoring/load-balanced/discover_load_balancer.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/monitoring/README.md b/spec/server-discovery-and-monitoring/monitoring/README.md similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/monitoring/README.md rename to spec/server-discovery-and-monitoring/monitoring/README.md diff --git a/src/test/spec/json/server-discovery-and-monitoring/monitoring/discovered_standalone.json b/spec/server-discovery-and-monitoring/monitoring/discovered_standalone.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/monitoring/discovered_standalone.json rename to spec/server-discovery-and-monitoring/monitoring/discovered_standalone.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/monitoring/discovered_standalone.yml b/spec/server-discovery-and-monitoring/monitoring/discovered_standalone.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/monitoring/discovered_standalone.yml rename to spec/server-discovery-and-monitoring/monitoring/discovered_standalone.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/monitoring/load_balancer.json b/spec/server-discovery-and-monitoring/monitoring/load_balancer.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/monitoring/load_balancer.json rename to spec/server-discovery-and-monitoring/monitoring/load_balancer.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/monitoring/load_balancer.yml b/spec/server-discovery-and-monitoring/monitoring/load_balancer.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/monitoring/load_balancer.yml rename to spec/server-discovery-and-monitoring/monitoring/load_balancer.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/monitoring/replica_set_with_no_primary.json b/spec/server-discovery-and-monitoring/monitoring/replica_set_with_no_primary.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/monitoring/replica_set_with_no_primary.json rename to spec/server-discovery-and-monitoring/monitoring/replica_set_with_no_primary.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/monitoring/replica_set_with_no_primary.yml b/spec/server-discovery-and-monitoring/monitoring/replica_set_with_no_primary.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/monitoring/replica_set_with_no_primary.yml rename to spec/server-discovery-and-monitoring/monitoring/replica_set_with_no_primary.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/monitoring/replica_set_with_primary.json b/spec/server-discovery-and-monitoring/monitoring/replica_set_with_primary.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/monitoring/replica_set_with_primary.json rename to spec/server-discovery-and-monitoring/monitoring/replica_set_with_primary.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/monitoring/replica_set_with_primary.yml b/spec/server-discovery-and-monitoring/monitoring/replica_set_with_primary.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/monitoring/replica_set_with_primary.yml rename to spec/server-discovery-and-monitoring/monitoring/replica_set_with_primary.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/monitoring/replica_set_with_removal.json b/spec/server-discovery-and-monitoring/monitoring/replica_set_with_removal.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/monitoring/replica_set_with_removal.json rename to spec/server-discovery-and-monitoring/monitoring/replica_set_with_removal.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/monitoring/replica_set_with_removal.yml b/spec/server-discovery-and-monitoring/monitoring/replica_set_with_removal.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/monitoring/replica_set_with_removal.yml rename to spec/server-discovery-and-monitoring/monitoring/replica_set_with_removal.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/monitoring/required_replica_set.json b/spec/server-discovery-and-monitoring/monitoring/required_replica_set.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/monitoring/required_replica_set.json rename to spec/server-discovery-and-monitoring/monitoring/required_replica_set.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/monitoring/required_replica_set.yml b/spec/server-discovery-and-monitoring/monitoring/required_replica_set.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/monitoring/required_replica_set.yml rename to spec/server-discovery-and-monitoring/monitoring/required_replica_set.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/monitoring/standalone.json b/spec/server-discovery-and-monitoring/monitoring/standalone.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/monitoring/standalone.json rename to spec/server-discovery-and-monitoring/monitoring/standalone.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/monitoring/standalone.yml b/spec/server-discovery-and-monitoring/monitoring/standalone.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/monitoring/standalone.yml rename to spec/server-discovery-and-monitoring/monitoring/standalone.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/monitoring/standalone_suppress_equal_description_changes.json b/spec/server-discovery-and-monitoring/monitoring/standalone_suppress_equal_description_changes.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/monitoring/standalone_suppress_equal_description_changes.json rename to spec/server-discovery-and-monitoring/monitoring/standalone_suppress_equal_description_changes.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/monitoring/standalone_suppress_equal_description_changes.yml b/spec/server-discovery-and-monitoring/monitoring/standalone_suppress_equal_description_changes.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/monitoring/standalone_suppress_equal_description_changes.yml rename to spec/server-discovery-and-monitoring/monitoring/standalone_suppress_equal_description_changes.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/rs/compatible.json b/spec/server-discovery-and-monitoring/rs/compatible.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/rs/compatible.json rename to spec/server-discovery-and-monitoring/rs/compatible.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/rs/compatible.yml b/spec/server-discovery-and-monitoring/rs/compatible.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/rs/compatible.yml rename to spec/server-discovery-and-monitoring/rs/compatible.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/rs/compatible_unknown.json b/spec/server-discovery-and-monitoring/rs/compatible_unknown.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/rs/compatible_unknown.json rename to spec/server-discovery-and-monitoring/rs/compatible_unknown.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/rs/compatible_unknown.yml b/spec/server-discovery-and-monitoring/rs/compatible_unknown.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/rs/compatible_unknown.yml rename to spec/server-discovery-and-monitoring/rs/compatible_unknown.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/rs/discover_arbiters.json b/spec/server-discovery-and-monitoring/rs/discover_arbiters.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/rs/discover_arbiters.json rename to spec/server-discovery-and-monitoring/rs/discover_arbiters.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/rs/discover_arbiters.yml b/spec/server-discovery-and-monitoring/rs/discover_arbiters.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/rs/discover_arbiters.yml rename to spec/server-discovery-and-monitoring/rs/discover_arbiters.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/rs/discover_arbiters_replicaset.json b/spec/server-discovery-and-monitoring/rs/discover_arbiters_replicaset.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/rs/discover_arbiters_replicaset.json rename to spec/server-discovery-and-monitoring/rs/discover_arbiters_replicaset.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/rs/discover_arbiters_replicaset.yml b/spec/server-discovery-and-monitoring/rs/discover_arbiters_replicaset.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/rs/discover_arbiters_replicaset.yml rename to spec/server-discovery-and-monitoring/rs/discover_arbiters_replicaset.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/rs/discover_ghost.json b/spec/server-discovery-and-monitoring/rs/discover_ghost.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/rs/discover_ghost.json rename to spec/server-discovery-and-monitoring/rs/discover_ghost.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/rs/discover_ghost.yml b/spec/server-discovery-and-monitoring/rs/discover_ghost.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/rs/discover_ghost.yml rename to spec/server-discovery-and-monitoring/rs/discover_ghost.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/rs/discover_ghost_replicaset.json b/spec/server-discovery-and-monitoring/rs/discover_ghost_replicaset.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/rs/discover_ghost_replicaset.json rename to spec/server-discovery-and-monitoring/rs/discover_ghost_replicaset.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/rs/discover_ghost_replicaset.yml b/spec/server-discovery-and-monitoring/rs/discover_ghost_replicaset.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/rs/discover_ghost_replicaset.yml rename to spec/server-discovery-and-monitoring/rs/discover_ghost_replicaset.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/rs/discover_hidden.json b/spec/server-discovery-and-monitoring/rs/discover_hidden.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/rs/discover_hidden.json rename to spec/server-discovery-and-monitoring/rs/discover_hidden.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/rs/discover_hidden.yml b/spec/server-discovery-and-monitoring/rs/discover_hidden.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/rs/discover_hidden.yml rename to spec/server-discovery-and-monitoring/rs/discover_hidden.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/rs/discover_hidden_replicaset.json b/spec/server-discovery-and-monitoring/rs/discover_hidden_replicaset.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/rs/discover_hidden_replicaset.json rename to spec/server-discovery-and-monitoring/rs/discover_hidden_replicaset.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/rs/discover_hidden_replicaset.yml b/spec/server-discovery-and-monitoring/rs/discover_hidden_replicaset.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/rs/discover_hidden_replicaset.yml rename to spec/server-discovery-and-monitoring/rs/discover_hidden_replicaset.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/rs/discover_passives.json b/spec/server-discovery-and-monitoring/rs/discover_passives.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/rs/discover_passives.json rename to spec/server-discovery-and-monitoring/rs/discover_passives.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/rs/discover_passives.yml b/spec/server-discovery-and-monitoring/rs/discover_passives.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/rs/discover_passives.yml rename to spec/server-discovery-and-monitoring/rs/discover_passives.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/rs/discover_passives_replicaset.json b/spec/server-discovery-and-monitoring/rs/discover_passives_replicaset.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/rs/discover_passives_replicaset.json rename to spec/server-discovery-and-monitoring/rs/discover_passives_replicaset.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/rs/discover_passives_replicaset.yml b/spec/server-discovery-and-monitoring/rs/discover_passives_replicaset.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/rs/discover_passives_replicaset.yml rename to spec/server-discovery-and-monitoring/rs/discover_passives_replicaset.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/rs/discover_primary.json b/spec/server-discovery-and-monitoring/rs/discover_primary.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/rs/discover_primary.json rename to spec/server-discovery-and-monitoring/rs/discover_primary.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/rs/discover_primary.yml b/spec/server-discovery-and-monitoring/rs/discover_primary.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/rs/discover_primary.yml rename to spec/server-discovery-and-monitoring/rs/discover_primary.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/rs/discover_primary_replicaset.json b/spec/server-discovery-and-monitoring/rs/discover_primary_replicaset.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/rs/discover_primary_replicaset.json rename to spec/server-discovery-and-monitoring/rs/discover_primary_replicaset.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/rs/discover_primary_replicaset.yml b/spec/server-discovery-and-monitoring/rs/discover_primary_replicaset.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/rs/discover_primary_replicaset.yml rename to spec/server-discovery-and-monitoring/rs/discover_primary_replicaset.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/rs/discover_rsother.json b/spec/server-discovery-and-monitoring/rs/discover_rsother.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/rs/discover_rsother.json rename to spec/server-discovery-and-monitoring/rs/discover_rsother.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/rs/discover_rsother.yml b/spec/server-discovery-and-monitoring/rs/discover_rsother.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/rs/discover_rsother.yml rename to spec/server-discovery-and-monitoring/rs/discover_rsother.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/rs/discover_rsother_replicaset.json b/spec/server-discovery-and-monitoring/rs/discover_rsother_replicaset.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/rs/discover_rsother_replicaset.json rename to spec/server-discovery-and-monitoring/rs/discover_rsother_replicaset.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/rs/discover_rsother_replicaset.yml b/spec/server-discovery-and-monitoring/rs/discover_rsother_replicaset.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/rs/discover_rsother_replicaset.yml rename to spec/server-discovery-and-monitoring/rs/discover_rsother_replicaset.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/rs/discover_secondary.json b/spec/server-discovery-and-monitoring/rs/discover_secondary.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/rs/discover_secondary.json rename to spec/server-discovery-and-monitoring/rs/discover_secondary.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/rs/discover_secondary.yml b/spec/server-discovery-and-monitoring/rs/discover_secondary.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/rs/discover_secondary.yml rename to spec/server-discovery-and-monitoring/rs/discover_secondary.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/rs/discover_secondary_replicaset.json b/spec/server-discovery-and-monitoring/rs/discover_secondary_replicaset.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/rs/discover_secondary_replicaset.json rename to spec/server-discovery-and-monitoring/rs/discover_secondary_replicaset.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/rs/discover_secondary_replicaset.yml b/spec/server-discovery-and-monitoring/rs/discover_secondary_replicaset.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/rs/discover_secondary_replicaset.yml rename to spec/server-discovery-and-monitoring/rs/discover_secondary_replicaset.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/rs/discovery.json b/spec/server-discovery-and-monitoring/rs/discovery.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/rs/discovery.json rename to spec/server-discovery-and-monitoring/rs/discovery.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/rs/discovery.yml b/spec/server-discovery-and-monitoring/rs/discovery.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/rs/discovery.yml rename to spec/server-discovery-and-monitoring/rs/discovery.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/rs/electionId_precedence_setVersion.json b/spec/server-discovery-and-monitoring/rs/electionId_precedence_setVersion.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/rs/electionId_precedence_setVersion.json rename to spec/server-discovery-and-monitoring/rs/electionId_precedence_setVersion.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/rs/electionId_precedence_setVersion.yml b/spec/server-discovery-and-monitoring/rs/electionId_precedence_setVersion.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/rs/electionId_precedence_setVersion.yml rename to spec/server-discovery-and-monitoring/rs/electionId_precedence_setVersion.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/rs/equal_electionids.json b/spec/server-discovery-and-monitoring/rs/equal_electionids.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/rs/equal_electionids.json rename to spec/server-discovery-and-monitoring/rs/equal_electionids.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/rs/equal_electionids.yml b/spec/server-discovery-and-monitoring/rs/equal_electionids.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/rs/equal_electionids.yml rename to spec/server-discovery-and-monitoring/rs/equal_electionids.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/rs/hosts_differ_from_seeds.json b/spec/server-discovery-and-monitoring/rs/hosts_differ_from_seeds.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/rs/hosts_differ_from_seeds.json rename to spec/server-discovery-and-monitoring/rs/hosts_differ_from_seeds.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/rs/hosts_differ_from_seeds.yml b/spec/server-discovery-and-monitoring/rs/hosts_differ_from_seeds.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/rs/hosts_differ_from_seeds.yml rename to spec/server-discovery-and-monitoring/rs/hosts_differ_from_seeds.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/rs/incompatible_arbiter.json b/spec/server-discovery-and-monitoring/rs/incompatible_arbiter.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/rs/incompatible_arbiter.json rename to spec/server-discovery-and-monitoring/rs/incompatible_arbiter.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/rs/incompatible_arbiter.yml b/spec/server-discovery-and-monitoring/rs/incompatible_arbiter.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/rs/incompatible_arbiter.yml rename to spec/server-discovery-and-monitoring/rs/incompatible_arbiter.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/rs/incompatible_ghost.json b/spec/server-discovery-and-monitoring/rs/incompatible_ghost.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/rs/incompatible_ghost.json rename to spec/server-discovery-and-monitoring/rs/incompatible_ghost.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/rs/incompatible_ghost.yml b/spec/server-discovery-and-monitoring/rs/incompatible_ghost.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/rs/incompatible_ghost.yml rename to spec/server-discovery-and-monitoring/rs/incompatible_ghost.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/rs/incompatible_other.json b/spec/server-discovery-and-monitoring/rs/incompatible_other.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/rs/incompatible_other.json rename to spec/server-discovery-and-monitoring/rs/incompatible_other.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/rs/incompatible_other.yml b/spec/server-discovery-and-monitoring/rs/incompatible_other.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/rs/incompatible_other.yml rename to spec/server-discovery-and-monitoring/rs/incompatible_other.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/rs/ls_timeout.json b/spec/server-discovery-and-monitoring/rs/ls_timeout.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/rs/ls_timeout.json rename to spec/server-discovery-and-monitoring/rs/ls_timeout.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/rs/ls_timeout.yml b/spec/server-discovery-and-monitoring/rs/ls_timeout.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/rs/ls_timeout.yml rename to spec/server-discovery-and-monitoring/rs/ls_timeout.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/rs/member_reconfig.json b/spec/server-discovery-and-monitoring/rs/member_reconfig.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/rs/member_reconfig.json rename to spec/server-discovery-and-monitoring/rs/member_reconfig.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/rs/member_reconfig.yml b/spec/server-discovery-and-monitoring/rs/member_reconfig.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/rs/member_reconfig.yml rename to spec/server-discovery-and-monitoring/rs/member_reconfig.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/rs/member_standalone.json b/spec/server-discovery-and-monitoring/rs/member_standalone.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/rs/member_standalone.json rename to spec/server-discovery-and-monitoring/rs/member_standalone.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/rs/member_standalone.yml b/spec/server-discovery-and-monitoring/rs/member_standalone.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/rs/member_standalone.yml rename to spec/server-discovery-and-monitoring/rs/member_standalone.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/rs/new_primary.json b/spec/server-discovery-and-monitoring/rs/new_primary.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/rs/new_primary.json rename to spec/server-discovery-and-monitoring/rs/new_primary.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/rs/new_primary.yml b/spec/server-discovery-and-monitoring/rs/new_primary.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/rs/new_primary.yml rename to spec/server-discovery-and-monitoring/rs/new_primary.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/rs/new_primary_new_electionid.json b/spec/server-discovery-and-monitoring/rs/new_primary_new_electionid.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/rs/new_primary_new_electionid.json rename to spec/server-discovery-and-monitoring/rs/new_primary_new_electionid.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/rs/new_primary_new_electionid.yml b/spec/server-discovery-and-monitoring/rs/new_primary_new_electionid.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/rs/new_primary_new_electionid.yml rename to spec/server-discovery-and-monitoring/rs/new_primary_new_electionid.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/rs/new_primary_new_setversion.json b/spec/server-discovery-and-monitoring/rs/new_primary_new_setversion.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/rs/new_primary_new_setversion.json rename to spec/server-discovery-and-monitoring/rs/new_primary_new_setversion.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/rs/new_primary_new_setversion.yml b/spec/server-discovery-and-monitoring/rs/new_primary_new_setversion.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/rs/new_primary_new_setversion.yml rename to spec/server-discovery-and-monitoring/rs/new_primary_new_setversion.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/rs/new_primary_wrong_set_name.json b/spec/server-discovery-and-monitoring/rs/new_primary_wrong_set_name.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/rs/new_primary_wrong_set_name.json rename to spec/server-discovery-and-monitoring/rs/new_primary_wrong_set_name.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/rs/new_primary_wrong_set_name.yml b/spec/server-discovery-and-monitoring/rs/new_primary_wrong_set_name.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/rs/new_primary_wrong_set_name.yml rename to spec/server-discovery-and-monitoring/rs/new_primary_wrong_set_name.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/rs/non_rs_member.json b/spec/server-discovery-and-monitoring/rs/non_rs_member.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/rs/non_rs_member.json rename to spec/server-discovery-and-monitoring/rs/non_rs_member.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/rs/non_rs_member.yml b/spec/server-discovery-and-monitoring/rs/non_rs_member.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/rs/non_rs_member.yml rename to spec/server-discovery-and-monitoring/rs/non_rs_member.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/rs/normalize_case.json b/spec/server-discovery-and-monitoring/rs/normalize_case.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/rs/normalize_case.json rename to spec/server-discovery-and-monitoring/rs/normalize_case.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/rs/normalize_case.yml b/spec/server-discovery-and-monitoring/rs/normalize_case.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/rs/normalize_case.yml rename to spec/server-discovery-and-monitoring/rs/normalize_case.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/rs/normalize_case_me.json b/spec/server-discovery-and-monitoring/rs/normalize_case_me.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/rs/normalize_case_me.json rename to spec/server-discovery-and-monitoring/rs/normalize_case_me.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/rs/normalize_case_me.yml b/spec/server-discovery-and-monitoring/rs/normalize_case_me.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/rs/normalize_case_me.yml rename to spec/server-discovery-and-monitoring/rs/normalize_case_me.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/rs/null_election_id-pre-6.0.json b/spec/server-discovery-and-monitoring/rs/null_election_id-pre-6.0.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/rs/null_election_id-pre-6.0.json rename to spec/server-discovery-and-monitoring/rs/null_election_id-pre-6.0.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/rs/null_election_id-pre-6.0.yml b/spec/server-discovery-and-monitoring/rs/null_election_id-pre-6.0.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/rs/null_election_id-pre-6.0.yml rename to spec/server-discovery-and-monitoring/rs/null_election_id-pre-6.0.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/rs/null_election_id.json b/spec/server-discovery-and-monitoring/rs/null_election_id.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/rs/null_election_id.json rename to spec/server-discovery-and-monitoring/rs/null_election_id.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/rs/null_election_id.yml b/spec/server-discovery-and-monitoring/rs/null_election_id.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/rs/null_election_id.yml rename to spec/server-discovery-and-monitoring/rs/null_election_id.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/rs/primary_becomes_ghost.json b/spec/server-discovery-and-monitoring/rs/primary_becomes_ghost.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/rs/primary_becomes_ghost.json rename to spec/server-discovery-and-monitoring/rs/primary_becomes_ghost.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/rs/primary_becomes_ghost.yml b/spec/server-discovery-and-monitoring/rs/primary_becomes_ghost.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/rs/primary_becomes_ghost.yml rename to spec/server-discovery-and-monitoring/rs/primary_becomes_ghost.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/rs/primary_becomes_mongos.json b/spec/server-discovery-and-monitoring/rs/primary_becomes_mongos.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/rs/primary_becomes_mongos.json rename to spec/server-discovery-and-monitoring/rs/primary_becomes_mongos.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/rs/primary_becomes_mongos.yml b/spec/server-discovery-and-monitoring/rs/primary_becomes_mongos.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/rs/primary_becomes_mongos.yml rename to spec/server-discovery-and-monitoring/rs/primary_becomes_mongos.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/rs/primary_becomes_standalone.json b/spec/server-discovery-and-monitoring/rs/primary_becomes_standalone.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/rs/primary_becomes_standalone.json rename to spec/server-discovery-and-monitoring/rs/primary_becomes_standalone.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/rs/primary_becomes_standalone.yml b/spec/server-discovery-and-monitoring/rs/primary_becomes_standalone.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/rs/primary_becomes_standalone.yml rename to spec/server-discovery-and-monitoring/rs/primary_becomes_standalone.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/rs/primary_changes_set_name.json b/spec/server-discovery-and-monitoring/rs/primary_changes_set_name.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/rs/primary_changes_set_name.json rename to spec/server-discovery-and-monitoring/rs/primary_changes_set_name.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/rs/primary_changes_set_name.yml b/spec/server-discovery-and-monitoring/rs/primary_changes_set_name.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/rs/primary_changes_set_name.yml rename to spec/server-discovery-and-monitoring/rs/primary_changes_set_name.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/rs/primary_disconnect.json b/spec/server-discovery-and-monitoring/rs/primary_disconnect.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/rs/primary_disconnect.json rename to spec/server-discovery-and-monitoring/rs/primary_disconnect.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/rs/primary_disconnect.yml b/spec/server-discovery-and-monitoring/rs/primary_disconnect.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/rs/primary_disconnect.yml rename to spec/server-discovery-and-monitoring/rs/primary_disconnect.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/rs/primary_disconnect_electionid.json b/spec/server-discovery-and-monitoring/rs/primary_disconnect_electionid.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/rs/primary_disconnect_electionid.json rename to spec/server-discovery-and-monitoring/rs/primary_disconnect_electionid.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/rs/primary_disconnect_electionid.yml b/spec/server-discovery-and-monitoring/rs/primary_disconnect_electionid.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/rs/primary_disconnect_electionid.yml rename to spec/server-discovery-and-monitoring/rs/primary_disconnect_electionid.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/rs/primary_disconnect_setversion.json b/spec/server-discovery-and-monitoring/rs/primary_disconnect_setversion.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/rs/primary_disconnect_setversion.json rename to spec/server-discovery-and-monitoring/rs/primary_disconnect_setversion.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/rs/primary_disconnect_setversion.yml b/spec/server-discovery-and-monitoring/rs/primary_disconnect_setversion.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/rs/primary_disconnect_setversion.yml rename to spec/server-discovery-and-monitoring/rs/primary_disconnect_setversion.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/rs/primary_hint_from_secondary_with_mismatched_me.json b/spec/server-discovery-and-monitoring/rs/primary_hint_from_secondary_with_mismatched_me.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/rs/primary_hint_from_secondary_with_mismatched_me.json rename to spec/server-discovery-and-monitoring/rs/primary_hint_from_secondary_with_mismatched_me.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/rs/primary_hint_from_secondary_with_mismatched_me.yml b/spec/server-discovery-and-monitoring/rs/primary_hint_from_secondary_with_mismatched_me.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/rs/primary_hint_from_secondary_with_mismatched_me.yml rename to spec/server-discovery-and-monitoring/rs/primary_hint_from_secondary_with_mismatched_me.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/rs/primary_mismatched_me.json b/spec/server-discovery-and-monitoring/rs/primary_mismatched_me.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/rs/primary_mismatched_me.json rename to spec/server-discovery-and-monitoring/rs/primary_mismatched_me.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/rs/primary_mismatched_me.yml b/spec/server-discovery-and-monitoring/rs/primary_mismatched_me.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/rs/primary_mismatched_me.yml rename to spec/server-discovery-and-monitoring/rs/primary_mismatched_me.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/rs/primary_mismatched_me_not_removed.json b/spec/server-discovery-and-monitoring/rs/primary_mismatched_me_not_removed.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/rs/primary_mismatched_me_not_removed.json rename to spec/server-discovery-and-monitoring/rs/primary_mismatched_me_not_removed.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/rs/primary_mismatched_me_not_removed.yml b/spec/server-discovery-and-monitoring/rs/primary_mismatched_me_not_removed.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/rs/primary_mismatched_me_not_removed.yml rename to spec/server-discovery-and-monitoring/rs/primary_mismatched_me_not_removed.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/rs/primary_reports_new_member.json b/spec/server-discovery-and-monitoring/rs/primary_reports_new_member.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/rs/primary_reports_new_member.json rename to spec/server-discovery-and-monitoring/rs/primary_reports_new_member.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/rs/primary_reports_new_member.yml b/spec/server-discovery-and-monitoring/rs/primary_reports_new_member.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/rs/primary_reports_new_member.yml rename to spec/server-discovery-and-monitoring/rs/primary_reports_new_member.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/rs/primary_to_no_primary_mismatched_me.json b/spec/server-discovery-and-monitoring/rs/primary_to_no_primary_mismatched_me.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/rs/primary_to_no_primary_mismatched_me.json rename to spec/server-discovery-and-monitoring/rs/primary_to_no_primary_mismatched_me.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/rs/primary_to_no_primary_mismatched_me.yml b/spec/server-discovery-and-monitoring/rs/primary_to_no_primary_mismatched_me.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/rs/primary_to_no_primary_mismatched_me.yml rename to spec/server-discovery-and-monitoring/rs/primary_to_no_primary_mismatched_me.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/rs/primary_wrong_set_name.json b/spec/server-discovery-and-monitoring/rs/primary_wrong_set_name.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/rs/primary_wrong_set_name.json rename to spec/server-discovery-and-monitoring/rs/primary_wrong_set_name.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/rs/primary_wrong_set_name.yml b/spec/server-discovery-and-monitoring/rs/primary_wrong_set_name.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/rs/primary_wrong_set_name.yml rename to spec/server-discovery-and-monitoring/rs/primary_wrong_set_name.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/rs/repeated.json b/spec/server-discovery-and-monitoring/rs/repeated.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/rs/repeated.json rename to spec/server-discovery-and-monitoring/rs/repeated.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/rs/repeated.yml b/spec/server-discovery-and-monitoring/rs/repeated.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/rs/repeated.yml rename to spec/server-discovery-and-monitoring/rs/repeated.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/rs/replicaset_rsnp.json b/spec/server-discovery-and-monitoring/rs/replicaset_rsnp.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/rs/replicaset_rsnp.json rename to spec/server-discovery-and-monitoring/rs/replicaset_rsnp.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/rs/replicaset_rsnp.yml b/spec/server-discovery-and-monitoring/rs/replicaset_rsnp.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/rs/replicaset_rsnp.yml rename to spec/server-discovery-and-monitoring/rs/replicaset_rsnp.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/rs/response_from_removed.json b/spec/server-discovery-and-monitoring/rs/response_from_removed.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/rs/response_from_removed.json rename to spec/server-discovery-and-monitoring/rs/response_from_removed.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/rs/response_from_removed.yml b/spec/server-discovery-and-monitoring/rs/response_from_removed.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/rs/response_from_removed.yml rename to spec/server-discovery-and-monitoring/rs/response_from_removed.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/rs/sec_not_auth.json b/spec/server-discovery-and-monitoring/rs/sec_not_auth.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/rs/sec_not_auth.json rename to spec/server-discovery-and-monitoring/rs/sec_not_auth.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/rs/sec_not_auth.yml b/spec/server-discovery-and-monitoring/rs/sec_not_auth.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/rs/sec_not_auth.yml rename to spec/server-discovery-and-monitoring/rs/sec_not_auth.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/rs/secondary_ignore_ok_0-pre-6.0.json b/spec/server-discovery-and-monitoring/rs/secondary_ignore_ok_0-pre-6.0.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/rs/secondary_ignore_ok_0-pre-6.0.json rename to spec/server-discovery-and-monitoring/rs/secondary_ignore_ok_0-pre-6.0.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/rs/secondary_ignore_ok_0-pre-6.0.yml b/spec/server-discovery-and-monitoring/rs/secondary_ignore_ok_0-pre-6.0.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/rs/secondary_ignore_ok_0-pre-6.0.yml rename to spec/server-discovery-and-monitoring/rs/secondary_ignore_ok_0-pre-6.0.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/rs/secondary_ignore_ok_0.json b/spec/server-discovery-and-monitoring/rs/secondary_ignore_ok_0.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/rs/secondary_ignore_ok_0.json rename to spec/server-discovery-and-monitoring/rs/secondary_ignore_ok_0.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/rs/secondary_ignore_ok_0.yml b/spec/server-discovery-and-monitoring/rs/secondary_ignore_ok_0.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/rs/secondary_ignore_ok_0.yml rename to spec/server-discovery-and-monitoring/rs/secondary_ignore_ok_0.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/rs/secondary_ipv6_literal.json b/spec/server-discovery-and-monitoring/rs/secondary_ipv6_literal.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/rs/secondary_ipv6_literal.json rename to spec/server-discovery-and-monitoring/rs/secondary_ipv6_literal.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/rs/secondary_ipv6_literal.yml b/spec/server-discovery-and-monitoring/rs/secondary_ipv6_literal.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/rs/secondary_ipv6_literal.yml rename to spec/server-discovery-and-monitoring/rs/secondary_ipv6_literal.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/rs/secondary_mismatched_me.json b/spec/server-discovery-and-monitoring/rs/secondary_mismatched_me.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/rs/secondary_mismatched_me.json rename to spec/server-discovery-and-monitoring/rs/secondary_mismatched_me.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/rs/secondary_mismatched_me.yml b/spec/server-discovery-and-monitoring/rs/secondary_mismatched_me.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/rs/secondary_mismatched_me.yml rename to spec/server-discovery-and-monitoring/rs/secondary_mismatched_me.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/rs/secondary_wrong_set_name.json b/spec/server-discovery-and-monitoring/rs/secondary_wrong_set_name.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/rs/secondary_wrong_set_name.json rename to spec/server-discovery-and-monitoring/rs/secondary_wrong_set_name.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/rs/secondary_wrong_set_name.yml b/spec/server-discovery-and-monitoring/rs/secondary_wrong_set_name.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/rs/secondary_wrong_set_name.yml rename to spec/server-discovery-and-monitoring/rs/secondary_wrong_set_name.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/rs/secondary_wrong_set_name_with_primary.json b/spec/server-discovery-and-monitoring/rs/secondary_wrong_set_name_with_primary.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/rs/secondary_wrong_set_name_with_primary.json rename to spec/server-discovery-and-monitoring/rs/secondary_wrong_set_name_with_primary.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/rs/secondary_wrong_set_name_with_primary.yml b/spec/server-discovery-and-monitoring/rs/secondary_wrong_set_name_with_primary.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/rs/secondary_wrong_set_name_with_primary.yml rename to spec/server-discovery-and-monitoring/rs/secondary_wrong_set_name_with_primary.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/rs/set_version_can_rollback.json b/spec/server-discovery-and-monitoring/rs/set_version_can_rollback.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/rs/set_version_can_rollback.json rename to spec/server-discovery-and-monitoring/rs/set_version_can_rollback.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/rs/set_version_can_rollback.yml b/spec/server-discovery-and-monitoring/rs/set_version_can_rollback.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/rs/set_version_can_rollback.yml rename to spec/server-discovery-and-monitoring/rs/set_version_can_rollback.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/rs/setversion_equal_max_without_electionid.json b/spec/server-discovery-and-monitoring/rs/setversion_equal_max_without_electionid.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/rs/setversion_equal_max_without_electionid.json rename to spec/server-discovery-and-monitoring/rs/setversion_equal_max_without_electionid.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/rs/setversion_equal_max_without_electionid.yml b/spec/server-discovery-and-monitoring/rs/setversion_equal_max_without_electionid.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/rs/setversion_equal_max_without_electionid.yml rename to spec/server-discovery-and-monitoring/rs/setversion_equal_max_without_electionid.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/rs/setversion_greaterthan_max_without_electionid.json b/spec/server-discovery-and-monitoring/rs/setversion_greaterthan_max_without_electionid.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/rs/setversion_greaterthan_max_without_electionid.json rename to spec/server-discovery-and-monitoring/rs/setversion_greaterthan_max_without_electionid.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/rs/setversion_greaterthan_max_without_electionid.yml b/spec/server-discovery-and-monitoring/rs/setversion_greaterthan_max_without_electionid.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/rs/setversion_greaterthan_max_without_electionid.yml rename to spec/server-discovery-and-monitoring/rs/setversion_greaterthan_max_without_electionid.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/rs/setversion_without_electionid-pre-6.0.json b/spec/server-discovery-and-monitoring/rs/setversion_without_electionid-pre-6.0.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/rs/setversion_without_electionid-pre-6.0.json rename to spec/server-discovery-and-monitoring/rs/setversion_without_electionid-pre-6.0.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/rs/setversion_without_electionid-pre-6.0.yml b/spec/server-discovery-and-monitoring/rs/setversion_without_electionid-pre-6.0.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/rs/setversion_without_electionid-pre-6.0.yml rename to spec/server-discovery-and-monitoring/rs/setversion_without_electionid-pre-6.0.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/rs/setversion_without_electionid.json b/spec/server-discovery-and-monitoring/rs/setversion_without_electionid.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/rs/setversion_without_electionid.json rename to spec/server-discovery-and-monitoring/rs/setversion_without_electionid.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/rs/setversion_without_electionid.yml b/spec/server-discovery-and-monitoring/rs/setversion_without_electionid.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/rs/setversion_without_electionid.yml rename to spec/server-discovery-and-monitoring/rs/setversion_without_electionid.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/rs/stepdown_change_set_name.json b/spec/server-discovery-and-monitoring/rs/stepdown_change_set_name.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/rs/stepdown_change_set_name.json rename to spec/server-discovery-and-monitoring/rs/stepdown_change_set_name.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/rs/stepdown_change_set_name.yml b/spec/server-discovery-and-monitoring/rs/stepdown_change_set_name.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/rs/stepdown_change_set_name.yml rename to spec/server-discovery-and-monitoring/rs/stepdown_change_set_name.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/rs/too_new.json b/spec/server-discovery-and-monitoring/rs/too_new.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/rs/too_new.json rename to spec/server-discovery-and-monitoring/rs/too_new.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/rs/too_new.yml b/spec/server-discovery-and-monitoring/rs/too_new.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/rs/too_new.yml rename to spec/server-discovery-and-monitoring/rs/too_new.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/rs/too_old.json b/spec/server-discovery-and-monitoring/rs/too_old.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/rs/too_old.json rename to spec/server-discovery-and-monitoring/rs/too_old.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/rs/too_old.yml b/spec/server-discovery-and-monitoring/rs/too_old.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/rs/too_old.yml rename to spec/server-discovery-and-monitoring/rs/too_old.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/rs/topology_version_equal.json b/spec/server-discovery-and-monitoring/rs/topology_version_equal.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/rs/topology_version_equal.json rename to spec/server-discovery-and-monitoring/rs/topology_version_equal.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/rs/topology_version_equal.yml b/spec/server-discovery-and-monitoring/rs/topology_version_equal.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/rs/topology_version_equal.yml rename to spec/server-discovery-and-monitoring/rs/topology_version_equal.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/rs/topology_version_greater.json b/spec/server-discovery-and-monitoring/rs/topology_version_greater.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/rs/topology_version_greater.json rename to spec/server-discovery-and-monitoring/rs/topology_version_greater.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/rs/topology_version_greater.yml b/spec/server-discovery-and-monitoring/rs/topology_version_greater.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/rs/topology_version_greater.yml rename to spec/server-discovery-and-monitoring/rs/topology_version_greater.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/rs/topology_version_less.json b/spec/server-discovery-and-monitoring/rs/topology_version_less.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/rs/topology_version_less.json rename to spec/server-discovery-and-monitoring/rs/topology_version_less.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/rs/topology_version_less.yml b/spec/server-discovery-and-monitoring/rs/topology_version_less.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/rs/topology_version_less.yml rename to spec/server-discovery-and-monitoring/rs/topology_version_less.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/rs/unexpected_mongos.json b/spec/server-discovery-and-monitoring/rs/unexpected_mongos.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/rs/unexpected_mongos.json rename to spec/server-discovery-and-monitoring/rs/unexpected_mongos.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/rs/unexpected_mongos.yml b/spec/server-discovery-and-monitoring/rs/unexpected_mongos.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/rs/unexpected_mongos.yml rename to spec/server-discovery-and-monitoring/rs/unexpected_mongos.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/rs/use_setversion_without_electionid-pre-6.0.json b/spec/server-discovery-and-monitoring/rs/use_setversion_without_electionid-pre-6.0.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/rs/use_setversion_without_electionid-pre-6.0.json rename to spec/server-discovery-and-monitoring/rs/use_setversion_without_electionid-pre-6.0.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/rs/use_setversion_without_electionid-pre-6.0.yml b/spec/server-discovery-and-monitoring/rs/use_setversion_without_electionid-pre-6.0.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/rs/use_setversion_without_electionid-pre-6.0.yml rename to spec/server-discovery-and-monitoring/rs/use_setversion_without_electionid-pre-6.0.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/rs/use_setversion_without_electionid.json b/spec/server-discovery-and-monitoring/rs/use_setversion_without_electionid.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/rs/use_setversion_without_electionid.json rename to spec/server-discovery-and-monitoring/rs/use_setversion_without_electionid.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/rs/use_setversion_without_electionid.yml b/spec/server-discovery-and-monitoring/rs/use_setversion_without_electionid.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/rs/use_setversion_without_electionid.yml rename to spec/server-discovery-and-monitoring/rs/use_setversion_without_electionid.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/rs/wrong_set_name.json b/spec/server-discovery-and-monitoring/rs/wrong_set_name.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/rs/wrong_set_name.json rename to spec/server-discovery-and-monitoring/rs/wrong_set_name.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/rs/wrong_set_name.yml b/spec/server-discovery-and-monitoring/rs/wrong_set_name.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/rs/wrong_set_name.yml rename to spec/server-discovery-and-monitoring/rs/wrong_set_name.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/sharded/compatible.json b/spec/server-discovery-and-monitoring/sharded/compatible.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/sharded/compatible.json rename to spec/server-discovery-and-monitoring/sharded/compatible.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/sharded/compatible.yml b/spec/server-discovery-and-monitoring/sharded/compatible.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/sharded/compatible.yml rename to spec/server-discovery-and-monitoring/sharded/compatible.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/sharded/discover_single_mongos.json b/spec/server-discovery-and-monitoring/sharded/discover_single_mongos.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/sharded/discover_single_mongos.json rename to spec/server-discovery-and-monitoring/sharded/discover_single_mongos.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/sharded/discover_single_mongos.yml b/spec/server-discovery-and-monitoring/sharded/discover_single_mongos.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/sharded/discover_single_mongos.yml rename to spec/server-discovery-and-monitoring/sharded/discover_single_mongos.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/sharded/ls_timeout_mongos.json b/spec/server-discovery-and-monitoring/sharded/ls_timeout_mongos.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/sharded/ls_timeout_mongos.json rename to spec/server-discovery-and-monitoring/sharded/ls_timeout_mongos.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/sharded/ls_timeout_mongos.yml b/spec/server-discovery-and-monitoring/sharded/ls_timeout_mongos.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/sharded/ls_timeout_mongos.yml rename to spec/server-discovery-and-monitoring/sharded/ls_timeout_mongos.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/sharded/mongos_disconnect.json b/spec/server-discovery-and-monitoring/sharded/mongos_disconnect.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/sharded/mongos_disconnect.json rename to spec/server-discovery-and-monitoring/sharded/mongos_disconnect.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/sharded/mongos_disconnect.yml b/spec/server-discovery-and-monitoring/sharded/mongos_disconnect.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/sharded/mongos_disconnect.yml rename to spec/server-discovery-and-monitoring/sharded/mongos_disconnect.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/sharded/multiple_mongoses.json b/spec/server-discovery-and-monitoring/sharded/multiple_mongoses.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/sharded/multiple_mongoses.json rename to spec/server-discovery-and-monitoring/sharded/multiple_mongoses.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/sharded/multiple_mongoses.yml b/spec/server-discovery-and-monitoring/sharded/multiple_mongoses.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/sharded/multiple_mongoses.yml rename to spec/server-discovery-and-monitoring/sharded/multiple_mongoses.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/sharded/non_mongos_removed.json b/spec/server-discovery-and-monitoring/sharded/non_mongos_removed.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/sharded/non_mongos_removed.json rename to spec/server-discovery-and-monitoring/sharded/non_mongos_removed.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/sharded/non_mongos_removed.yml b/spec/server-discovery-and-monitoring/sharded/non_mongos_removed.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/sharded/non_mongos_removed.yml rename to spec/server-discovery-and-monitoring/sharded/non_mongos_removed.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/sharded/normalize_uri_case.json b/spec/server-discovery-and-monitoring/sharded/normalize_uri_case.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/sharded/normalize_uri_case.json rename to spec/server-discovery-and-monitoring/sharded/normalize_uri_case.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/sharded/normalize_uri_case.yml b/spec/server-discovery-and-monitoring/sharded/normalize_uri_case.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/sharded/normalize_uri_case.yml rename to spec/server-discovery-and-monitoring/sharded/normalize_uri_case.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/sharded/too_new.json b/spec/server-discovery-and-monitoring/sharded/too_new.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/sharded/too_new.json rename to spec/server-discovery-and-monitoring/sharded/too_new.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/sharded/too_new.yml b/spec/server-discovery-and-monitoring/sharded/too_new.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/sharded/too_new.yml rename to spec/server-discovery-and-monitoring/sharded/too_new.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/sharded/too_old.json b/spec/server-discovery-and-monitoring/sharded/too_old.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/sharded/too_old.json rename to spec/server-discovery-and-monitoring/sharded/too_old.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/sharded/too_old.yml b/spec/server-discovery-and-monitoring/sharded/too_old.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/sharded/too_old.yml rename to spec/server-discovery-and-monitoring/sharded/too_old.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/single/compatible.json b/spec/server-discovery-and-monitoring/single/compatible.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/single/compatible.json rename to spec/server-discovery-and-monitoring/single/compatible.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/single/compatible.yml b/spec/server-discovery-and-monitoring/single/compatible.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/single/compatible.yml rename to spec/server-discovery-and-monitoring/single/compatible.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/single/direct_connection_external_ip.json b/spec/server-discovery-and-monitoring/single/direct_connection_external_ip.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/single/direct_connection_external_ip.json rename to spec/server-discovery-and-monitoring/single/direct_connection_external_ip.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/single/direct_connection_external_ip.yml b/spec/server-discovery-and-monitoring/single/direct_connection_external_ip.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/single/direct_connection_external_ip.yml rename to spec/server-discovery-and-monitoring/single/direct_connection_external_ip.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/single/direct_connection_mongos.json b/spec/server-discovery-and-monitoring/single/direct_connection_mongos.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/single/direct_connection_mongos.json rename to spec/server-discovery-and-monitoring/single/direct_connection_mongos.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/single/direct_connection_mongos.yml b/spec/server-discovery-and-monitoring/single/direct_connection_mongos.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/single/direct_connection_mongos.yml rename to spec/server-discovery-and-monitoring/single/direct_connection_mongos.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/single/direct_connection_replicaset.json b/spec/server-discovery-and-monitoring/single/direct_connection_replicaset.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/single/direct_connection_replicaset.json rename to spec/server-discovery-and-monitoring/single/direct_connection_replicaset.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/single/direct_connection_replicaset.yml b/spec/server-discovery-and-monitoring/single/direct_connection_replicaset.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/single/direct_connection_replicaset.yml rename to spec/server-discovery-and-monitoring/single/direct_connection_replicaset.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/single/direct_connection_rsarbiter.json b/spec/server-discovery-and-monitoring/single/direct_connection_rsarbiter.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/single/direct_connection_rsarbiter.json rename to spec/server-discovery-and-monitoring/single/direct_connection_rsarbiter.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/single/direct_connection_rsarbiter.yml b/spec/server-discovery-and-monitoring/single/direct_connection_rsarbiter.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/single/direct_connection_rsarbiter.yml rename to spec/server-discovery-and-monitoring/single/direct_connection_rsarbiter.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/single/direct_connection_rsprimary.json b/spec/server-discovery-and-monitoring/single/direct_connection_rsprimary.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/single/direct_connection_rsprimary.json rename to spec/server-discovery-and-monitoring/single/direct_connection_rsprimary.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/single/direct_connection_rsprimary.yml b/spec/server-discovery-and-monitoring/single/direct_connection_rsprimary.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/single/direct_connection_rsprimary.yml rename to spec/server-discovery-and-monitoring/single/direct_connection_rsprimary.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/single/direct_connection_rssecondary.json b/spec/server-discovery-and-monitoring/single/direct_connection_rssecondary.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/single/direct_connection_rssecondary.json rename to spec/server-discovery-and-monitoring/single/direct_connection_rssecondary.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/single/direct_connection_rssecondary.yml b/spec/server-discovery-and-monitoring/single/direct_connection_rssecondary.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/single/direct_connection_rssecondary.yml rename to spec/server-discovery-and-monitoring/single/direct_connection_rssecondary.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/single/direct_connection_standalone.json b/spec/server-discovery-and-monitoring/single/direct_connection_standalone.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/single/direct_connection_standalone.json rename to spec/server-discovery-and-monitoring/single/direct_connection_standalone.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/single/direct_connection_standalone.yml b/spec/server-discovery-and-monitoring/single/direct_connection_standalone.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/single/direct_connection_standalone.yml rename to spec/server-discovery-and-monitoring/single/direct_connection_standalone.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/single/direct_connection_unavailable_seed.json b/spec/server-discovery-and-monitoring/single/direct_connection_unavailable_seed.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/single/direct_connection_unavailable_seed.json rename to spec/server-discovery-and-monitoring/single/direct_connection_unavailable_seed.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/single/direct_connection_unavailable_seed.yml b/spec/server-discovery-and-monitoring/single/direct_connection_unavailable_seed.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/single/direct_connection_unavailable_seed.yml rename to spec/server-discovery-and-monitoring/single/direct_connection_unavailable_seed.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/single/direct_connection_wrong_set_name.json b/spec/server-discovery-and-monitoring/single/direct_connection_wrong_set_name.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/single/direct_connection_wrong_set_name.json rename to spec/server-discovery-and-monitoring/single/direct_connection_wrong_set_name.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/single/direct_connection_wrong_set_name.yml b/spec/server-discovery-and-monitoring/single/direct_connection_wrong_set_name.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/single/direct_connection_wrong_set_name.yml rename to spec/server-discovery-and-monitoring/single/direct_connection_wrong_set_name.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/single/discover_standalone.json b/spec/server-discovery-and-monitoring/single/discover_standalone.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/single/discover_standalone.json rename to spec/server-discovery-and-monitoring/single/discover_standalone.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/single/discover_standalone.yml b/spec/server-discovery-and-monitoring/single/discover_standalone.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/single/discover_standalone.yml rename to spec/server-discovery-and-monitoring/single/discover_standalone.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/single/discover_unavailable_seed.json b/spec/server-discovery-and-monitoring/single/discover_unavailable_seed.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/single/discover_unavailable_seed.json rename to spec/server-discovery-and-monitoring/single/discover_unavailable_seed.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/single/discover_unavailable_seed.yml b/spec/server-discovery-and-monitoring/single/discover_unavailable_seed.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/single/discover_unavailable_seed.yml rename to spec/server-discovery-and-monitoring/single/discover_unavailable_seed.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/single/ls_timeout_standalone.json b/spec/server-discovery-and-monitoring/single/ls_timeout_standalone.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/single/ls_timeout_standalone.json rename to spec/server-discovery-and-monitoring/single/ls_timeout_standalone.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/single/ls_timeout_standalone.yml b/spec/server-discovery-and-monitoring/single/ls_timeout_standalone.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/single/ls_timeout_standalone.yml rename to spec/server-discovery-and-monitoring/single/ls_timeout_standalone.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/single/not_ok_response.json b/spec/server-discovery-and-monitoring/single/not_ok_response.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/single/not_ok_response.json rename to spec/server-discovery-and-monitoring/single/not_ok_response.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/single/not_ok_response.yml b/spec/server-discovery-and-monitoring/single/not_ok_response.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/single/not_ok_response.yml rename to spec/server-discovery-and-monitoring/single/not_ok_response.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/single/standalone_removed.json b/spec/server-discovery-and-monitoring/single/standalone_removed.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/single/standalone_removed.json rename to spec/server-discovery-and-monitoring/single/standalone_removed.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/single/standalone_removed.yml b/spec/server-discovery-and-monitoring/single/standalone_removed.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/single/standalone_removed.yml rename to spec/server-discovery-and-monitoring/single/standalone_removed.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/single/standalone_using_legacy_hello.json b/spec/server-discovery-and-monitoring/single/standalone_using_legacy_hello.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/single/standalone_using_legacy_hello.json rename to spec/server-discovery-and-monitoring/single/standalone_using_legacy_hello.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/single/standalone_using_legacy_hello.yml b/spec/server-discovery-and-monitoring/single/standalone_using_legacy_hello.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/single/standalone_using_legacy_hello.yml rename to spec/server-discovery-and-monitoring/single/standalone_using_legacy_hello.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/single/too_new.json b/spec/server-discovery-and-monitoring/single/too_new.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/single/too_new.json rename to spec/server-discovery-and-monitoring/single/too_new.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/single/too_new.yml b/spec/server-discovery-and-monitoring/single/too_new.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/single/too_new.yml rename to spec/server-discovery-and-monitoring/single/too_new.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/single/too_old.json b/spec/server-discovery-and-monitoring/single/too_old.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/single/too_old.json rename to spec/server-discovery-and-monitoring/single/too_old.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/single/too_old.yml b/spec/server-discovery-and-monitoring/single/too_old.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/single/too_old.yml rename to spec/server-discovery-and-monitoring/single/too_old.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/single/too_old_then_upgraded.json b/spec/server-discovery-and-monitoring/single/too_old_then_upgraded.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/single/too_old_then_upgraded.json rename to spec/server-discovery-and-monitoring/single/too_old_then_upgraded.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/single/too_old_then_upgraded.yml b/spec/server-discovery-and-monitoring/single/too_old_then_upgraded.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/single/too_old_then_upgraded.yml rename to spec/server-discovery-and-monitoring/single/too_old_then_upgraded.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/unified/auth-error.json b/spec/server-discovery-and-monitoring/unified/auth-error.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/unified/auth-error.json rename to spec/server-discovery-and-monitoring/unified/auth-error.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/unified/auth-error.yml b/spec/server-discovery-and-monitoring/unified/auth-error.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/unified/auth-error.yml rename to spec/server-discovery-and-monitoring/unified/auth-error.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/unified/auth-misc-command-error.json b/spec/server-discovery-and-monitoring/unified/auth-misc-command-error.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/unified/auth-misc-command-error.json rename to spec/server-discovery-and-monitoring/unified/auth-misc-command-error.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/unified/auth-misc-command-error.yml b/spec/server-discovery-and-monitoring/unified/auth-misc-command-error.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/unified/auth-misc-command-error.yml rename to spec/server-discovery-and-monitoring/unified/auth-misc-command-error.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/unified/auth-network-error.json b/spec/server-discovery-and-monitoring/unified/auth-network-error.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/unified/auth-network-error.json rename to spec/server-discovery-and-monitoring/unified/auth-network-error.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/unified/auth-network-error.yml b/spec/server-discovery-and-monitoring/unified/auth-network-error.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/unified/auth-network-error.yml rename to spec/server-discovery-and-monitoring/unified/auth-network-error.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/unified/auth-network-timeout-error.json b/spec/server-discovery-and-monitoring/unified/auth-network-timeout-error.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/unified/auth-network-timeout-error.json rename to spec/server-discovery-and-monitoring/unified/auth-network-timeout-error.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/unified/auth-network-timeout-error.yml b/spec/server-discovery-and-monitoring/unified/auth-network-timeout-error.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/unified/auth-network-timeout-error.yml rename to spec/server-discovery-and-monitoring/unified/auth-network-timeout-error.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/unified/auth-shutdown-error.json b/spec/server-discovery-and-monitoring/unified/auth-shutdown-error.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/unified/auth-shutdown-error.json rename to spec/server-discovery-and-monitoring/unified/auth-shutdown-error.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/unified/auth-shutdown-error.yml b/spec/server-discovery-and-monitoring/unified/auth-shutdown-error.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/unified/auth-shutdown-error.yml rename to spec/server-discovery-and-monitoring/unified/auth-shutdown-error.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/unified/cancel-server-check.json b/spec/server-discovery-and-monitoring/unified/cancel-server-check.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/unified/cancel-server-check.json rename to spec/server-discovery-and-monitoring/unified/cancel-server-check.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/unified/cancel-server-check.yml b/spec/server-discovery-and-monitoring/unified/cancel-server-check.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/unified/cancel-server-check.yml rename to spec/server-discovery-and-monitoring/unified/cancel-server-check.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/unified/connectTimeoutMS.json b/spec/server-discovery-and-monitoring/unified/connectTimeoutMS.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/unified/connectTimeoutMS.json rename to spec/server-discovery-and-monitoring/unified/connectTimeoutMS.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/unified/connectTimeoutMS.yml b/spec/server-discovery-and-monitoring/unified/connectTimeoutMS.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/unified/connectTimeoutMS.yml rename to spec/server-discovery-and-monitoring/unified/connectTimeoutMS.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/unified/find-network-error.json b/spec/server-discovery-and-monitoring/unified/find-network-error.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/unified/find-network-error.json rename to spec/server-discovery-and-monitoring/unified/find-network-error.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/unified/find-network-error.yml b/spec/server-discovery-and-monitoring/unified/find-network-error.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/unified/find-network-error.yml rename to spec/server-discovery-and-monitoring/unified/find-network-error.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/unified/find-network-timeout-error.json b/spec/server-discovery-and-monitoring/unified/find-network-timeout-error.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/unified/find-network-timeout-error.json rename to spec/server-discovery-and-monitoring/unified/find-network-timeout-error.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/unified/find-network-timeout-error.yml b/spec/server-discovery-and-monitoring/unified/find-network-timeout-error.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/unified/find-network-timeout-error.yml rename to spec/server-discovery-and-monitoring/unified/find-network-timeout-error.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/unified/find-shutdown-error.json b/spec/server-discovery-and-monitoring/unified/find-shutdown-error.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/unified/find-shutdown-error.json rename to spec/server-discovery-and-monitoring/unified/find-shutdown-error.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/unified/find-shutdown-error.yml b/spec/server-discovery-and-monitoring/unified/find-shutdown-error.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/unified/find-shutdown-error.yml rename to spec/server-discovery-and-monitoring/unified/find-shutdown-error.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/unified/hello-command-error.json b/spec/server-discovery-and-monitoring/unified/hello-command-error.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/unified/hello-command-error.json rename to spec/server-discovery-and-monitoring/unified/hello-command-error.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/unified/hello-command-error.yml b/spec/server-discovery-and-monitoring/unified/hello-command-error.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/unified/hello-command-error.yml rename to spec/server-discovery-and-monitoring/unified/hello-command-error.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/unified/hello-network-error.json b/spec/server-discovery-and-monitoring/unified/hello-network-error.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/unified/hello-network-error.json rename to spec/server-discovery-and-monitoring/unified/hello-network-error.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/unified/hello-network-error.yml b/spec/server-discovery-and-monitoring/unified/hello-network-error.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/unified/hello-network-error.yml rename to spec/server-discovery-and-monitoring/unified/hello-network-error.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/unified/hello-timeout.json b/spec/server-discovery-and-monitoring/unified/hello-timeout.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/unified/hello-timeout.json rename to spec/server-discovery-and-monitoring/unified/hello-timeout.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/unified/hello-timeout.yml b/spec/server-discovery-and-monitoring/unified/hello-timeout.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/unified/hello-timeout.yml rename to spec/server-discovery-and-monitoring/unified/hello-timeout.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/unified/insert-network-error.json b/spec/server-discovery-and-monitoring/unified/insert-network-error.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/unified/insert-network-error.json rename to spec/server-discovery-and-monitoring/unified/insert-network-error.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/unified/insert-network-error.yml b/spec/server-discovery-and-monitoring/unified/insert-network-error.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/unified/insert-network-error.yml rename to spec/server-discovery-and-monitoring/unified/insert-network-error.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/unified/insert-shutdown-error.json b/spec/server-discovery-and-monitoring/unified/insert-shutdown-error.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/unified/insert-shutdown-error.json rename to spec/server-discovery-and-monitoring/unified/insert-shutdown-error.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/unified/insert-shutdown-error.yml b/spec/server-discovery-and-monitoring/unified/insert-shutdown-error.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/unified/insert-shutdown-error.yml rename to spec/server-discovery-and-monitoring/unified/insert-shutdown-error.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/unified/interruptInUse-pool-clear.json b/spec/server-discovery-and-monitoring/unified/interruptInUse-pool-clear.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/unified/interruptInUse-pool-clear.json rename to spec/server-discovery-and-monitoring/unified/interruptInUse-pool-clear.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/unified/interruptInUse-pool-clear.yml b/spec/server-discovery-and-monitoring/unified/interruptInUse-pool-clear.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/unified/interruptInUse-pool-clear.yml rename to spec/server-discovery-and-monitoring/unified/interruptInUse-pool-clear.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/unified/loadbalanced-emit-topology-changed-before-close.json b/spec/server-discovery-and-monitoring/unified/loadbalanced-emit-topology-changed-before-close.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/unified/loadbalanced-emit-topology-changed-before-close.json rename to spec/server-discovery-and-monitoring/unified/loadbalanced-emit-topology-changed-before-close.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/unified/loadbalanced-emit-topology-changed-before-close.yml b/spec/server-discovery-and-monitoring/unified/loadbalanced-emit-topology-changed-before-close.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/unified/loadbalanced-emit-topology-changed-before-close.yml rename to spec/server-discovery-and-monitoring/unified/loadbalanced-emit-topology-changed-before-close.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/unified/logging-loadbalanced.json b/spec/server-discovery-and-monitoring/unified/logging-loadbalanced.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/unified/logging-loadbalanced.json rename to spec/server-discovery-and-monitoring/unified/logging-loadbalanced.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/unified/logging-loadbalanced.yml b/spec/server-discovery-and-monitoring/unified/logging-loadbalanced.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/unified/logging-loadbalanced.yml rename to spec/server-discovery-and-monitoring/unified/logging-loadbalanced.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/unified/logging-replicaset.json b/spec/server-discovery-and-monitoring/unified/logging-replicaset.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/unified/logging-replicaset.json rename to spec/server-discovery-and-monitoring/unified/logging-replicaset.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/unified/logging-replicaset.yml b/spec/server-discovery-and-monitoring/unified/logging-replicaset.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/unified/logging-replicaset.yml rename to spec/server-discovery-and-monitoring/unified/logging-replicaset.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/unified/logging-sharded.json b/spec/server-discovery-and-monitoring/unified/logging-sharded.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/unified/logging-sharded.json rename to spec/server-discovery-and-monitoring/unified/logging-sharded.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/unified/logging-sharded.yml b/spec/server-discovery-and-monitoring/unified/logging-sharded.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/unified/logging-sharded.yml rename to spec/server-discovery-and-monitoring/unified/logging-sharded.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/unified/logging-standalone.json b/spec/server-discovery-and-monitoring/unified/logging-standalone.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/unified/logging-standalone.json rename to spec/server-discovery-and-monitoring/unified/logging-standalone.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/unified/logging-standalone.yml b/spec/server-discovery-and-monitoring/unified/logging-standalone.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/unified/logging-standalone.yml rename to spec/server-discovery-and-monitoring/unified/logging-standalone.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/unified/minPoolSize-error.json b/spec/server-discovery-and-monitoring/unified/minPoolSize-error.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/unified/minPoolSize-error.json rename to spec/server-discovery-and-monitoring/unified/minPoolSize-error.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/unified/minPoolSize-error.yml b/spec/server-discovery-and-monitoring/unified/minPoolSize-error.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/unified/minPoolSize-error.yml rename to spec/server-discovery-and-monitoring/unified/minPoolSize-error.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/unified/pool-clear-application-error.json b/spec/server-discovery-and-monitoring/unified/pool-clear-application-error.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/unified/pool-clear-application-error.json rename to spec/server-discovery-and-monitoring/unified/pool-clear-application-error.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/unified/pool-clear-application-error.yml b/spec/server-discovery-and-monitoring/unified/pool-clear-application-error.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/unified/pool-clear-application-error.yml rename to spec/server-discovery-and-monitoring/unified/pool-clear-application-error.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/unified/pool-clear-checkout-error.json b/spec/server-discovery-and-monitoring/unified/pool-clear-checkout-error.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/unified/pool-clear-checkout-error.json rename to spec/server-discovery-and-monitoring/unified/pool-clear-checkout-error.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/unified/pool-clear-checkout-error.yml b/spec/server-discovery-and-monitoring/unified/pool-clear-checkout-error.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/unified/pool-clear-checkout-error.yml rename to spec/server-discovery-and-monitoring/unified/pool-clear-checkout-error.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/unified/pool-clear-min-pool-size-error.json b/spec/server-discovery-and-monitoring/unified/pool-clear-min-pool-size-error.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/unified/pool-clear-min-pool-size-error.json rename to spec/server-discovery-and-monitoring/unified/pool-clear-min-pool-size-error.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/unified/pool-clear-min-pool-size-error.yml b/spec/server-discovery-and-monitoring/unified/pool-clear-min-pool-size-error.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/unified/pool-clear-min-pool-size-error.yml rename to spec/server-discovery-and-monitoring/unified/pool-clear-min-pool-size-error.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/unified/pool-cleared-error.json b/spec/server-discovery-and-monitoring/unified/pool-cleared-error.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/unified/pool-cleared-error.json rename to spec/server-discovery-and-monitoring/unified/pool-cleared-error.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/unified/pool-cleared-error.yml b/spec/server-discovery-and-monitoring/unified/pool-cleared-error.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/unified/pool-cleared-error.yml rename to spec/server-discovery-and-monitoring/unified/pool-cleared-error.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/unified/rediscover-quickly-after-step-down.json b/spec/server-discovery-and-monitoring/unified/rediscover-quickly-after-step-down.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/unified/rediscover-quickly-after-step-down.json rename to spec/server-discovery-and-monitoring/unified/rediscover-quickly-after-step-down.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/unified/rediscover-quickly-after-step-down.yml b/spec/server-discovery-and-monitoring/unified/rediscover-quickly-after-step-down.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/unified/rediscover-quickly-after-step-down.yml rename to spec/server-discovery-and-monitoring/unified/rediscover-quickly-after-step-down.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/unified/replicaset-emit-topology-changed-before-close.json b/spec/server-discovery-and-monitoring/unified/replicaset-emit-topology-changed-before-close.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/unified/replicaset-emit-topology-changed-before-close.json rename to spec/server-discovery-and-monitoring/unified/replicaset-emit-topology-changed-before-close.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/unified/replicaset-emit-topology-changed-before-close.yml b/spec/server-discovery-and-monitoring/unified/replicaset-emit-topology-changed-before-close.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/unified/replicaset-emit-topology-changed-before-close.yml rename to spec/server-discovery-and-monitoring/unified/replicaset-emit-topology-changed-before-close.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/unified/serverMonitoringMode.json b/spec/server-discovery-and-monitoring/unified/serverMonitoringMode.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/unified/serverMonitoringMode.json rename to spec/server-discovery-and-monitoring/unified/serverMonitoringMode.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/unified/serverMonitoringMode.yml b/spec/server-discovery-and-monitoring/unified/serverMonitoringMode.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/unified/serverMonitoringMode.yml rename to spec/server-discovery-and-monitoring/unified/serverMonitoringMode.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/unified/sharded-emit-topology-changed-before-close.json b/spec/server-discovery-and-monitoring/unified/sharded-emit-topology-changed-before-close.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/unified/sharded-emit-topology-changed-before-close.json rename to spec/server-discovery-and-monitoring/unified/sharded-emit-topology-changed-before-close.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/unified/sharded-emit-topology-changed-before-close.yml b/spec/server-discovery-and-monitoring/unified/sharded-emit-topology-changed-before-close.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/unified/sharded-emit-topology-changed-before-close.yml rename to spec/server-discovery-and-monitoring/unified/sharded-emit-topology-changed-before-close.yml diff --git a/src/test/spec/json/server-discovery-and-monitoring/unified/standalone-emit-topology-changed-before-close.json b/spec/server-discovery-and-monitoring/unified/standalone-emit-topology-changed-before-close.json similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/unified/standalone-emit-topology-changed-before-close.json rename to spec/server-discovery-and-monitoring/unified/standalone-emit-topology-changed-before-close.json diff --git a/src/test/spec/json/server-discovery-and-monitoring/unified/standalone-emit-topology-changed-before-close.yml b/spec/server-discovery-and-monitoring/unified/standalone-emit-topology-changed-before-close.yml similarity index 100% rename from src/test/spec/json/server-discovery-and-monitoring/unified/standalone-emit-topology-changed-before-close.yml rename to spec/server-discovery-and-monitoring/unified/standalone-emit-topology-changed-before-close.yml diff --git a/src/test/spec/json/server-selection/README.md b/spec/server-selection/README.md similarity index 100% rename from src/test/spec/json/server-selection/README.md rename to spec/server-selection/README.md diff --git a/src/test/spec/json/server-selection/in_window/equilibrium.json b/spec/server-selection/in_window/equilibrium.json similarity index 100% rename from src/test/spec/json/server-selection/in_window/equilibrium.json rename to spec/server-selection/in_window/equilibrium.json diff --git a/src/test/spec/json/server-selection/in_window/equilibrium.yml b/spec/server-selection/in_window/equilibrium.yml similarity index 100% rename from src/test/spec/json/server-selection/in_window/equilibrium.yml rename to spec/server-selection/in_window/equilibrium.yml diff --git a/src/test/spec/json/server-selection/in_window/many-choices.json b/spec/server-selection/in_window/many-choices.json similarity index 100% rename from src/test/spec/json/server-selection/in_window/many-choices.json rename to spec/server-selection/in_window/many-choices.json diff --git a/src/test/spec/json/server-selection/in_window/many-choices.yml b/spec/server-selection/in_window/many-choices.yml similarity index 100% rename from src/test/spec/json/server-selection/in_window/many-choices.yml rename to spec/server-selection/in_window/many-choices.yml diff --git a/src/test/spec/json/server-selection/in_window/one-least-two-tied.json b/spec/server-selection/in_window/one-least-two-tied.json similarity index 100% rename from src/test/spec/json/server-selection/in_window/one-least-two-tied.json rename to spec/server-selection/in_window/one-least-two-tied.json diff --git a/src/test/spec/json/server-selection/in_window/one-least-two-tied.yml b/spec/server-selection/in_window/one-least-two-tied.yml similarity index 100% rename from src/test/spec/json/server-selection/in_window/one-least-two-tied.yml rename to spec/server-selection/in_window/one-least-two-tied.yml diff --git a/src/test/spec/json/server-selection/in_window/rs-equilibrium.json b/spec/server-selection/in_window/rs-equilibrium.json similarity index 100% rename from src/test/spec/json/server-selection/in_window/rs-equilibrium.json rename to spec/server-selection/in_window/rs-equilibrium.json diff --git a/src/test/spec/json/server-selection/in_window/rs-equilibrium.yml b/spec/server-selection/in_window/rs-equilibrium.yml similarity index 100% rename from src/test/spec/json/server-selection/in_window/rs-equilibrium.yml rename to spec/server-selection/in_window/rs-equilibrium.yml diff --git a/src/test/spec/json/server-selection/in_window/rs-three-choices.json b/spec/server-selection/in_window/rs-three-choices.json similarity index 100% rename from src/test/spec/json/server-selection/in_window/rs-three-choices.json rename to spec/server-selection/in_window/rs-three-choices.json diff --git a/src/test/spec/json/server-selection/in_window/rs-three-choices.yml b/spec/server-selection/in_window/rs-three-choices.yml similarity index 100% rename from src/test/spec/json/server-selection/in_window/rs-three-choices.yml rename to spec/server-selection/in_window/rs-three-choices.yml diff --git a/src/test/spec/json/server-selection/in_window/three-choices.json b/spec/server-selection/in_window/three-choices.json similarity index 100% rename from src/test/spec/json/server-selection/in_window/three-choices.json rename to spec/server-selection/in_window/three-choices.json diff --git a/src/test/spec/json/server-selection/in_window/three-choices.yml b/spec/server-selection/in_window/three-choices.yml similarity index 100% rename from src/test/spec/json/server-selection/in_window/three-choices.yml rename to spec/server-selection/in_window/three-choices.yml diff --git a/src/test/spec/json/server-selection/in_window/two-choices.json b/spec/server-selection/in_window/two-choices.json similarity index 100% rename from src/test/spec/json/server-selection/in_window/two-choices.json rename to spec/server-selection/in_window/two-choices.json diff --git a/src/test/spec/json/server-selection/in_window/two-choices.yml b/spec/server-selection/in_window/two-choices.yml similarity index 100% rename from src/test/spec/json/server-selection/in_window/two-choices.yml rename to spec/server-selection/in_window/two-choices.yml diff --git a/src/test/spec/json/server-selection/in_window/two-least.json b/spec/server-selection/in_window/two-least.json similarity index 100% rename from src/test/spec/json/server-selection/in_window/two-least.json rename to spec/server-selection/in_window/two-least.json diff --git a/src/test/spec/json/server-selection/in_window/two-least.yml b/spec/server-selection/in_window/two-least.yml similarity index 100% rename from src/test/spec/json/server-selection/in_window/two-least.yml rename to spec/server-selection/in_window/two-least.yml diff --git a/src/test/spec/json/server-selection/logging/load-balanced.json b/spec/server-selection/logging/load-balanced.json similarity index 100% rename from src/test/spec/json/server-selection/logging/load-balanced.json rename to spec/server-selection/logging/load-balanced.json diff --git a/src/test/spec/json/server-selection/logging/load-balanced.yml b/spec/server-selection/logging/load-balanced.yml similarity index 100% rename from src/test/spec/json/server-selection/logging/load-balanced.yml rename to spec/server-selection/logging/load-balanced.yml diff --git a/src/test/spec/json/server-selection/logging/operation-id.json b/spec/server-selection/logging/operation-id.json similarity index 100% rename from src/test/spec/json/server-selection/logging/operation-id.json rename to spec/server-selection/logging/operation-id.json diff --git a/src/test/spec/json/server-selection/logging/operation-id.yml b/spec/server-selection/logging/operation-id.yml similarity index 100% rename from src/test/spec/json/server-selection/logging/operation-id.yml rename to spec/server-selection/logging/operation-id.yml diff --git a/src/test/spec/json/server-selection/logging/replica-set.json b/spec/server-selection/logging/replica-set.json similarity index 100% rename from src/test/spec/json/server-selection/logging/replica-set.json rename to spec/server-selection/logging/replica-set.json diff --git a/src/test/spec/json/server-selection/logging/replica-set.yml b/spec/server-selection/logging/replica-set.yml similarity index 100% rename from src/test/spec/json/server-selection/logging/replica-set.yml rename to spec/server-selection/logging/replica-set.yml diff --git a/src/test/spec/json/server-selection/logging/sharded.json b/spec/server-selection/logging/sharded.json similarity index 100% rename from src/test/spec/json/server-selection/logging/sharded.json rename to spec/server-selection/logging/sharded.json diff --git a/src/test/spec/json/server-selection/logging/sharded.yml b/spec/server-selection/logging/sharded.yml similarity index 100% rename from src/test/spec/json/server-selection/logging/sharded.yml rename to spec/server-selection/logging/sharded.yml diff --git a/src/test/spec/json/server-selection/logging/standalone.json b/spec/server-selection/logging/standalone.json similarity index 100% rename from src/test/spec/json/server-selection/logging/standalone.json rename to spec/server-selection/logging/standalone.json diff --git a/src/test/spec/json/server-selection/logging/standalone.yml b/spec/server-selection/logging/standalone.yml similarity index 100% rename from src/test/spec/json/server-selection/logging/standalone.yml rename to spec/server-selection/logging/standalone.yml diff --git a/src/test/spec/json/server-selection/rtt/first_value.json b/spec/server-selection/rtt/first_value.json similarity index 100% rename from src/test/spec/json/server-selection/rtt/first_value.json rename to spec/server-selection/rtt/first_value.json diff --git a/src/test/spec/json/server-selection/rtt/first_value.yml b/spec/server-selection/rtt/first_value.yml similarity index 100% rename from src/test/spec/json/server-selection/rtt/first_value.yml rename to spec/server-selection/rtt/first_value.yml diff --git a/src/test/spec/json/server-selection/rtt/first_value_zero.json b/spec/server-selection/rtt/first_value_zero.json similarity index 100% rename from src/test/spec/json/server-selection/rtt/first_value_zero.json rename to spec/server-selection/rtt/first_value_zero.json diff --git a/src/test/spec/json/server-selection/rtt/first_value_zero.yml b/spec/server-selection/rtt/first_value_zero.yml similarity index 100% rename from src/test/spec/json/server-selection/rtt/first_value_zero.yml rename to spec/server-selection/rtt/first_value_zero.yml diff --git a/src/test/spec/json/server-selection/rtt/value_test_1.json b/spec/server-selection/rtt/value_test_1.json similarity index 100% rename from src/test/spec/json/server-selection/rtt/value_test_1.json rename to spec/server-selection/rtt/value_test_1.json diff --git a/src/test/spec/json/server-selection/rtt/value_test_1.yml b/spec/server-selection/rtt/value_test_1.yml similarity index 100% rename from src/test/spec/json/server-selection/rtt/value_test_1.yml rename to spec/server-selection/rtt/value_test_1.yml diff --git a/src/test/spec/json/server-selection/rtt/value_test_2.json b/spec/server-selection/rtt/value_test_2.json similarity index 100% rename from src/test/spec/json/server-selection/rtt/value_test_2.json rename to spec/server-selection/rtt/value_test_2.json diff --git a/src/test/spec/json/server-selection/rtt/value_test_2.yml b/spec/server-selection/rtt/value_test_2.yml similarity index 100% rename from src/test/spec/json/server-selection/rtt/value_test_2.yml rename to spec/server-selection/rtt/value_test_2.yml diff --git a/src/test/spec/json/server-selection/rtt/value_test_3.json b/spec/server-selection/rtt/value_test_3.json similarity index 100% rename from src/test/spec/json/server-selection/rtt/value_test_3.json rename to spec/server-selection/rtt/value_test_3.json diff --git a/src/test/spec/json/server-selection/rtt/value_test_3.yml b/spec/server-selection/rtt/value_test_3.yml similarity index 100% rename from src/test/spec/json/server-selection/rtt/value_test_3.yml rename to spec/server-selection/rtt/value_test_3.yml diff --git a/src/test/spec/json/server-selection/rtt/value_test_4.json b/spec/server-selection/rtt/value_test_4.json similarity index 100% rename from src/test/spec/json/server-selection/rtt/value_test_4.json rename to spec/server-selection/rtt/value_test_4.json diff --git a/src/test/spec/json/server-selection/rtt/value_test_4.yml b/spec/server-selection/rtt/value_test_4.yml similarity index 100% rename from src/test/spec/json/server-selection/rtt/value_test_4.yml rename to spec/server-selection/rtt/value_test_4.yml diff --git a/src/test/spec/json/server-selection/rtt/value_test_5.json b/spec/server-selection/rtt/value_test_5.json similarity index 100% rename from src/test/spec/json/server-selection/rtt/value_test_5.json rename to spec/server-selection/rtt/value_test_5.json diff --git a/src/test/spec/json/server-selection/rtt/value_test_5.yml b/spec/server-selection/rtt/value_test_5.yml similarity index 100% rename from src/test/spec/json/server-selection/rtt/value_test_5.yml rename to spec/server-selection/rtt/value_test_5.yml diff --git a/src/test/spec/json/server-selection/server_selection/LoadBalanced/read/Nearest.json b/spec/server-selection/server_selection/LoadBalanced/read/Nearest.json similarity index 100% rename from src/test/spec/json/server-selection/server_selection/LoadBalanced/read/Nearest.json rename to spec/server-selection/server_selection/LoadBalanced/read/Nearest.json diff --git a/src/test/spec/json/server-selection/server_selection/LoadBalanced/read/Nearest.yml b/spec/server-selection/server_selection/LoadBalanced/read/Nearest.yml similarity index 100% rename from src/test/spec/json/server-selection/server_selection/LoadBalanced/read/Nearest.yml rename to spec/server-selection/server_selection/LoadBalanced/read/Nearest.yml diff --git a/src/test/spec/json/server-selection/server_selection/LoadBalanced/read/Primary.json b/spec/server-selection/server_selection/LoadBalanced/read/Primary.json similarity index 100% rename from src/test/spec/json/server-selection/server_selection/LoadBalanced/read/Primary.json rename to spec/server-selection/server_selection/LoadBalanced/read/Primary.json diff --git a/src/test/spec/json/server-selection/server_selection/LoadBalanced/read/Primary.yml b/spec/server-selection/server_selection/LoadBalanced/read/Primary.yml similarity index 100% rename from src/test/spec/json/server-selection/server_selection/LoadBalanced/read/Primary.yml rename to spec/server-selection/server_selection/LoadBalanced/read/Primary.yml diff --git a/src/test/spec/json/server-selection/server_selection/LoadBalanced/read/PrimaryPreferred.json b/spec/server-selection/server_selection/LoadBalanced/read/PrimaryPreferred.json similarity index 100% rename from src/test/spec/json/server-selection/server_selection/LoadBalanced/read/PrimaryPreferred.json rename to spec/server-selection/server_selection/LoadBalanced/read/PrimaryPreferred.json diff --git a/src/test/spec/json/server-selection/server_selection/LoadBalanced/read/PrimaryPreferred.yml b/spec/server-selection/server_selection/LoadBalanced/read/PrimaryPreferred.yml similarity index 100% rename from src/test/spec/json/server-selection/server_selection/LoadBalanced/read/PrimaryPreferred.yml rename to spec/server-selection/server_selection/LoadBalanced/read/PrimaryPreferred.yml diff --git a/src/test/spec/json/server-selection/server_selection/LoadBalanced/read/Secondary.json b/spec/server-selection/server_selection/LoadBalanced/read/Secondary.json similarity index 100% rename from src/test/spec/json/server-selection/server_selection/LoadBalanced/read/Secondary.json rename to spec/server-selection/server_selection/LoadBalanced/read/Secondary.json diff --git a/src/test/spec/json/server-selection/server_selection/LoadBalanced/read/Secondary.yml b/spec/server-selection/server_selection/LoadBalanced/read/Secondary.yml similarity index 100% rename from src/test/spec/json/server-selection/server_selection/LoadBalanced/read/Secondary.yml rename to spec/server-selection/server_selection/LoadBalanced/read/Secondary.yml diff --git a/src/test/spec/json/server-selection/server_selection/LoadBalanced/read/SecondaryPreferred.json b/spec/server-selection/server_selection/LoadBalanced/read/SecondaryPreferred.json similarity index 100% rename from src/test/spec/json/server-selection/server_selection/LoadBalanced/read/SecondaryPreferred.json rename to spec/server-selection/server_selection/LoadBalanced/read/SecondaryPreferred.json diff --git a/src/test/spec/json/server-selection/server_selection/LoadBalanced/read/SecondaryPreferred.yml b/spec/server-selection/server_selection/LoadBalanced/read/SecondaryPreferred.yml similarity index 100% rename from src/test/spec/json/server-selection/server_selection/LoadBalanced/read/SecondaryPreferred.yml rename to spec/server-selection/server_selection/LoadBalanced/read/SecondaryPreferred.yml diff --git a/src/test/spec/json/server-selection/server_selection/LoadBalanced/write/Nearest.json b/spec/server-selection/server_selection/LoadBalanced/write/Nearest.json similarity index 100% rename from src/test/spec/json/server-selection/server_selection/LoadBalanced/write/Nearest.json rename to spec/server-selection/server_selection/LoadBalanced/write/Nearest.json diff --git a/src/test/spec/json/server-selection/server_selection/LoadBalanced/write/Nearest.yml b/spec/server-selection/server_selection/LoadBalanced/write/Nearest.yml similarity index 100% rename from src/test/spec/json/server-selection/server_selection/LoadBalanced/write/Nearest.yml rename to spec/server-selection/server_selection/LoadBalanced/write/Nearest.yml diff --git a/src/test/spec/json/server-selection/server_selection/LoadBalanced/write/Primary.json b/spec/server-selection/server_selection/LoadBalanced/write/Primary.json similarity index 100% rename from src/test/spec/json/server-selection/server_selection/LoadBalanced/write/Primary.json rename to spec/server-selection/server_selection/LoadBalanced/write/Primary.json diff --git a/src/test/spec/json/server-selection/server_selection/LoadBalanced/write/Primary.yml b/spec/server-selection/server_selection/LoadBalanced/write/Primary.yml similarity index 100% rename from src/test/spec/json/server-selection/server_selection/LoadBalanced/write/Primary.yml rename to spec/server-selection/server_selection/LoadBalanced/write/Primary.yml diff --git a/src/test/spec/json/server-selection/server_selection/LoadBalanced/write/PrimaryPreferred.json b/spec/server-selection/server_selection/LoadBalanced/write/PrimaryPreferred.json similarity index 100% rename from src/test/spec/json/server-selection/server_selection/LoadBalanced/write/PrimaryPreferred.json rename to spec/server-selection/server_selection/LoadBalanced/write/PrimaryPreferred.json diff --git a/src/test/spec/json/server-selection/server_selection/LoadBalanced/write/PrimaryPreferred.yml b/spec/server-selection/server_selection/LoadBalanced/write/PrimaryPreferred.yml similarity index 100% rename from src/test/spec/json/server-selection/server_selection/LoadBalanced/write/PrimaryPreferred.yml rename to spec/server-selection/server_selection/LoadBalanced/write/PrimaryPreferred.yml diff --git a/src/test/spec/json/server-selection/server_selection/LoadBalanced/write/Secondary.json b/spec/server-selection/server_selection/LoadBalanced/write/Secondary.json similarity index 100% rename from src/test/spec/json/server-selection/server_selection/LoadBalanced/write/Secondary.json rename to spec/server-selection/server_selection/LoadBalanced/write/Secondary.json diff --git a/src/test/spec/json/server-selection/server_selection/LoadBalanced/write/Secondary.yml b/spec/server-selection/server_selection/LoadBalanced/write/Secondary.yml similarity index 100% rename from src/test/spec/json/server-selection/server_selection/LoadBalanced/write/Secondary.yml rename to spec/server-selection/server_selection/LoadBalanced/write/Secondary.yml diff --git a/src/test/spec/json/server-selection/server_selection/LoadBalanced/write/SecondaryPreferred.json b/spec/server-selection/server_selection/LoadBalanced/write/SecondaryPreferred.json similarity index 100% rename from src/test/spec/json/server-selection/server_selection/LoadBalanced/write/SecondaryPreferred.json rename to spec/server-selection/server_selection/LoadBalanced/write/SecondaryPreferred.json diff --git a/src/test/spec/json/server-selection/server_selection/LoadBalanced/write/SecondaryPreferred.yml b/spec/server-selection/server_selection/LoadBalanced/write/SecondaryPreferred.yml similarity index 100% rename from src/test/spec/json/server-selection/server_selection/LoadBalanced/write/SecondaryPreferred.yml rename to spec/server-selection/server_selection/LoadBalanced/write/SecondaryPreferred.yml diff --git a/src/test/spec/json/server-selection/server_selection/ReplicaSetNoPrimary/read/Nearest.json b/spec/server-selection/server_selection/ReplicaSetNoPrimary/read/Nearest.json similarity index 100% rename from src/test/spec/json/server-selection/server_selection/ReplicaSetNoPrimary/read/Nearest.json rename to spec/server-selection/server_selection/ReplicaSetNoPrimary/read/Nearest.json diff --git a/src/test/spec/json/server-selection/server_selection/ReplicaSetNoPrimary/read/Nearest.yml b/spec/server-selection/server_selection/ReplicaSetNoPrimary/read/Nearest.yml similarity index 100% rename from src/test/spec/json/server-selection/server_selection/ReplicaSetNoPrimary/read/Nearest.yml rename to spec/server-selection/server_selection/ReplicaSetNoPrimary/read/Nearest.yml diff --git a/src/test/spec/json/server-selection/server_selection/ReplicaSetNoPrimary/read/Nearest_multiple.json b/spec/server-selection/server_selection/ReplicaSetNoPrimary/read/Nearest_multiple.json similarity index 100% rename from src/test/spec/json/server-selection/server_selection/ReplicaSetNoPrimary/read/Nearest_multiple.json rename to spec/server-selection/server_selection/ReplicaSetNoPrimary/read/Nearest_multiple.json diff --git a/src/test/spec/json/server-selection/server_selection/ReplicaSetNoPrimary/read/Nearest_multiple.yml b/spec/server-selection/server_selection/ReplicaSetNoPrimary/read/Nearest_multiple.yml similarity index 100% rename from src/test/spec/json/server-selection/server_selection/ReplicaSetNoPrimary/read/Nearest_multiple.yml rename to spec/server-selection/server_selection/ReplicaSetNoPrimary/read/Nearest_multiple.yml diff --git a/src/test/spec/json/server-selection/server_selection/ReplicaSetNoPrimary/read/Nearest_non_matching.json b/spec/server-selection/server_selection/ReplicaSetNoPrimary/read/Nearest_non_matching.json similarity index 100% rename from src/test/spec/json/server-selection/server_selection/ReplicaSetNoPrimary/read/Nearest_non_matching.json rename to spec/server-selection/server_selection/ReplicaSetNoPrimary/read/Nearest_non_matching.json diff --git a/src/test/spec/json/server-selection/server_selection/ReplicaSetNoPrimary/read/Nearest_non_matching.yml b/spec/server-selection/server_selection/ReplicaSetNoPrimary/read/Nearest_non_matching.yml similarity index 100% rename from src/test/spec/json/server-selection/server_selection/ReplicaSetNoPrimary/read/Nearest_non_matching.yml rename to spec/server-selection/server_selection/ReplicaSetNoPrimary/read/Nearest_non_matching.yml diff --git a/src/test/spec/json/server-selection/server_selection/ReplicaSetNoPrimary/read/PossiblePrimary.json b/spec/server-selection/server_selection/ReplicaSetNoPrimary/read/PossiblePrimary.json similarity index 100% rename from src/test/spec/json/server-selection/server_selection/ReplicaSetNoPrimary/read/PossiblePrimary.json rename to spec/server-selection/server_selection/ReplicaSetNoPrimary/read/PossiblePrimary.json diff --git a/src/test/spec/json/server-selection/server_selection/ReplicaSetNoPrimary/read/PossiblePrimary.yml b/spec/server-selection/server_selection/ReplicaSetNoPrimary/read/PossiblePrimary.yml similarity index 100% rename from src/test/spec/json/server-selection/server_selection/ReplicaSetNoPrimary/read/PossiblePrimary.yml rename to spec/server-selection/server_selection/ReplicaSetNoPrimary/read/PossiblePrimary.yml diff --git a/src/test/spec/json/server-selection/server_selection/ReplicaSetNoPrimary/read/PossiblePrimaryNearest.json b/spec/server-selection/server_selection/ReplicaSetNoPrimary/read/PossiblePrimaryNearest.json similarity index 100% rename from src/test/spec/json/server-selection/server_selection/ReplicaSetNoPrimary/read/PossiblePrimaryNearest.json rename to spec/server-selection/server_selection/ReplicaSetNoPrimary/read/PossiblePrimaryNearest.json diff --git a/src/test/spec/json/server-selection/server_selection/ReplicaSetNoPrimary/read/PossiblePrimaryNearest.yml b/spec/server-selection/server_selection/ReplicaSetNoPrimary/read/PossiblePrimaryNearest.yml similarity index 100% rename from src/test/spec/json/server-selection/server_selection/ReplicaSetNoPrimary/read/PossiblePrimaryNearest.yml rename to spec/server-selection/server_selection/ReplicaSetNoPrimary/read/PossiblePrimaryNearest.yml diff --git a/src/test/spec/json/server-selection/server_selection/ReplicaSetNoPrimary/read/Primary.json b/spec/server-selection/server_selection/ReplicaSetNoPrimary/read/Primary.json similarity index 100% rename from src/test/spec/json/server-selection/server_selection/ReplicaSetNoPrimary/read/Primary.json rename to spec/server-selection/server_selection/ReplicaSetNoPrimary/read/Primary.json diff --git a/src/test/spec/json/server-selection/server_selection/ReplicaSetNoPrimary/read/Primary.yml b/spec/server-selection/server_selection/ReplicaSetNoPrimary/read/Primary.yml similarity index 100% rename from src/test/spec/json/server-selection/server_selection/ReplicaSetNoPrimary/read/Primary.yml rename to spec/server-selection/server_selection/ReplicaSetNoPrimary/read/Primary.yml diff --git a/src/test/spec/json/server-selection/server_selection/ReplicaSetNoPrimary/read/PrimaryPreferred.json b/spec/server-selection/server_selection/ReplicaSetNoPrimary/read/PrimaryPreferred.json similarity index 100% rename from src/test/spec/json/server-selection/server_selection/ReplicaSetNoPrimary/read/PrimaryPreferred.json rename to spec/server-selection/server_selection/ReplicaSetNoPrimary/read/PrimaryPreferred.json diff --git a/src/test/spec/json/server-selection/server_selection/ReplicaSetNoPrimary/read/PrimaryPreferred.yml b/spec/server-selection/server_selection/ReplicaSetNoPrimary/read/PrimaryPreferred.yml similarity index 100% rename from src/test/spec/json/server-selection/server_selection/ReplicaSetNoPrimary/read/PrimaryPreferred.yml rename to spec/server-selection/server_selection/ReplicaSetNoPrimary/read/PrimaryPreferred.yml diff --git a/src/test/spec/json/server-selection/server_selection/ReplicaSetNoPrimary/read/PrimaryPreferred_non_matching.json b/spec/server-selection/server_selection/ReplicaSetNoPrimary/read/PrimaryPreferred_non_matching.json similarity index 100% rename from src/test/spec/json/server-selection/server_selection/ReplicaSetNoPrimary/read/PrimaryPreferred_non_matching.json rename to spec/server-selection/server_selection/ReplicaSetNoPrimary/read/PrimaryPreferred_non_matching.json diff --git a/src/test/spec/json/server-selection/server_selection/ReplicaSetNoPrimary/read/PrimaryPreferred_non_matching.yml b/spec/server-selection/server_selection/ReplicaSetNoPrimary/read/PrimaryPreferred_non_matching.yml similarity index 100% rename from src/test/spec/json/server-selection/server_selection/ReplicaSetNoPrimary/read/PrimaryPreferred_non_matching.yml rename to spec/server-selection/server_selection/ReplicaSetNoPrimary/read/PrimaryPreferred_non_matching.yml diff --git a/src/test/spec/json/server-selection/server_selection/ReplicaSetNoPrimary/read/Secondary.json b/spec/server-selection/server_selection/ReplicaSetNoPrimary/read/Secondary.json similarity index 100% rename from src/test/spec/json/server-selection/server_selection/ReplicaSetNoPrimary/read/Secondary.json rename to spec/server-selection/server_selection/ReplicaSetNoPrimary/read/Secondary.json diff --git a/src/test/spec/json/server-selection/server_selection/ReplicaSetNoPrimary/read/Secondary.yml b/spec/server-selection/server_selection/ReplicaSetNoPrimary/read/Secondary.yml similarity index 100% rename from src/test/spec/json/server-selection/server_selection/ReplicaSetNoPrimary/read/Secondary.yml rename to spec/server-selection/server_selection/ReplicaSetNoPrimary/read/Secondary.yml diff --git a/src/test/spec/json/server-selection/server_selection/ReplicaSetNoPrimary/read/SecondaryPreferred.json b/spec/server-selection/server_selection/ReplicaSetNoPrimary/read/SecondaryPreferred.json similarity index 100% rename from src/test/spec/json/server-selection/server_selection/ReplicaSetNoPrimary/read/SecondaryPreferred.json rename to spec/server-selection/server_selection/ReplicaSetNoPrimary/read/SecondaryPreferred.json diff --git a/src/test/spec/json/server-selection/server_selection/ReplicaSetNoPrimary/read/SecondaryPreferred.yml b/spec/server-selection/server_selection/ReplicaSetNoPrimary/read/SecondaryPreferred.yml similarity index 100% rename from src/test/spec/json/server-selection/server_selection/ReplicaSetNoPrimary/read/SecondaryPreferred.yml rename to spec/server-selection/server_selection/ReplicaSetNoPrimary/read/SecondaryPreferred.yml diff --git a/src/test/spec/json/server-selection/server_selection/ReplicaSetNoPrimary/read/SecondaryPreferred_non_matching.json b/spec/server-selection/server_selection/ReplicaSetNoPrimary/read/SecondaryPreferred_non_matching.json similarity index 100% rename from src/test/spec/json/server-selection/server_selection/ReplicaSetNoPrimary/read/SecondaryPreferred_non_matching.json rename to spec/server-selection/server_selection/ReplicaSetNoPrimary/read/SecondaryPreferred_non_matching.json diff --git a/src/test/spec/json/server-selection/server_selection/ReplicaSetNoPrimary/read/SecondaryPreferred_non_matching.yml b/spec/server-selection/server_selection/ReplicaSetNoPrimary/read/SecondaryPreferred_non_matching.yml similarity index 100% rename from src/test/spec/json/server-selection/server_selection/ReplicaSetNoPrimary/read/SecondaryPreferred_non_matching.yml rename to spec/server-selection/server_selection/ReplicaSetNoPrimary/read/SecondaryPreferred_non_matching.yml diff --git a/src/test/spec/json/server-selection/server_selection/ReplicaSetNoPrimary/read/Secondary_multi_tags.json b/spec/server-selection/server_selection/ReplicaSetNoPrimary/read/Secondary_multi_tags.json similarity index 100% rename from src/test/spec/json/server-selection/server_selection/ReplicaSetNoPrimary/read/Secondary_multi_tags.json rename to spec/server-selection/server_selection/ReplicaSetNoPrimary/read/Secondary_multi_tags.json diff --git a/src/test/spec/json/server-selection/server_selection/ReplicaSetNoPrimary/read/Secondary_multi_tags.yml b/spec/server-selection/server_selection/ReplicaSetNoPrimary/read/Secondary_multi_tags.yml similarity index 100% rename from src/test/spec/json/server-selection/server_selection/ReplicaSetNoPrimary/read/Secondary_multi_tags.yml rename to spec/server-selection/server_selection/ReplicaSetNoPrimary/read/Secondary_multi_tags.yml diff --git a/src/test/spec/json/server-selection/server_selection/ReplicaSetNoPrimary/read/Secondary_multi_tags2.json b/spec/server-selection/server_selection/ReplicaSetNoPrimary/read/Secondary_multi_tags2.json similarity index 100% rename from src/test/spec/json/server-selection/server_selection/ReplicaSetNoPrimary/read/Secondary_multi_tags2.json rename to spec/server-selection/server_selection/ReplicaSetNoPrimary/read/Secondary_multi_tags2.json diff --git a/src/test/spec/json/server-selection/server_selection/ReplicaSetNoPrimary/read/Secondary_multi_tags2.yml b/spec/server-selection/server_selection/ReplicaSetNoPrimary/read/Secondary_multi_tags2.yml similarity index 100% rename from src/test/spec/json/server-selection/server_selection/ReplicaSetNoPrimary/read/Secondary_multi_tags2.yml rename to spec/server-selection/server_selection/ReplicaSetNoPrimary/read/Secondary_multi_tags2.yml diff --git a/src/test/spec/json/server-selection/server_selection/ReplicaSetNoPrimary/read/Secondary_non_matching.json b/spec/server-selection/server_selection/ReplicaSetNoPrimary/read/Secondary_non_matching.json similarity index 100% rename from src/test/spec/json/server-selection/server_selection/ReplicaSetNoPrimary/read/Secondary_non_matching.json rename to spec/server-selection/server_selection/ReplicaSetNoPrimary/read/Secondary_non_matching.json diff --git a/src/test/spec/json/server-selection/server_selection/ReplicaSetNoPrimary/read/Secondary_non_matching.yml b/spec/server-selection/server_selection/ReplicaSetNoPrimary/read/Secondary_non_matching.yml similarity index 100% rename from src/test/spec/json/server-selection/server_selection/ReplicaSetNoPrimary/read/Secondary_non_matching.yml rename to spec/server-selection/server_selection/ReplicaSetNoPrimary/read/Secondary_non_matching.yml diff --git a/src/test/spec/json/server-selection/server_selection/ReplicaSetNoPrimary/write/SecondaryPreferred.json b/spec/server-selection/server_selection/ReplicaSetNoPrimary/write/SecondaryPreferred.json similarity index 100% rename from src/test/spec/json/server-selection/server_selection/ReplicaSetNoPrimary/write/SecondaryPreferred.json rename to spec/server-selection/server_selection/ReplicaSetNoPrimary/write/SecondaryPreferred.json diff --git a/src/test/spec/json/server-selection/server_selection/ReplicaSetNoPrimary/write/SecondaryPreferred.yml b/spec/server-selection/server_selection/ReplicaSetNoPrimary/write/SecondaryPreferred.yml similarity index 100% rename from src/test/spec/json/server-selection/server_selection/ReplicaSetNoPrimary/write/SecondaryPreferred.yml rename to spec/server-selection/server_selection/ReplicaSetNoPrimary/write/SecondaryPreferred.yml diff --git a/src/test/spec/json/server-selection/server_selection/ReplicaSetWithPrimary/read/Nearest.json b/spec/server-selection/server_selection/ReplicaSetWithPrimary/read/Nearest.json similarity index 100% rename from src/test/spec/json/server-selection/server_selection/ReplicaSetWithPrimary/read/Nearest.json rename to spec/server-selection/server_selection/ReplicaSetWithPrimary/read/Nearest.json diff --git a/src/test/spec/json/server-selection/server_selection/ReplicaSetWithPrimary/read/Nearest.yml b/spec/server-selection/server_selection/ReplicaSetWithPrimary/read/Nearest.yml similarity index 100% rename from src/test/spec/json/server-selection/server_selection/ReplicaSetWithPrimary/read/Nearest.yml rename to spec/server-selection/server_selection/ReplicaSetWithPrimary/read/Nearest.yml diff --git a/src/test/spec/json/server-selection/server_selection/ReplicaSetWithPrimary/read/Nearest_multiple.json b/spec/server-selection/server_selection/ReplicaSetWithPrimary/read/Nearest_multiple.json similarity index 100% rename from src/test/spec/json/server-selection/server_selection/ReplicaSetWithPrimary/read/Nearest_multiple.json rename to spec/server-selection/server_selection/ReplicaSetWithPrimary/read/Nearest_multiple.json diff --git a/src/test/spec/json/server-selection/server_selection/ReplicaSetWithPrimary/read/Nearest_multiple.yml b/spec/server-selection/server_selection/ReplicaSetWithPrimary/read/Nearest_multiple.yml similarity index 100% rename from src/test/spec/json/server-selection/server_selection/ReplicaSetWithPrimary/read/Nearest_multiple.yml rename to spec/server-selection/server_selection/ReplicaSetWithPrimary/read/Nearest_multiple.yml diff --git a/src/test/spec/json/server-selection/server_selection/ReplicaSetWithPrimary/read/Nearest_non_matching.json b/spec/server-selection/server_selection/ReplicaSetWithPrimary/read/Nearest_non_matching.json similarity index 100% rename from src/test/spec/json/server-selection/server_selection/ReplicaSetWithPrimary/read/Nearest_non_matching.json rename to spec/server-selection/server_selection/ReplicaSetWithPrimary/read/Nearest_non_matching.json diff --git a/src/test/spec/json/server-selection/server_selection/ReplicaSetWithPrimary/read/Nearest_non_matching.yml b/spec/server-selection/server_selection/ReplicaSetWithPrimary/read/Nearest_non_matching.yml similarity index 100% rename from src/test/spec/json/server-selection/server_selection/ReplicaSetWithPrimary/read/Nearest_non_matching.yml rename to spec/server-selection/server_selection/ReplicaSetWithPrimary/read/Nearest_non_matching.yml diff --git a/src/test/spec/json/server-selection/server_selection/ReplicaSetWithPrimary/read/Primary.json b/spec/server-selection/server_selection/ReplicaSetWithPrimary/read/Primary.json similarity index 100% rename from src/test/spec/json/server-selection/server_selection/ReplicaSetWithPrimary/read/Primary.json rename to spec/server-selection/server_selection/ReplicaSetWithPrimary/read/Primary.json diff --git a/src/test/spec/json/server-selection/server_selection/ReplicaSetWithPrimary/read/Primary.yml b/spec/server-selection/server_selection/ReplicaSetWithPrimary/read/Primary.yml similarity index 100% rename from src/test/spec/json/server-selection/server_selection/ReplicaSetWithPrimary/read/Primary.yml rename to spec/server-selection/server_selection/ReplicaSetWithPrimary/read/Primary.yml diff --git a/src/test/spec/json/server-selection/server_selection/ReplicaSetWithPrimary/read/PrimaryPreferred.json b/spec/server-selection/server_selection/ReplicaSetWithPrimary/read/PrimaryPreferred.json similarity index 100% rename from src/test/spec/json/server-selection/server_selection/ReplicaSetWithPrimary/read/PrimaryPreferred.json rename to spec/server-selection/server_selection/ReplicaSetWithPrimary/read/PrimaryPreferred.json diff --git a/src/test/spec/json/server-selection/server_selection/ReplicaSetWithPrimary/read/PrimaryPreferred.yml b/spec/server-selection/server_selection/ReplicaSetWithPrimary/read/PrimaryPreferred.yml similarity index 100% rename from src/test/spec/json/server-selection/server_selection/ReplicaSetWithPrimary/read/PrimaryPreferred.yml rename to spec/server-selection/server_selection/ReplicaSetWithPrimary/read/PrimaryPreferred.yml diff --git a/src/test/spec/json/server-selection/server_selection/ReplicaSetWithPrimary/read/PrimaryPreferred_non_matching.json b/spec/server-selection/server_selection/ReplicaSetWithPrimary/read/PrimaryPreferred_non_matching.json similarity index 100% rename from src/test/spec/json/server-selection/server_selection/ReplicaSetWithPrimary/read/PrimaryPreferred_non_matching.json rename to spec/server-selection/server_selection/ReplicaSetWithPrimary/read/PrimaryPreferred_non_matching.json diff --git a/src/test/spec/json/server-selection/server_selection/ReplicaSetWithPrimary/read/PrimaryPreferred_non_matching.yml b/spec/server-selection/server_selection/ReplicaSetWithPrimary/read/PrimaryPreferred_non_matching.yml similarity index 100% rename from src/test/spec/json/server-selection/server_selection/ReplicaSetWithPrimary/read/PrimaryPreferred_non_matching.yml rename to spec/server-selection/server_selection/ReplicaSetWithPrimary/read/PrimaryPreferred_non_matching.yml diff --git a/src/test/spec/json/server-selection/server_selection/ReplicaSetWithPrimary/read/Secondary.json b/spec/server-selection/server_selection/ReplicaSetWithPrimary/read/Secondary.json similarity index 100% rename from src/test/spec/json/server-selection/server_selection/ReplicaSetWithPrimary/read/Secondary.json rename to spec/server-selection/server_selection/ReplicaSetWithPrimary/read/Secondary.json diff --git a/src/test/spec/json/server-selection/server_selection/ReplicaSetWithPrimary/read/Secondary.yml b/spec/server-selection/server_selection/ReplicaSetWithPrimary/read/Secondary.yml similarity index 100% rename from src/test/spec/json/server-selection/server_selection/ReplicaSetWithPrimary/read/Secondary.yml rename to spec/server-selection/server_selection/ReplicaSetWithPrimary/read/Secondary.yml diff --git a/src/test/spec/json/server-selection/server_selection/ReplicaSetWithPrimary/read/SecondaryPreferred.json b/spec/server-selection/server_selection/ReplicaSetWithPrimary/read/SecondaryPreferred.json similarity index 100% rename from src/test/spec/json/server-selection/server_selection/ReplicaSetWithPrimary/read/SecondaryPreferred.json rename to spec/server-selection/server_selection/ReplicaSetWithPrimary/read/SecondaryPreferred.json diff --git a/src/test/spec/json/server-selection/server_selection/ReplicaSetWithPrimary/read/SecondaryPreferred.yml b/spec/server-selection/server_selection/ReplicaSetWithPrimary/read/SecondaryPreferred.yml similarity index 100% rename from src/test/spec/json/server-selection/server_selection/ReplicaSetWithPrimary/read/SecondaryPreferred.yml rename to spec/server-selection/server_selection/ReplicaSetWithPrimary/read/SecondaryPreferred.yml diff --git a/src/test/spec/json/server-selection/server_selection/ReplicaSetWithPrimary/read/SecondaryPreferred_non_matching.json b/spec/server-selection/server_selection/ReplicaSetWithPrimary/read/SecondaryPreferred_non_matching.json similarity index 100% rename from src/test/spec/json/server-selection/server_selection/ReplicaSetWithPrimary/read/SecondaryPreferred_non_matching.json rename to spec/server-selection/server_selection/ReplicaSetWithPrimary/read/SecondaryPreferred_non_matching.json diff --git a/src/test/spec/json/server-selection/server_selection/ReplicaSetWithPrimary/read/SecondaryPreferred_non_matching.yml b/spec/server-selection/server_selection/ReplicaSetWithPrimary/read/SecondaryPreferred_non_matching.yml similarity index 100% rename from src/test/spec/json/server-selection/server_selection/ReplicaSetWithPrimary/read/SecondaryPreferred_non_matching.yml rename to spec/server-selection/server_selection/ReplicaSetWithPrimary/read/SecondaryPreferred_non_matching.yml diff --git a/src/test/spec/json/server-selection/server_selection/ReplicaSetWithPrimary/read/SecondaryPreferred_tags.json b/spec/server-selection/server_selection/ReplicaSetWithPrimary/read/SecondaryPreferred_tags.json similarity index 100% rename from src/test/spec/json/server-selection/server_selection/ReplicaSetWithPrimary/read/SecondaryPreferred_tags.json rename to spec/server-selection/server_selection/ReplicaSetWithPrimary/read/SecondaryPreferred_tags.json diff --git a/src/test/spec/json/server-selection/server_selection/ReplicaSetWithPrimary/read/SecondaryPreferred_tags.yml b/spec/server-selection/server_selection/ReplicaSetWithPrimary/read/SecondaryPreferred_tags.yml similarity index 100% rename from src/test/spec/json/server-selection/server_selection/ReplicaSetWithPrimary/read/SecondaryPreferred_tags.yml rename to spec/server-selection/server_selection/ReplicaSetWithPrimary/read/SecondaryPreferred_tags.yml diff --git a/src/test/spec/json/server-selection/server_selection/ReplicaSetWithPrimary/read/Secondary_non_matching.json b/spec/server-selection/server_selection/ReplicaSetWithPrimary/read/Secondary_non_matching.json similarity index 100% rename from src/test/spec/json/server-selection/server_selection/ReplicaSetWithPrimary/read/Secondary_non_matching.json rename to spec/server-selection/server_selection/ReplicaSetWithPrimary/read/Secondary_non_matching.json diff --git a/src/test/spec/json/server-selection/server_selection/ReplicaSetWithPrimary/read/Secondary_non_matching.yml b/spec/server-selection/server_selection/ReplicaSetWithPrimary/read/Secondary_non_matching.yml similarity index 100% rename from src/test/spec/json/server-selection/server_selection/ReplicaSetWithPrimary/read/Secondary_non_matching.yml rename to spec/server-selection/server_selection/ReplicaSetWithPrimary/read/Secondary_non_matching.yml diff --git a/src/test/spec/json/server-selection/server_selection/ReplicaSetWithPrimary/write/SecondaryPreferred.json b/spec/server-selection/server_selection/ReplicaSetWithPrimary/write/SecondaryPreferred.json similarity index 100% rename from src/test/spec/json/server-selection/server_selection/ReplicaSetWithPrimary/write/SecondaryPreferred.json rename to spec/server-selection/server_selection/ReplicaSetWithPrimary/write/SecondaryPreferred.json diff --git a/src/test/spec/json/server-selection/server_selection/ReplicaSetWithPrimary/write/SecondaryPreferred.yml b/spec/server-selection/server_selection/ReplicaSetWithPrimary/write/SecondaryPreferred.yml similarity index 100% rename from src/test/spec/json/server-selection/server_selection/ReplicaSetWithPrimary/write/SecondaryPreferred.yml rename to spec/server-selection/server_selection/ReplicaSetWithPrimary/write/SecondaryPreferred.yml diff --git a/src/test/spec/json/server-selection/server_selection/Sharded/read/Nearest.json b/spec/server-selection/server_selection/Sharded/read/Nearest.json similarity index 100% rename from src/test/spec/json/server-selection/server_selection/Sharded/read/Nearest.json rename to spec/server-selection/server_selection/Sharded/read/Nearest.json diff --git a/src/test/spec/json/server-selection/server_selection/Sharded/read/Nearest.yml b/spec/server-selection/server_selection/Sharded/read/Nearest.yml similarity index 100% rename from src/test/spec/json/server-selection/server_selection/Sharded/read/Nearest.yml rename to spec/server-selection/server_selection/Sharded/read/Nearest.yml diff --git a/src/test/spec/json/server-selection/server_selection/Sharded/read/Primary.json b/spec/server-selection/server_selection/Sharded/read/Primary.json similarity index 100% rename from src/test/spec/json/server-selection/server_selection/Sharded/read/Primary.json rename to spec/server-selection/server_selection/Sharded/read/Primary.json diff --git a/src/test/spec/json/server-selection/server_selection/Sharded/read/Primary.yml b/spec/server-selection/server_selection/Sharded/read/Primary.yml similarity index 100% rename from src/test/spec/json/server-selection/server_selection/Sharded/read/Primary.yml rename to spec/server-selection/server_selection/Sharded/read/Primary.yml diff --git a/src/test/spec/json/server-selection/server_selection/Sharded/read/PrimaryPreferred.json b/spec/server-selection/server_selection/Sharded/read/PrimaryPreferred.json similarity index 100% rename from src/test/spec/json/server-selection/server_selection/Sharded/read/PrimaryPreferred.json rename to spec/server-selection/server_selection/Sharded/read/PrimaryPreferred.json diff --git a/src/test/spec/json/server-selection/server_selection/Sharded/read/PrimaryPreferred.yml b/spec/server-selection/server_selection/Sharded/read/PrimaryPreferred.yml similarity index 100% rename from src/test/spec/json/server-selection/server_selection/Sharded/read/PrimaryPreferred.yml rename to spec/server-selection/server_selection/Sharded/read/PrimaryPreferred.yml diff --git a/src/test/spec/json/server-selection/server_selection/Sharded/read/Secondary.json b/spec/server-selection/server_selection/Sharded/read/Secondary.json similarity index 100% rename from src/test/spec/json/server-selection/server_selection/Sharded/read/Secondary.json rename to spec/server-selection/server_selection/Sharded/read/Secondary.json diff --git a/src/test/spec/json/server-selection/server_selection/Sharded/read/Secondary.yml b/spec/server-selection/server_selection/Sharded/read/Secondary.yml similarity index 100% rename from src/test/spec/json/server-selection/server_selection/Sharded/read/Secondary.yml rename to spec/server-selection/server_selection/Sharded/read/Secondary.yml diff --git a/src/test/spec/json/server-selection/server_selection/Sharded/read/SecondaryPreferred.json b/spec/server-selection/server_selection/Sharded/read/SecondaryPreferred.json similarity index 100% rename from src/test/spec/json/server-selection/server_selection/Sharded/read/SecondaryPreferred.json rename to spec/server-selection/server_selection/Sharded/read/SecondaryPreferred.json diff --git a/src/test/spec/json/server-selection/server_selection/Sharded/read/SecondaryPreferred.yml b/spec/server-selection/server_selection/Sharded/read/SecondaryPreferred.yml similarity index 100% rename from src/test/spec/json/server-selection/server_selection/Sharded/read/SecondaryPreferred.yml rename to spec/server-selection/server_selection/Sharded/read/SecondaryPreferred.yml diff --git a/src/test/spec/json/server-selection/server_selection/Sharded/write/Nearest.json b/spec/server-selection/server_selection/Sharded/write/Nearest.json similarity index 100% rename from src/test/spec/json/server-selection/server_selection/Sharded/write/Nearest.json rename to spec/server-selection/server_selection/Sharded/write/Nearest.json diff --git a/src/test/spec/json/server-selection/server_selection/Sharded/write/Nearest.yml b/spec/server-selection/server_selection/Sharded/write/Nearest.yml similarity index 100% rename from src/test/spec/json/server-selection/server_selection/Sharded/write/Nearest.yml rename to spec/server-selection/server_selection/Sharded/write/Nearest.yml diff --git a/src/test/spec/json/server-selection/server_selection/Sharded/write/Primary.json b/spec/server-selection/server_selection/Sharded/write/Primary.json similarity index 100% rename from src/test/spec/json/server-selection/server_selection/Sharded/write/Primary.json rename to spec/server-selection/server_selection/Sharded/write/Primary.json diff --git a/src/test/spec/json/server-selection/server_selection/Sharded/write/Primary.yml b/spec/server-selection/server_selection/Sharded/write/Primary.yml similarity index 100% rename from src/test/spec/json/server-selection/server_selection/Sharded/write/Primary.yml rename to spec/server-selection/server_selection/Sharded/write/Primary.yml diff --git a/src/test/spec/json/server-selection/server_selection/Sharded/write/PrimaryPreferred.json b/spec/server-selection/server_selection/Sharded/write/PrimaryPreferred.json similarity index 100% rename from src/test/spec/json/server-selection/server_selection/Sharded/write/PrimaryPreferred.json rename to spec/server-selection/server_selection/Sharded/write/PrimaryPreferred.json diff --git a/src/test/spec/json/server-selection/server_selection/Sharded/write/PrimaryPreferred.yml b/spec/server-selection/server_selection/Sharded/write/PrimaryPreferred.yml similarity index 100% rename from src/test/spec/json/server-selection/server_selection/Sharded/write/PrimaryPreferred.yml rename to spec/server-selection/server_selection/Sharded/write/PrimaryPreferred.yml diff --git a/src/test/spec/json/server-selection/server_selection/Sharded/write/Secondary.json b/spec/server-selection/server_selection/Sharded/write/Secondary.json similarity index 100% rename from src/test/spec/json/server-selection/server_selection/Sharded/write/Secondary.json rename to spec/server-selection/server_selection/Sharded/write/Secondary.json diff --git a/src/test/spec/json/server-selection/server_selection/Sharded/write/Secondary.yml b/spec/server-selection/server_selection/Sharded/write/Secondary.yml similarity index 100% rename from src/test/spec/json/server-selection/server_selection/Sharded/write/Secondary.yml rename to spec/server-selection/server_selection/Sharded/write/Secondary.yml diff --git a/src/test/spec/json/server-selection/server_selection/Sharded/write/SecondaryPreferred.json b/spec/server-selection/server_selection/Sharded/write/SecondaryPreferred.json similarity index 100% rename from src/test/spec/json/server-selection/server_selection/Sharded/write/SecondaryPreferred.json rename to spec/server-selection/server_selection/Sharded/write/SecondaryPreferred.json diff --git a/src/test/spec/json/server-selection/server_selection/Sharded/write/SecondaryPreferred.yml b/spec/server-selection/server_selection/Sharded/write/SecondaryPreferred.yml similarity index 100% rename from src/test/spec/json/server-selection/server_selection/Sharded/write/SecondaryPreferred.yml rename to spec/server-selection/server_selection/Sharded/write/SecondaryPreferred.yml diff --git a/src/test/spec/json/server-selection/server_selection/Single/read/SecondaryPreferred.json b/spec/server-selection/server_selection/Single/read/SecondaryPreferred.json similarity index 100% rename from src/test/spec/json/server-selection/server_selection/Single/read/SecondaryPreferred.json rename to spec/server-selection/server_selection/Single/read/SecondaryPreferred.json diff --git a/src/test/spec/json/server-selection/server_selection/Single/read/SecondaryPreferred.yml b/spec/server-selection/server_selection/Single/read/SecondaryPreferred.yml similarity index 100% rename from src/test/spec/json/server-selection/server_selection/Single/read/SecondaryPreferred.yml rename to spec/server-selection/server_selection/Single/read/SecondaryPreferred.yml diff --git a/src/test/spec/json/server-selection/server_selection/Single/write/SecondaryPreferred.json b/spec/server-selection/server_selection/Single/write/SecondaryPreferred.json similarity index 100% rename from src/test/spec/json/server-selection/server_selection/Single/write/SecondaryPreferred.json rename to spec/server-selection/server_selection/Single/write/SecondaryPreferred.json diff --git a/src/test/spec/json/server-selection/server_selection/Single/write/SecondaryPreferred.yml b/spec/server-selection/server_selection/Single/write/SecondaryPreferred.yml similarity index 100% rename from src/test/spec/json/server-selection/server_selection/Single/write/SecondaryPreferred.yml rename to spec/server-selection/server_selection/Single/write/SecondaryPreferred.yml diff --git a/src/test/spec/json/server-selection/server_selection/Unknown/read/SecondaryPreferred.json b/spec/server-selection/server_selection/Unknown/read/SecondaryPreferred.json similarity index 100% rename from src/test/spec/json/server-selection/server_selection/Unknown/read/SecondaryPreferred.json rename to spec/server-selection/server_selection/Unknown/read/SecondaryPreferred.json diff --git a/src/test/spec/json/server-selection/server_selection/Unknown/read/SecondaryPreferred.yml b/spec/server-selection/server_selection/Unknown/read/SecondaryPreferred.yml similarity index 100% rename from src/test/spec/json/server-selection/server_selection/Unknown/read/SecondaryPreferred.yml rename to spec/server-selection/server_selection/Unknown/read/SecondaryPreferred.yml diff --git a/src/test/spec/json/server-selection/server_selection/Unknown/read/ghost.json b/spec/server-selection/server_selection/Unknown/read/ghost.json similarity index 100% rename from src/test/spec/json/server-selection/server_selection/Unknown/read/ghost.json rename to spec/server-selection/server_selection/Unknown/read/ghost.json diff --git a/src/test/spec/json/server-selection/server_selection/Unknown/read/ghost.yml b/spec/server-selection/server_selection/Unknown/read/ghost.yml similarity index 100% rename from src/test/spec/json/server-selection/server_selection/Unknown/read/ghost.yml rename to spec/server-selection/server_selection/Unknown/read/ghost.yml diff --git a/src/test/spec/json/server-selection/server_selection/Unknown/write/SecondaryPreferred.json b/spec/server-selection/server_selection/Unknown/write/SecondaryPreferred.json similarity index 100% rename from src/test/spec/json/server-selection/server_selection/Unknown/write/SecondaryPreferred.json rename to spec/server-selection/server_selection/Unknown/write/SecondaryPreferred.json diff --git a/src/test/spec/json/server-selection/server_selection/Unknown/write/SecondaryPreferred.yml b/spec/server-selection/server_selection/Unknown/write/SecondaryPreferred.yml similarity index 100% rename from src/test/spec/json/server-selection/server_selection/Unknown/write/SecondaryPreferred.yml rename to spec/server-selection/server_selection/Unknown/write/SecondaryPreferred.yml diff --git a/src/test/spec/json/server-selection/server_selection/Unknown/write/ghost.json b/spec/server-selection/server_selection/Unknown/write/ghost.json similarity index 100% rename from src/test/spec/json/server-selection/server_selection/Unknown/write/ghost.json rename to spec/server-selection/server_selection/Unknown/write/ghost.json diff --git a/src/test/spec/json/server-selection/server_selection/Unknown/write/ghost.yml b/spec/server-selection/server_selection/Unknown/write/ghost.yml similarity index 100% rename from src/test/spec/json/server-selection/server_selection/Unknown/write/ghost.yml rename to spec/server-selection/server_selection/Unknown/write/ghost.yml diff --git a/src/test/spec/json/sessions/README.md b/spec/sessions/README.md similarity index 100% rename from src/test/spec/json/sessions/README.md rename to spec/sessions/README.md diff --git a/src/test/spec/json/sessions/driver-sessions-dirty-session-errors.json b/spec/sessions/driver-sessions-dirty-session-errors.json similarity index 100% rename from src/test/spec/json/sessions/driver-sessions-dirty-session-errors.json rename to spec/sessions/driver-sessions-dirty-session-errors.json diff --git a/src/test/spec/json/sessions/driver-sessions-dirty-session-errors.yml b/spec/sessions/driver-sessions-dirty-session-errors.yml similarity index 100% rename from src/test/spec/json/sessions/driver-sessions-dirty-session-errors.yml rename to spec/sessions/driver-sessions-dirty-session-errors.yml diff --git a/src/test/spec/json/sessions/driver-sessions-server-support.json b/spec/sessions/driver-sessions-server-support.json similarity index 100% rename from src/test/spec/json/sessions/driver-sessions-server-support.json rename to spec/sessions/driver-sessions-server-support.json diff --git a/src/test/spec/json/sessions/driver-sessions-server-support.yml b/spec/sessions/driver-sessions-server-support.yml similarity index 100% rename from src/test/spec/json/sessions/driver-sessions-server-support.yml rename to spec/sessions/driver-sessions-server-support.yml diff --git a/src/test/spec/json/sessions/implicit-sessions-default-causal-consistency.json b/spec/sessions/implicit-sessions-default-causal-consistency.json similarity index 100% rename from src/test/spec/json/sessions/implicit-sessions-default-causal-consistency.json rename to spec/sessions/implicit-sessions-default-causal-consistency.json diff --git a/src/test/spec/json/sessions/implicit-sessions-default-causal-consistency.yml b/spec/sessions/implicit-sessions-default-causal-consistency.yml similarity index 100% rename from src/test/spec/json/sessions/implicit-sessions-default-causal-consistency.yml rename to spec/sessions/implicit-sessions-default-causal-consistency.yml diff --git a/src/test/spec/json/sessions/snapshot-sessions-not-supported-client-error.json b/spec/sessions/snapshot-sessions-not-supported-client-error.json similarity index 100% rename from src/test/spec/json/sessions/snapshot-sessions-not-supported-client-error.json rename to spec/sessions/snapshot-sessions-not-supported-client-error.json diff --git a/src/test/spec/json/sessions/snapshot-sessions-not-supported-client-error.yml b/spec/sessions/snapshot-sessions-not-supported-client-error.yml similarity index 100% rename from src/test/spec/json/sessions/snapshot-sessions-not-supported-client-error.yml rename to spec/sessions/snapshot-sessions-not-supported-client-error.yml diff --git a/src/test/spec/json/sessions/snapshot-sessions-not-supported-server-error.json b/spec/sessions/snapshot-sessions-not-supported-server-error.json similarity index 100% rename from src/test/spec/json/sessions/snapshot-sessions-not-supported-server-error.json rename to spec/sessions/snapshot-sessions-not-supported-server-error.json diff --git a/src/test/spec/json/sessions/snapshot-sessions-not-supported-server-error.yml b/spec/sessions/snapshot-sessions-not-supported-server-error.yml similarity index 100% rename from src/test/spec/json/sessions/snapshot-sessions-not-supported-server-error.yml rename to spec/sessions/snapshot-sessions-not-supported-server-error.yml diff --git a/src/test/spec/json/sessions/snapshot-sessions-unsupported-ops.json b/spec/sessions/snapshot-sessions-unsupported-ops.json similarity index 100% rename from src/test/spec/json/sessions/snapshot-sessions-unsupported-ops.json rename to spec/sessions/snapshot-sessions-unsupported-ops.json diff --git a/src/test/spec/json/sessions/snapshot-sessions-unsupported-ops.yml b/spec/sessions/snapshot-sessions-unsupported-ops.yml similarity index 100% rename from src/test/spec/json/sessions/snapshot-sessions-unsupported-ops.yml rename to spec/sessions/snapshot-sessions-unsupported-ops.yml diff --git a/src/test/spec/json/sessions/snapshot-sessions.json b/spec/sessions/snapshot-sessions.json similarity index 100% rename from src/test/spec/json/sessions/snapshot-sessions.json rename to spec/sessions/snapshot-sessions.json diff --git a/src/test/spec/json/sessions/snapshot-sessions.yml b/spec/sessions/snapshot-sessions.yml similarity index 100% rename from src/test/spec/json/sessions/snapshot-sessions.yml rename to spec/sessions/snapshot-sessions.yml diff --git a/src/test/spec/json/testdata/client-side-encryption/corpus/corpus-encrypted.json b/spec/testdata/client-side-encryption/corpus/corpus-encrypted.json similarity index 100% rename from src/test/spec/json/testdata/client-side-encryption/corpus/corpus-encrypted.json rename to spec/testdata/client-side-encryption/corpus/corpus-encrypted.json diff --git a/src/test/spec/json/testdata/client-side-encryption/corpus/corpus-key-aws.json b/spec/testdata/client-side-encryption/corpus/corpus-key-aws.json similarity index 100% rename from src/test/spec/json/testdata/client-side-encryption/corpus/corpus-key-aws.json rename to spec/testdata/client-side-encryption/corpus/corpus-key-aws.json diff --git a/src/test/spec/json/testdata/client-side-encryption/corpus/corpus-key-azure.json b/spec/testdata/client-side-encryption/corpus/corpus-key-azure.json similarity index 100% rename from src/test/spec/json/testdata/client-side-encryption/corpus/corpus-key-azure.json rename to spec/testdata/client-side-encryption/corpus/corpus-key-azure.json diff --git a/src/test/spec/json/testdata/client-side-encryption/corpus/corpus-key-gcp.json b/spec/testdata/client-side-encryption/corpus/corpus-key-gcp.json similarity index 100% rename from src/test/spec/json/testdata/client-side-encryption/corpus/corpus-key-gcp.json rename to spec/testdata/client-side-encryption/corpus/corpus-key-gcp.json diff --git a/src/test/spec/json/testdata/client-side-encryption/corpus/corpus-key-kmip.json b/spec/testdata/client-side-encryption/corpus/corpus-key-kmip.json similarity index 100% rename from src/test/spec/json/testdata/client-side-encryption/corpus/corpus-key-kmip.json rename to spec/testdata/client-side-encryption/corpus/corpus-key-kmip.json diff --git a/src/test/spec/json/testdata/client-side-encryption/corpus/corpus-key-local.json b/spec/testdata/client-side-encryption/corpus/corpus-key-local.json similarity index 100% rename from src/test/spec/json/testdata/client-side-encryption/corpus/corpus-key-local.json rename to spec/testdata/client-side-encryption/corpus/corpus-key-local.json diff --git a/src/test/spec/json/testdata/client-side-encryption/corpus/corpus-schema.json b/spec/testdata/client-side-encryption/corpus/corpus-schema.json similarity index 100% rename from src/test/spec/json/testdata/client-side-encryption/corpus/corpus-schema.json rename to spec/testdata/client-side-encryption/corpus/corpus-schema.json diff --git a/src/test/spec/json/testdata/client-side-encryption/corpus/corpus.json b/spec/testdata/client-side-encryption/corpus/corpus.json similarity index 100% rename from src/test/spec/json/testdata/client-side-encryption/corpus/corpus.json rename to spec/testdata/client-side-encryption/corpus/corpus.json diff --git a/src/test/spec/json/testdata/client-side-encryption/data/encryptedFields-prefix-suffix.json b/spec/testdata/client-side-encryption/data/encryptedFields-prefix-suffix.json similarity index 100% rename from src/test/spec/json/testdata/client-side-encryption/data/encryptedFields-prefix-suffix.json rename to spec/testdata/client-side-encryption/data/encryptedFields-prefix-suffix.json diff --git a/src/test/spec/json/testdata/client-side-encryption/data/encryptedFields-substring.json b/spec/testdata/client-side-encryption/data/encryptedFields-substring.json similarity index 100% rename from src/test/spec/json/testdata/client-side-encryption/data/encryptedFields-substring.json rename to spec/testdata/client-side-encryption/data/encryptedFields-substring.json diff --git a/src/test/spec/json/testdata/client-side-encryption/data/encryptedFields.json b/spec/testdata/client-side-encryption/data/encryptedFields.json similarity index 100% rename from src/test/spec/json/testdata/client-side-encryption/data/encryptedFields.json rename to spec/testdata/client-side-encryption/data/encryptedFields.json diff --git a/src/test/spec/json/testdata/client-side-encryption/data/keys/key1-document.json b/spec/testdata/client-side-encryption/data/keys/key1-document.json similarity index 100% rename from src/test/spec/json/testdata/client-side-encryption/data/keys/key1-document.json rename to spec/testdata/client-side-encryption/data/keys/key1-document.json diff --git a/src/test/spec/json/testdata/client-side-encryption/data/keys/key1-id.json b/spec/testdata/client-side-encryption/data/keys/key1-id.json similarity index 100% rename from src/test/spec/json/testdata/client-side-encryption/data/keys/key1-id.json rename to spec/testdata/client-side-encryption/data/keys/key1-id.json diff --git a/src/test/spec/json/testdata/client-side-encryption/data/keys/key2-document.json b/spec/testdata/client-side-encryption/data/keys/key2-document.json similarity index 100% rename from src/test/spec/json/testdata/client-side-encryption/data/keys/key2-document.json rename to spec/testdata/client-side-encryption/data/keys/key2-document.json diff --git a/src/test/spec/json/testdata/client-side-encryption/data/keys/key2-id.json b/spec/testdata/client-side-encryption/data/keys/key2-id.json similarity index 100% rename from src/test/spec/json/testdata/client-side-encryption/data/keys/key2-id.json rename to spec/testdata/client-side-encryption/data/keys/key2-id.json diff --git a/src/test/spec/json/testdata/client-side-encryption/data/lookup/key-doc.json b/spec/testdata/client-side-encryption/data/lookup/key-doc.json similarity index 100% rename from src/test/spec/json/testdata/client-side-encryption/data/lookup/key-doc.json rename to spec/testdata/client-side-encryption/data/lookup/key-doc.json diff --git a/src/test/spec/json/testdata/client-side-encryption/data/lookup/schema-csfle.json b/spec/testdata/client-side-encryption/data/lookup/schema-csfle.json similarity index 100% rename from src/test/spec/json/testdata/client-side-encryption/data/lookup/schema-csfle.json rename to spec/testdata/client-side-encryption/data/lookup/schema-csfle.json diff --git a/src/test/spec/json/testdata/client-side-encryption/data/lookup/schema-csfle2.json b/spec/testdata/client-side-encryption/data/lookup/schema-csfle2.json similarity index 100% rename from src/test/spec/json/testdata/client-side-encryption/data/lookup/schema-csfle2.json rename to spec/testdata/client-side-encryption/data/lookup/schema-csfle2.json diff --git a/src/test/spec/json/testdata/client-side-encryption/data/lookup/schema-qe.json b/spec/testdata/client-side-encryption/data/lookup/schema-qe.json similarity index 100% rename from src/test/spec/json/testdata/client-side-encryption/data/lookup/schema-qe.json rename to spec/testdata/client-side-encryption/data/lookup/schema-qe.json diff --git a/src/test/spec/json/testdata/client-side-encryption/data/lookup/schema-qe2.json b/spec/testdata/client-side-encryption/data/lookup/schema-qe2.json similarity index 100% rename from src/test/spec/json/testdata/client-side-encryption/data/lookup/schema-qe2.json rename to spec/testdata/client-side-encryption/data/lookup/schema-qe2.json diff --git a/src/test/spec/json/testdata/client-side-encryption/data/range-encryptedFields-Date.json b/spec/testdata/client-side-encryption/data/range-encryptedFields-Date.json similarity index 100% rename from src/test/spec/json/testdata/client-side-encryption/data/range-encryptedFields-Date.json rename to spec/testdata/client-side-encryption/data/range-encryptedFields-Date.json diff --git a/src/test/spec/json/testdata/client-side-encryption/data/range-encryptedFields-DecimalNoPrecision.json b/spec/testdata/client-side-encryption/data/range-encryptedFields-DecimalNoPrecision.json similarity index 100% rename from src/test/spec/json/testdata/client-side-encryption/data/range-encryptedFields-DecimalNoPrecision.json rename to spec/testdata/client-side-encryption/data/range-encryptedFields-DecimalNoPrecision.json diff --git a/src/test/spec/json/testdata/client-side-encryption/data/range-encryptedFields-DecimalPrecision.json b/spec/testdata/client-side-encryption/data/range-encryptedFields-DecimalPrecision.json similarity index 100% rename from src/test/spec/json/testdata/client-side-encryption/data/range-encryptedFields-DecimalPrecision.json rename to spec/testdata/client-side-encryption/data/range-encryptedFields-DecimalPrecision.json diff --git a/src/test/spec/json/testdata/client-side-encryption/data/range-encryptedFields-DoubleNoPrecision.json b/spec/testdata/client-side-encryption/data/range-encryptedFields-DoubleNoPrecision.json similarity index 100% rename from src/test/spec/json/testdata/client-side-encryption/data/range-encryptedFields-DoubleNoPrecision.json rename to spec/testdata/client-side-encryption/data/range-encryptedFields-DoubleNoPrecision.json diff --git a/src/test/spec/json/testdata/client-side-encryption/data/range-encryptedFields-DoublePrecision.json b/spec/testdata/client-side-encryption/data/range-encryptedFields-DoublePrecision.json similarity index 100% rename from src/test/spec/json/testdata/client-side-encryption/data/range-encryptedFields-DoublePrecision.json rename to spec/testdata/client-side-encryption/data/range-encryptedFields-DoublePrecision.json diff --git a/src/test/spec/json/testdata/client-side-encryption/data/range-encryptedFields-Int.json b/spec/testdata/client-side-encryption/data/range-encryptedFields-Int.json similarity index 100% rename from src/test/spec/json/testdata/client-side-encryption/data/range-encryptedFields-Int.json rename to spec/testdata/client-side-encryption/data/range-encryptedFields-Int.json diff --git a/src/test/spec/json/testdata/client-side-encryption/data/range-encryptedFields-Long.json b/spec/testdata/client-side-encryption/data/range-encryptedFields-Long.json similarity index 100% rename from src/test/spec/json/testdata/client-side-encryption/data/range-encryptedFields-Long.json rename to spec/testdata/client-side-encryption/data/range-encryptedFields-Long.json diff --git a/src/test/spec/json/testdata/client-side-encryption/external/external-key.json b/spec/testdata/client-side-encryption/external/external-key.json similarity index 100% rename from src/test/spec/json/testdata/client-side-encryption/external/external-key.json rename to spec/testdata/client-side-encryption/external/external-key.json diff --git a/src/test/spec/json/testdata/client-side-encryption/external/external-schema.json b/spec/testdata/client-side-encryption/external/external-schema.json similarity index 100% rename from src/test/spec/json/testdata/client-side-encryption/external/external-schema.json rename to spec/testdata/client-side-encryption/external/external-schema.json diff --git a/src/test/spec/json/testdata/client-side-encryption/limits/limits-doc.json b/spec/testdata/client-side-encryption/limits/limits-doc.json similarity index 100% rename from src/test/spec/json/testdata/client-side-encryption/limits/limits-doc.json rename to spec/testdata/client-side-encryption/limits/limits-doc.json diff --git a/src/test/spec/json/testdata/client-side-encryption/limits/limits-encryptedFields.json b/spec/testdata/client-side-encryption/limits/limits-encryptedFields.json similarity index 100% rename from src/test/spec/json/testdata/client-side-encryption/limits/limits-encryptedFields.json rename to spec/testdata/client-side-encryption/limits/limits-encryptedFields.json diff --git a/src/test/spec/json/testdata/client-side-encryption/limits/limits-key.json b/spec/testdata/client-side-encryption/limits/limits-key.json similarity index 100% rename from src/test/spec/json/testdata/client-side-encryption/limits/limits-key.json rename to spec/testdata/client-side-encryption/limits/limits-key.json diff --git a/src/test/spec/json/testdata/client-side-encryption/limits/limits-qe-doc.json b/spec/testdata/client-side-encryption/limits/limits-qe-doc.json similarity index 100% rename from src/test/spec/json/testdata/client-side-encryption/limits/limits-qe-doc.json rename to spec/testdata/client-side-encryption/limits/limits-qe-doc.json diff --git a/src/test/spec/json/testdata/client-side-encryption/limits/limits-schema.json b/spec/testdata/client-side-encryption/limits/limits-schema.json similarity index 100% rename from src/test/spec/json/testdata/client-side-encryption/limits/limits-schema.json rename to spec/testdata/client-side-encryption/limits/limits-schema.json diff --git a/src/test/spec/json/transactions-convenient-api/README.md b/spec/transactions-convenient-api/README.md similarity index 100% rename from src/test/spec/json/transactions-convenient-api/README.md rename to spec/transactions-convenient-api/README.md diff --git a/src/test/spec/json/transactions-convenient-api/unified/callback-aborts.json b/spec/transactions-convenient-api/unified/callback-aborts.json similarity index 100% rename from src/test/spec/json/transactions-convenient-api/unified/callback-aborts.json rename to spec/transactions-convenient-api/unified/callback-aborts.json diff --git a/src/test/spec/json/transactions-convenient-api/unified/callback-aborts.yml b/spec/transactions-convenient-api/unified/callback-aborts.yml similarity index 100% rename from src/test/spec/json/transactions-convenient-api/unified/callback-aborts.yml rename to spec/transactions-convenient-api/unified/callback-aborts.yml diff --git a/src/test/spec/json/transactions-convenient-api/unified/callback-commits.json b/spec/transactions-convenient-api/unified/callback-commits.json similarity index 100% rename from src/test/spec/json/transactions-convenient-api/unified/callback-commits.json rename to spec/transactions-convenient-api/unified/callback-commits.json diff --git a/src/test/spec/json/transactions-convenient-api/unified/callback-commits.yml b/spec/transactions-convenient-api/unified/callback-commits.yml similarity index 100% rename from src/test/spec/json/transactions-convenient-api/unified/callback-commits.yml rename to spec/transactions-convenient-api/unified/callback-commits.yml diff --git a/src/test/spec/json/transactions-convenient-api/unified/callback-retry.json b/spec/transactions-convenient-api/unified/callback-retry.json similarity index 100% rename from src/test/spec/json/transactions-convenient-api/unified/callback-retry.json rename to spec/transactions-convenient-api/unified/callback-retry.json diff --git a/src/test/spec/json/transactions-convenient-api/unified/callback-retry.yml b/spec/transactions-convenient-api/unified/callback-retry.yml similarity index 100% rename from src/test/spec/json/transactions-convenient-api/unified/callback-retry.yml rename to spec/transactions-convenient-api/unified/callback-retry.yml diff --git a/src/test/spec/json/transactions-convenient-api/unified/commit-retry-errorLabels.json b/spec/transactions-convenient-api/unified/commit-retry-errorLabels.json similarity index 100% rename from src/test/spec/json/transactions-convenient-api/unified/commit-retry-errorLabels.json rename to spec/transactions-convenient-api/unified/commit-retry-errorLabels.json diff --git a/src/test/spec/json/transactions-convenient-api/unified/commit-retry-errorLabels.yml b/spec/transactions-convenient-api/unified/commit-retry-errorLabels.yml similarity index 100% rename from src/test/spec/json/transactions-convenient-api/unified/commit-retry-errorLabels.yml rename to spec/transactions-convenient-api/unified/commit-retry-errorLabels.yml diff --git a/src/test/spec/json/transactions-convenient-api/unified/commit-retry.json b/spec/transactions-convenient-api/unified/commit-retry.json similarity index 100% rename from src/test/spec/json/transactions-convenient-api/unified/commit-retry.json rename to spec/transactions-convenient-api/unified/commit-retry.json diff --git a/src/test/spec/json/transactions-convenient-api/unified/commit-retry.yml b/spec/transactions-convenient-api/unified/commit-retry.yml similarity index 100% rename from src/test/spec/json/transactions-convenient-api/unified/commit-retry.yml rename to spec/transactions-convenient-api/unified/commit-retry.yml diff --git a/src/test/spec/json/transactions-convenient-api/unified/commit-transienttransactionerror-4.2.json b/spec/transactions-convenient-api/unified/commit-transienttransactionerror-4.2.json similarity index 100% rename from src/test/spec/json/transactions-convenient-api/unified/commit-transienttransactionerror-4.2.json rename to spec/transactions-convenient-api/unified/commit-transienttransactionerror-4.2.json diff --git a/src/test/spec/json/transactions-convenient-api/unified/commit-transienttransactionerror-4.2.yml b/spec/transactions-convenient-api/unified/commit-transienttransactionerror-4.2.yml similarity index 100% rename from src/test/spec/json/transactions-convenient-api/unified/commit-transienttransactionerror-4.2.yml rename to spec/transactions-convenient-api/unified/commit-transienttransactionerror-4.2.yml diff --git a/src/test/spec/json/transactions-convenient-api/unified/commit-transienttransactionerror.json b/spec/transactions-convenient-api/unified/commit-transienttransactionerror.json similarity index 100% rename from src/test/spec/json/transactions-convenient-api/unified/commit-transienttransactionerror.json rename to spec/transactions-convenient-api/unified/commit-transienttransactionerror.json diff --git a/src/test/spec/json/transactions-convenient-api/unified/commit-transienttransactionerror.yml b/spec/transactions-convenient-api/unified/commit-transienttransactionerror.yml similarity index 100% rename from src/test/spec/json/transactions-convenient-api/unified/commit-transienttransactionerror.yml rename to spec/transactions-convenient-api/unified/commit-transienttransactionerror.yml diff --git a/src/test/spec/json/transactions-convenient-api/unified/commit-writeconcernerror.json b/spec/transactions-convenient-api/unified/commit-writeconcernerror.json similarity index 100% rename from src/test/spec/json/transactions-convenient-api/unified/commit-writeconcernerror.json rename to spec/transactions-convenient-api/unified/commit-writeconcernerror.json diff --git a/src/test/spec/json/transactions-convenient-api/unified/commit-writeconcernerror.yml b/spec/transactions-convenient-api/unified/commit-writeconcernerror.yml similarity index 100% rename from src/test/spec/json/transactions-convenient-api/unified/commit-writeconcernerror.yml rename to spec/transactions-convenient-api/unified/commit-writeconcernerror.yml diff --git a/src/test/spec/json/transactions-convenient-api/unified/commit.json b/spec/transactions-convenient-api/unified/commit.json similarity index 100% rename from src/test/spec/json/transactions-convenient-api/unified/commit.json rename to spec/transactions-convenient-api/unified/commit.json diff --git a/src/test/spec/json/transactions-convenient-api/unified/commit.yml b/spec/transactions-convenient-api/unified/commit.yml similarity index 100% rename from src/test/spec/json/transactions-convenient-api/unified/commit.yml rename to spec/transactions-convenient-api/unified/commit.yml diff --git a/src/test/spec/json/transactions-convenient-api/unified/transaction-options.json b/spec/transactions-convenient-api/unified/transaction-options.json similarity index 100% rename from src/test/spec/json/transactions-convenient-api/unified/transaction-options.json rename to spec/transactions-convenient-api/unified/transaction-options.json diff --git a/src/test/spec/json/transactions-convenient-api/unified/transaction-options.yml b/spec/transactions-convenient-api/unified/transaction-options.yml similarity index 100% rename from src/test/spec/json/transactions-convenient-api/unified/transaction-options.yml rename to spec/transactions-convenient-api/unified/transaction-options.yml diff --git a/src/test/spec/json/transactions/README.md b/spec/transactions/README.md similarity index 100% rename from src/test/spec/json/transactions/README.md rename to spec/transactions/README.md diff --git a/src/test/spec/json/transactions/legacy-test-format.md b/spec/transactions/legacy-test-format.md similarity index 100% rename from src/test/spec/json/transactions/legacy-test-format.md rename to spec/transactions/legacy-test-format.md diff --git a/src/test/spec/json/transactions/unified/abort.json b/spec/transactions/unified/abort.json similarity index 100% rename from src/test/spec/json/transactions/unified/abort.json rename to spec/transactions/unified/abort.json diff --git a/src/test/spec/json/transactions/unified/abort.yml b/spec/transactions/unified/abort.yml similarity index 100% rename from src/test/spec/json/transactions/unified/abort.yml rename to spec/transactions/unified/abort.yml diff --git a/src/test/spec/json/transactions/unified/bulk.json b/spec/transactions/unified/bulk.json similarity index 100% rename from src/test/spec/json/transactions/unified/bulk.json rename to spec/transactions/unified/bulk.json diff --git a/src/test/spec/json/transactions/unified/bulk.yml b/spec/transactions/unified/bulk.yml similarity index 100% rename from src/test/spec/json/transactions/unified/bulk.yml rename to spec/transactions/unified/bulk.yml diff --git a/src/test/spec/json/transactions/unified/causal-consistency.json b/spec/transactions/unified/causal-consistency.json similarity index 100% rename from src/test/spec/json/transactions/unified/causal-consistency.json rename to spec/transactions/unified/causal-consistency.json diff --git a/src/test/spec/json/transactions/unified/causal-consistency.yml b/spec/transactions/unified/causal-consistency.yml similarity index 100% rename from src/test/spec/json/transactions/unified/causal-consistency.yml rename to spec/transactions/unified/causal-consistency.yml diff --git a/src/test/spec/json/transactions/unified/client-bulkWrite.json b/spec/transactions/unified/client-bulkWrite.json similarity index 100% rename from src/test/spec/json/transactions/unified/client-bulkWrite.json rename to spec/transactions/unified/client-bulkWrite.json diff --git a/src/test/spec/json/transactions/unified/client-bulkWrite.yml b/spec/transactions/unified/client-bulkWrite.yml similarity index 100% rename from src/test/spec/json/transactions/unified/client-bulkWrite.yml rename to spec/transactions/unified/client-bulkWrite.yml diff --git a/src/test/spec/json/transactions/unified/commit.json b/spec/transactions/unified/commit.json similarity index 100% rename from src/test/spec/json/transactions/unified/commit.json rename to spec/transactions/unified/commit.json diff --git a/src/test/spec/json/transactions/unified/commit.yml b/spec/transactions/unified/commit.yml similarity index 100% rename from src/test/spec/json/transactions/unified/commit.yml rename to spec/transactions/unified/commit.yml diff --git a/src/test/spec/json/transactions/unified/count.json b/spec/transactions/unified/count.json similarity index 100% rename from src/test/spec/json/transactions/unified/count.json rename to spec/transactions/unified/count.json diff --git a/src/test/spec/json/transactions/unified/count.yml b/spec/transactions/unified/count.yml similarity index 100% rename from src/test/spec/json/transactions/unified/count.yml rename to spec/transactions/unified/count.yml diff --git a/src/test/spec/json/transactions/unified/create-collection.json b/spec/transactions/unified/create-collection.json similarity index 100% rename from src/test/spec/json/transactions/unified/create-collection.json rename to spec/transactions/unified/create-collection.json diff --git a/src/test/spec/json/transactions/unified/create-collection.yml b/spec/transactions/unified/create-collection.yml similarity index 100% rename from src/test/spec/json/transactions/unified/create-collection.yml rename to spec/transactions/unified/create-collection.yml diff --git a/src/test/spec/json/transactions/unified/create-index.json b/spec/transactions/unified/create-index.json similarity index 100% rename from src/test/spec/json/transactions/unified/create-index.json rename to spec/transactions/unified/create-index.json diff --git a/src/test/spec/json/transactions/unified/create-index.yml b/spec/transactions/unified/create-index.yml similarity index 100% rename from src/test/spec/json/transactions/unified/create-index.yml rename to spec/transactions/unified/create-index.yml diff --git a/src/test/spec/json/transactions/unified/delete.json b/spec/transactions/unified/delete.json similarity index 100% rename from src/test/spec/json/transactions/unified/delete.json rename to spec/transactions/unified/delete.json diff --git a/src/test/spec/json/transactions/unified/delete.yml b/spec/transactions/unified/delete.yml similarity index 100% rename from src/test/spec/json/transactions/unified/delete.yml rename to spec/transactions/unified/delete.yml diff --git a/src/test/spec/json/transactions/unified/do-not-retry-read-in-transaction.json b/spec/transactions/unified/do-not-retry-read-in-transaction.json similarity index 100% rename from src/test/spec/json/transactions/unified/do-not-retry-read-in-transaction.json rename to spec/transactions/unified/do-not-retry-read-in-transaction.json diff --git a/src/test/spec/json/transactions/unified/do-not-retry-read-in-transaction.yml b/spec/transactions/unified/do-not-retry-read-in-transaction.yml similarity index 100% rename from src/test/spec/json/transactions/unified/do-not-retry-read-in-transaction.yml rename to spec/transactions/unified/do-not-retry-read-in-transaction.yml diff --git a/src/test/spec/json/transactions/unified/error-labels-blockConnection.json b/spec/transactions/unified/error-labels-blockConnection.json similarity index 100% rename from src/test/spec/json/transactions/unified/error-labels-blockConnection.json rename to spec/transactions/unified/error-labels-blockConnection.json diff --git a/src/test/spec/json/transactions/unified/error-labels-blockConnection.yml b/spec/transactions/unified/error-labels-blockConnection.yml similarity index 100% rename from src/test/spec/json/transactions/unified/error-labels-blockConnection.yml rename to spec/transactions/unified/error-labels-blockConnection.yml diff --git a/src/test/spec/json/transactions/unified/error-labels-errorLabels.json b/spec/transactions/unified/error-labels-errorLabels.json similarity index 100% rename from src/test/spec/json/transactions/unified/error-labels-errorLabels.json rename to spec/transactions/unified/error-labels-errorLabels.json diff --git a/src/test/spec/json/transactions/unified/error-labels-errorLabels.yml b/spec/transactions/unified/error-labels-errorLabels.yml similarity index 100% rename from src/test/spec/json/transactions/unified/error-labels-errorLabels.yml rename to spec/transactions/unified/error-labels-errorLabels.yml diff --git a/src/test/spec/json/transactions/unified/error-labels.json b/spec/transactions/unified/error-labels.json similarity index 100% rename from src/test/spec/json/transactions/unified/error-labels.json rename to spec/transactions/unified/error-labels.json diff --git a/src/test/spec/json/transactions/unified/error-labels.yml b/spec/transactions/unified/error-labels.yml similarity index 100% rename from src/test/spec/json/transactions/unified/error-labels.yml rename to spec/transactions/unified/error-labels.yml diff --git a/src/test/spec/json/transactions/unified/errors-client.json b/spec/transactions/unified/errors-client.json similarity index 100% rename from src/test/spec/json/transactions/unified/errors-client.json rename to spec/transactions/unified/errors-client.json diff --git a/src/test/spec/json/transactions/unified/errors-client.yml b/spec/transactions/unified/errors-client.yml similarity index 100% rename from src/test/spec/json/transactions/unified/errors-client.yml rename to spec/transactions/unified/errors-client.yml diff --git a/src/test/spec/json/transactions/unified/errors.json b/spec/transactions/unified/errors.json similarity index 100% rename from src/test/spec/json/transactions/unified/errors.json rename to spec/transactions/unified/errors.json diff --git a/src/test/spec/json/transactions/unified/errors.yml b/spec/transactions/unified/errors.yml similarity index 100% rename from src/test/spec/json/transactions/unified/errors.yml rename to spec/transactions/unified/errors.yml diff --git a/src/test/spec/json/transactions/unified/findOneAndDelete.json b/spec/transactions/unified/findOneAndDelete.json similarity index 100% rename from src/test/spec/json/transactions/unified/findOneAndDelete.json rename to spec/transactions/unified/findOneAndDelete.json diff --git a/src/test/spec/json/transactions/unified/findOneAndDelete.yml b/spec/transactions/unified/findOneAndDelete.yml similarity index 100% rename from src/test/spec/json/transactions/unified/findOneAndDelete.yml rename to spec/transactions/unified/findOneAndDelete.yml diff --git a/src/test/spec/json/transactions/unified/findOneAndReplace.json b/spec/transactions/unified/findOneAndReplace.json similarity index 100% rename from src/test/spec/json/transactions/unified/findOneAndReplace.json rename to spec/transactions/unified/findOneAndReplace.json diff --git a/src/test/spec/json/transactions/unified/findOneAndReplace.yml b/spec/transactions/unified/findOneAndReplace.yml similarity index 100% rename from src/test/spec/json/transactions/unified/findOneAndReplace.yml rename to spec/transactions/unified/findOneAndReplace.yml diff --git a/src/test/spec/json/transactions/unified/findOneAndUpdate.json b/spec/transactions/unified/findOneAndUpdate.json similarity index 100% rename from src/test/spec/json/transactions/unified/findOneAndUpdate.json rename to spec/transactions/unified/findOneAndUpdate.json diff --git a/src/test/spec/json/transactions/unified/findOneAndUpdate.yml b/spec/transactions/unified/findOneAndUpdate.yml similarity index 100% rename from src/test/spec/json/transactions/unified/findOneAndUpdate.yml rename to spec/transactions/unified/findOneAndUpdate.yml diff --git a/src/test/spec/json/transactions/unified/insert.json b/spec/transactions/unified/insert.json similarity index 100% rename from src/test/spec/json/transactions/unified/insert.json rename to spec/transactions/unified/insert.json diff --git a/src/test/spec/json/transactions/unified/insert.yml b/spec/transactions/unified/insert.yml similarity index 100% rename from src/test/spec/json/transactions/unified/insert.yml rename to spec/transactions/unified/insert.yml diff --git a/src/test/spec/json/transactions/unified/isolation.json b/spec/transactions/unified/isolation.json similarity index 100% rename from src/test/spec/json/transactions/unified/isolation.json rename to spec/transactions/unified/isolation.json diff --git a/src/test/spec/json/transactions/unified/isolation.yml b/spec/transactions/unified/isolation.yml similarity index 100% rename from src/test/spec/json/transactions/unified/isolation.yml rename to spec/transactions/unified/isolation.yml diff --git a/src/test/spec/json/transactions/unified/mongos-pin-auto-tests.py b/spec/transactions/unified/mongos-pin-auto-tests.py similarity index 100% rename from src/test/spec/json/transactions/unified/mongos-pin-auto-tests.py rename to spec/transactions/unified/mongos-pin-auto-tests.py diff --git a/src/test/spec/json/transactions/unified/mongos-pin-auto.json b/spec/transactions/unified/mongos-pin-auto.json similarity index 100% rename from src/test/spec/json/transactions/unified/mongos-pin-auto.json rename to spec/transactions/unified/mongos-pin-auto.json diff --git a/src/test/spec/json/transactions/unified/mongos-pin-auto.yml b/spec/transactions/unified/mongos-pin-auto.yml similarity index 100% rename from src/test/spec/json/transactions/unified/mongos-pin-auto.yml rename to spec/transactions/unified/mongos-pin-auto.yml diff --git a/src/test/spec/json/transactions/unified/mongos-recovery-token-errorLabels.json b/spec/transactions/unified/mongos-recovery-token-errorLabels.json similarity index 100% rename from src/test/spec/json/transactions/unified/mongos-recovery-token-errorLabels.json rename to spec/transactions/unified/mongos-recovery-token-errorLabels.json diff --git a/src/test/spec/json/transactions/unified/mongos-recovery-token-errorLabels.yml b/spec/transactions/unified/mongos-recovery-token-errorLabels.yml similarity index 100% rename from src/test/spec/json/transactions/unified/mongos-recovery-token-errorLabels.yml rename to spec/transactions/unified/mongos-recovery-token-errorLabels.yml diff --git a/src/test/spec/json/transactions/unified/mongos-recovery-token.json b/spec/transactions/unified/mongos-recovery-token.json similarity index 100% rename from src/test/spec/json/transactions/unified/mongos-recovery-token.json rename to spec/transactions/unified/mongos-recovery-token.json diff --git a/src/test/spec/json/transactions/unified/mongos-recovery-token.yml b/spec/transactions/unified/mongos-recovery-token.yml similarity index 100% rename from src/test/spec/json/transactions/unified/mongos-recovery-token.yml rename to spec/transactions/unified/mongos-recovery-token.yml diff --git a/src/test/spec/json/transactions/unified/mongos-unpin.json b/spec/transactions/unified/mongos-unpin.json similarity index 100% rename from src/test/spec/json/transactions/unified/mongos-unpin.json rename to spec/transactions/unified/mongos-unpin.json diff --git a/src/test/spec/json/transactions/unified/mongos-unpin.yml b/spec/transactions/unified/mongos-unpin.yml similarity index 100% rename from src/test/spec/json/transactions/unified/mongos-unpin.yml rename to spec/transactions/unified/mongos-unpin.yml diff --git a/src/test/spec/json/transactions/unified/pin-mongos.json b/spec/transactions/unified/pin-mongos.json similarity index 100% rename from src/test/spec/json/transactions/unified/pin-mongos.json rename to spec/transactions/unified/pin-mongos.json diff --git a/src/test/spec/json/transactions/unified/pin-mongos.yml b/spec/transactions/unified/pin-mongos.yml similarity index 100% rename from src/test/spec/json/transactions/unified/pin-mongos.yml rename to spec/transactions/unified/pin-mongos.yml diff --git a/src/test/spec/json/transactions/unified/read-concern.json b/spec/transactions/unified/read-concern.json similarity index 100% rename from src/test/spec/json/transactions/unified/read-concern.json rename to spec/transactions/unified/read-concern.json diff --git a/src/test/spec/json/transactions/unified/read-concern.yml b/spec/transactions/unified/read-concern.yml similarity index 100% rename from src/test/spec/json/transactions/unified/read-concern.yml rename to spec/transactions/unified/read-concern.yml diff --git a/src/test/spec/json/transactions/unified/read-pref.json b/spec/transactions/unified/read-pref.json similarity index 100% rename from src/test/spec/json/transactions/unified/read-pref.json rename to spec/transactions/unified/read-pref.json diff --git a/src/test/spec/json/transactions/unified/read-pref.yml b/spec/transactions/unified/read-pref.yml similarity index 100% rename from src/test/spec/json/transactions/unified/read-pref.yml rename to spec/transactions/unified/read-pref.yml diff --git a/src/test/spec/json/transactions/unified/reads.json b/spec/transactions/unified/reads.json similarity index 100% rename from src/test/spec/json/transactions/unified/reads.json rename to spec/transactions/unified/reads.json diff --git a/src/test/spec/json/transactions/unified/reads.yml b/spec/transactions/unified/reads.yml similarity index 100% rename from src/test/spec/json/transactions/unified/reads.yml rename to spec/transactions/unified/reads.yml diff --git a/src/test/spec/json/transactions/unified/retryable-abort-errorLabels.json b/spec/transactions/unified/retryable-abort-errorLabels.json similarity index 100% rename from src/test/spec/json/transactions/unified/retryable-abort-errorLabels.json rename to spec/transactions/unified/retryable-abort-errorLabels.json diff --git a/src/test/spec/json/transactions/unified/retryable-abort-errorLabels.yml b/spec/transactions/unified/retryable-abort-errorLabels.yml similarity index 100% rename from src/test/spec/json/transactions/unified/retryable-abort-errorLabels.yml rename to spec/transactions/unified/retryable-abort-errorLabels.yml diff --git a/src/test/spec/json/transactions/unified/retryable-abort-handshake.json b/spec/transactions/unified/retryable-abort-handshake.json similarity index 100% rename from src/test/spec/json/transactions/unified/retryable-abort-handshake.json rename to spec/transactions/unified/retryable-abort-handshake.json diff --git a/src/test/spec/json/transactions/unified/retryable-abort-handshake.yml b/spec/transactions/unified/retryable-abort-handshake.yml similarity index 100% rename from src/test/spec/json/transactions/unified/retryable-abort-handshake.yml rename to spec/transactions/unified/retryable-abort-handshake.yml diff --git a/src/test/spec/json/transactions/unified/retryable-abort.json b/spec/transactions/unified/retryable-abort.json similarity index 100% rename from src/test/spec/json/transactions/unified/retryable-abort.json rename to spec/transactions/unified/retryable-abort.json diff --git a/src/test/spec/json/transactions/unified/retryable-abort.yml b/spec/transactions/unified/retryable-abort.yml similarity index 100% rename from src/test/spec/json/transactions/unified/retryable-abort.yml rename to spec/transactions/unified/retryable-abort.yml diff --git a/src/test/spec/json/transactions/unified/retryable-commit-errorLabels.json b/spec/transactions/unified/retryable-commit-errorLabels.json similarity index 100% rename from src/test/spec/json/transactions/unified/retryable-commit-errorLabels.json rename to spec/transactions/unified/retryable-commit-errorLabels.json diff --git a/src/test/spec/json/transactions/unified/retryable-commit-errorLabels.yml b/spec/transactions/unified/retryable-commit-errorLabels.yml similarity index 100% rename from src/test/spec/json/transactions/unified/retryable-commit-errorLabels.yml rename to spec/transactions/unified/retryable-commit-errorLabels.yml diff --git a/src/test/spec/json/transactions/unified/retryable-commit-handshake.json b/spec/transactions/unified/retryable-commit-handshake.json similarity index 100% rename from src/test/spec/json/transactions/unified/retryable-commit-handshake.json rename to spec/transactions/unified/retryable-commit-handshake.json diff --git a/src/test/spec/json/transactions/unified/retryable-commit-handshake.yml b/spec/transactions/unified/retryable-commit-handshake.yml similarity index 100% rename from src/test/spec/json/transactions/unified/retryable-commit-handshake.yml rename to spec/transactions/unified/retryable-commit-handshake.yml diff --git a/src/test/spec/json/transactions/unified/retryable-commit.json b/spec/transactions/unified/retryable-commit.json similarity index 100% rename from src/test/spec/json/transactions/unified/retryable-commit.json rename to spec/transactions/unified/retryable-commit.json diff --git a/src/test/spec/json/transactions/unified/retryable-commit.yml b/spec/transactions/unified/retryable-commit.yml similarity index 100% rename from src/test/spec/json/transactions/unified/retryable-commit.yml rename to spec/transactions/unified/retryable-commit.yml diff --git a/src/test/spec/json/transactions/unified/retryable-writes.json b/spec/transactions/unified/retryable-writes.json similarity index 100% rename from src/test/spec/json/transactions/unified/retryable-writes.json rename to spec/transactions/unified/retryable-writes.json diff --git a/src/test/spec/json/transactions/unified/retryable-writes.yml b/spec/transactions/unified/retryable-writes.yml similarity index 100% rename from src/test/spec/json/transactions/unified/retryable-writes.yml rename to spec/transactions/unified/retryable-writes.yml diff --git a/src/test/spec/json/transactions/unified/run-command.json b/spec/transactions/unified/run-command.json similarity index 100% rename from src/test/spec/json/transactions/unified/run-command.json rename to spec/transactions/unified/run-command.json diff --git a/src/test/spec/json/transactions/unified/run-command.yml b/spec/transactions/unified/run-command.yml similarity index 100% rename from src/test/spec/json/transactions/unified/run-command.yml rename to spec/transactions/unified/run-command.yml diff --git a/src/test/spec/json/transactions/unified/transaction-options-repl.json b/spec/transactions/unified/transaction-options-repl.json similarity index 100% rename from src/test/spec/json/transactions/unified/transaction-options-repl.json rename to spec/transactions/unified/transaction-options-repl.json diff --git a/src/test/spec/json/transactions/unified/transaction-options-repl.yml b/spec/transactions/unified/transaction-options-repl.yml similarity index 100% rename from src/test/spec/json/transactions/unified/transaction-options-repl.yml rename to spec/transactions/unified/transaction-options-repl.yml diff --git a/src/test/spec/json/transactions/unified/transaction-options.json b/spec/transactions/unified/transaction-options.json similarity index 100% rename from src/test/spec/json/transactions/unified/transaction-options.json rename to spec/transactions/unified/transaction-options.json diff --git a/src/test/spec/json/transactions/unified/transaction-options.yml b/spec/transactions/unified/transaction-options.yml similarity index 100% rename from src/test/spec/json/transactions/unified/transaction-options.yml rename to spec/transactions/unified/transaction-options.yml diff --git a/src/test/spec/json/transactions/unified/update.json b/spec/transactions/unified/update.json similarity index 100% rename from src/test/spec/json/transactions/unified/update.json rename to spec/transactions/unified/update.json diff --git a/src/test/spec/json/transactions/unified/update.yml b/spec/transactions/unified/update.yml similarity index 100% rename from src/test/spec/json/transactions/unified/update.yml rename to spec/transactions/unified/update.yml diff --git a/src/test/spec/json/transactions/unified/write-concern.json b/spec/transactions/unified/write-concern.json similarity index 100% rename from src/test/spec/json/transactions/unified/write-concern.json rename to spec/transactions/unified/write-concern.json diff --git a/src/test/spec/json/transactions/unified/write-concern.yml b/spec/transactions/unified/write-concern.yml similarity index 100% rename from src/test/spec/json/transactions/unified/write-concern.yml rename to spec/transactions/unified/write-concern.yml diff --git a/src/test/spec/json/unified-test-format/Makefile b/spec/unified-test-format/Makefile similarity index 100% rename from src/test/spec/json/unified-test-format/Makefile rename to spec/unified-test-format/Makefile diff --git a/src/test/spec/json/unified-test-format/README.md b/spec/unified-test-format/README.md similarity index 100% rename from src/test/spec/json/unified-test-format/README.md rename to spec/unified-test-format/README.md diff --git a/src/test/spec/json/unified-test-format/invalid/clientEncryptionOpts-additionalProperties.json b/spec/unified-test-format/invalid/clientEncryptionOpts-additionalProperties.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/clientEncryptionOpts-additionalProperties.json rename to spec/unified-test-format/invalid/clientEncryptionOpts-additionalProperties.json diff --git a/src/test/spec/json/unified-test-format/invalid/clientEncryptionOpts-additionalProperties.yml b/spec/unified-test-format/invalid/clientEncryptionOpts-additionalProperties.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/clientEncryptionOpts-additionalProperties.yml rename to spec/unified-test-format/invalid/clientEncryptionOpts-additionalProperties.yml diff --git a/src/test/spec/json/unified-test-format/invalid/clientEncryptionOpts-keyVaultClient-required.json b/spec/unified-test-format/invalid/clientEncryptionOpts-keyVaultClient-required.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/clientEncryptionOpts-keyVaultClient-required.json rename to spec/unified-test-format/invalid/clientEncryptionOpts-keyVaultClient-required.json diff --git a/src/test/spec/json/unified-test-format/invalid/clientEncryptionOpts-keyVaultClient-required.yml b/spec/unified-test-format/invalid/clientEncryptionOpts-keyVaultClient-required.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/clientEncryptionOpts-keyVaultClient-required.yml rename to spec/unified-test-format/invalid/clientEncryptionOpts-keyVaultClient-required.yml diff --git a/src/test/spec/json/unified-test-format/invalid/clientEncryptionOpts-keyVaultClient-type.json b/spec/unified-test-format/invalid/clientEncryptionOpts-keyVaultClient-type.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/clientEncryptionOpts-keyVaultClient-type.json rename to spec/unified-test-format/invalid/clientEncryptionOpts-keyVaultClient-type.json diff --git a/src/test/spec/json/unified-test-format/invalid/clientEncryptionOpts-keyVaultClient-type.yml b/spec/unified-test-format/invalid/clientEncryptionOpts-keyVaultClient-type.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/clientEncryptionOpts-keyVaultClient-type.yml rename to spec/unified-test-format/invalid/clientEncryptionOpts-keyVaultClient-type.yml diff --git a/src/test/spec/json/unified-test-format/invalid/clientEncryptionOpts-keyVaultNamespace-required.json b/spec/unified-test-format/invalid/clientEncryptionOpts-keyVaultNamespace-required.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/clientEncryptionOpts-keyVaultNamespace-required.json rename to spec/unified-test-format/invalid/clientEncryptionOpts-keyVaultNamespace-required.json diff --git a/src/test/spec/json/unified-test-format/invalid/clientEncryptionOpts-keyVaultNamespace-required.yml b/spec/unified-test-format/invalid/clientEncryptionOpts-keyVaultNamespace-required.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/clientEncryptionOpts-keyVaultNamespace-required.yml rename to spec/unified-test-format/invalid/clientEncryptionOpts-keyVaultNamespace-required.yml diff --git a/src/test/spec/json/unified-test-format/invalid/clientEncryptionOpts-keyVaultNamespace-type.json b/spec/unified-test-format/invalid/clientEncryptionOpts-keyVaultNamespace-type.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/clientEncryptionOpts-keyVaultNamespace-type.json rename to spec/unified-test-format/invalid/clientEncryptionOpts-keyVaultNamespace-type.json diff --git a/src/test/spec/json/unified-test-format/invalid/clientEncryptionOpts-keyVaultNamespace-type.yml b/spec/unified-test-format/invalid/clientEncryptionOpts-keyVaultNamespace-type.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/clientEncryptionOpts-keyVaultNamespace-type.yml rename to spec/unified-test-format/invalid/clientEncryptionOpts-keyVaultNamespace-type.yml diff --git a/src/test/spec/json/unified-test-format/invalid/clientEncryptionOpts-kmsProviders-additionalProperties.json b/spec/unified-test-format/invalid/clientEncryptionOpts-kmsProviders-additionalProperties.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/clientEncryptionOpts-kmsProviders-additionalProperties.json rename to spec/unified-test-format/invalid/clientEncryptionOpts-kmsProviders-additionalProperties.json diff --git a/src/test/spec/json/unified-test-format/invalid/clientEncryptionOpts-kmsProviders-additionalProperties.yml b/spec/unified-test-format/invalid/clientEncryptionOpts-kmsProviders-additionalProperties.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/clientEncryptionOpts-kmsProviders-additionalProperties.yml rename to spec/unified-test-format/invalid/clientEncryptionOpts-kmsProviders-additionalProperties.yml diff --git a/src/test/spec/json/unified-test-format/invalid/clientEncryptionOpts-kmsProviders-aws-additionalProperties.json b/spec/unified-test-format/invalid/clientEncryptionOpts-kmsProviders-aws-additionalProperties.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/clientEncryptionOpts-kmsProviders-aws-additionalProperties.json rename to spec/unified-test-format/invalid/clientEncryptionOpts-kmsProviders-aws-additionalProperties.json diff --git a/src/test/spec/json/unified-test-format/invalid/clientEncryptionOpts-kmsProviders-aws-additionalProperties.yml b/spec/unified-test-format/invalid/clientEncryptionOpts-kmsProviders-aws-additionalProperties.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/clientEncryptionOpts-kmsProviders-aws-additionalProperties.yml rename to spec/unified-test-format/invalid/clientEncryptionOpts-kmsProviders-aws-additionalProperties.yml diff --git a/src/test/spec/json/unified-test-format/invalid/clientEncryptionOpts-kmsProviders-aws-type.json b/spec/unified-test-format/invalid/clientEncryptionOpts-kmsProviders-aws-type.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/clientEncryptionOpts-kmsProviders-aws-type.json rename to spec/unified-test-format/invalid/clientEncryptionOpts-kmsProviders-aws-type.json diff --git a/src/test/spec/json/unified-test-format/invalid/clientEncryptionOpts-kmsProviders-aws-type.yml b/spec/unified-test-format/invalid/clientEncryptionOpts-kmsProviders-aws-type.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/clientEncryptionOpts-kmsProviders-aws-type.yml rename to spec/unified-test-format/invalid/clientEncryptionOpts-kmsProviders-aws-type.yml diff --git a/src/test/spec/json/unified-test-format/invalid/clientEncryptionOpts-kmsProviders-azure-additionalProperties.json b/spec/unified-test-format/invalid/clientEncryptionOpts-kmsProviders-azure-additionalProperties.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/clientEncryptionOpts-kmsProviders-azure-additionalProperties.json rename to spec/unified-test-format/invalid/clientEncryptionOpts-kmsProviders-azure-additionalProperties.json diff --git a/src/test/spec/json/unified-test-format/invalid/clientEncryptionOpts-kmsProviders-azure-additionalProperties.yml b/spec/unified-test-format/invalid/clientEncryptionOpts-kmsProviders-azure-additionalProperties.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/clientEncryptionOpts-kmsProviders-azure-additionalProperties.yml rename to spec/unified-test-format/invalid/clientEncryptionOpts-kmsProviders-azure-additionalProperties.yml diff --git a/src/test/spec/json/unified-test-format/invalid/clientEncryptionOpts-kmsProviders-azure-type.json b/spec/unified-test-format/invalid/clientEncryptionOpts-kmsProviders-azure-type.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/clientEncryptionOpts-kmsProviders-azure-type.json rename to spec/unified-test-format/invalid/clientEncryptionOpts-kmsProviders-azure-type.json diff --git a/src/test/spec/json/unified-test-format/invalid/clientEncryptionOpts-kmsProviders-azure-type.yml b/spec/unified-test-format/invalid/clientEncryptionOpts-kmsProviders-azure-type.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/clientEncryptionOpts-kmsProviders-azure-type.yml rename to spec/unified-test-format/invalid/clientEncryptionOpts-kmsProviders-azure-type.yml diff --git a/src/test/spec/json/unified-test-format/invalid/clientEncryptionOpts-kmsProviders-gcp-additionalProperties.json b/spec/unified-test-format/invalid/clientEncryptionOpts-kmsProviders-gcp-additionalProperties.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/clientEncryptionOpts-kmsProviders-gcp-additionalProperties.json rename to spec/unified-test-format/invalid/clientEncryptionOpts-kmsProviders-gcp-additionalProperties.json diff --git a/src/test/spec/json/unified-test-format/invalid/clientEncryptionOpts-kmsProviders-gcp-additionalProperties.yml b/spec/unified-test-format/invalid/clientEncryptionOpts-kmsProviders-gcp-additionalProperties.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/clientEncryptionOpts-kmsProviders-gcp-additionalProperties.yml rename to spec/unified-test-format/invalid/clientEncryptionOpts-kmsProviders-gcp-additionalProperties.yml diff --git a/src/test/spec/json/unified-test-format/invalid/clientEncryptionOpts-kmsProviders-gcp-type.json b/spec/unified-test-format/invalid/clientEncryptionOpts-kmsProviders-gcp-type.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/clientEncryptionOpts-kmsProviders-gcp-type.json rename to spec/unified-test-format/invalid/clientEncryptionOpts-kmsProviders-gcp-type.json diff --git a/src/test/spec/json/unified-test-format/invalid/clientEncryptionOpts-kmsProviders-gcp-type.yml b/spec/unified-test-format/invalid/clientEncryptionOpts-kmsProviders-gcp-type.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/clientEncryptionOpts-kmsProviders-gcp-type.yml rename to spec/unified-test-format/invalid/clientEncryptionOpts-kmsProviders-gcp-type.yml diff --git a/src/test/spec/json/unified-test-format/invalid/clientEncryptionOpts-kmsProviders-invalidName.json b/spec/unified-test-format/invalid/clientEncryptionOpts-kmsProviders-invalidName.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/clientEncryptionOpts-kmsProviders-invalidName.json rename to spec/unified-test-format/invalid/clientEncryptionOpts-kmsProviders-invalidName.json diff --git a/src/test/spec/json/unified-test-format/invalid/clientEncryptionOpts-kmsProviders-invalidName.yml b/spec/unified-test-format/invalid/clientEncryptionOpts-kmsProviders-invalidName.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/clientEncryptionOpts-kmsProviders-invalidName.yml rename to spec/unified-test-format/invalid/clientEncryptionOpts-kmsProviders-invalidName.yml diff --git a/src/test/spec/json/unified-test-format/invalid/clientEncryptionOpts-kmsProviders-kmip-additionalProperties.json b/spec/unified-test-format/invalid/clientEncryptionOpts-kmsProviders-kmip-additionalProperties.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/clientEncryptionOpts-kmsProviders-kmip-additionalProperties.json rename to spec/unified-test-format/invalid/clientEncryptionOpts-kmsProviders-kmip-additionalProperties.json diff --git a/src/test/spec/json/unified-test-format/invalid/clientEncryptionOpts-kmsProviders-kmip-additionalProperties.yml b/spec/unified-test-format/invalid/clientEncryptionOpts-kmsProviders-kmip-additionalProperties.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/clientEncryptionOpts-kmsProviders-kmip-additionalProperties.yml rename to spec/unified-test-format/invalid/clientEncryptionOpts-kmsProviders-kmip-additionalProperties.yml diff --git a/src/test/spec/json/unified-test-format/invalid/clientEncryptionOpts-kmsProviders-kmip-type.json b/spec/unified-test-format/invalid/clientEncryptionOpts-kmsProviders-kmip-type.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/clientEncryptionOpts-kmsProviders-kmip-type.json rename to spec/unified-test-format/invalid/clientEncryptionOpts-kmsProviders-kmip-type.json diff --git a/src/test/spec/json/unified-test-format/invalid/clientEncryptionOpts-kmsProviders-kmip-type.yml b/spec/unified-test-format/invalid/clientEncryptionOpts-kmsProviders-kmip-type.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/clientEncryptionOpts-kmsProviders-kmip-type.yml rename to spec/unified-test-format/invalid/clientEncryptionOpts-kmsProviders-kmip-type.yml diff --git a/src/test/spec/json/unified-test-format/invalid/clientEncryptionOpts-kmsProviders-local-additionalProperties.json b/spec/unified-test-format/invalid/clientEncryptionOpts-kmsProviders-local-additionalProperties.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/clientEncryptionOpts-kmsProviders-local-additionalProperties.json rename to spec/unified-test-format/invalid/clientEncryptionOpts-kmsProviders-local-additionalProperties.json diff --git a/src/test/spec/json/unified-test-format/invalid/clientEncryptionOpts-kmsProviders-local-additionalProperties.yml b/spec/unified-test-format/invalid/clientEncryptionOpts-kmsProviders-local-additionalProperties.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/clientEncryptionOpts-kmsProviders-local-additionalProperties.yml rename to spec/unified-test-format/invalid/clientEncryptionOpts-kmsProviders-local-additionalProperties.yml diff --git a/src/test/spec/json/unified-test-format/invalid/clientEncryptionOpts-kmsProviders-local-type.json b/spec/unified-test-format/invalid/clientEncryptionOpts-kmsProviders-local-type.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/clientEncryptionOpts-kmsProviders-local-type.json rename to spec/unified-test-format/invalid/clientEncryptionOpts-kmsProviders-local-type.json diff --git a/src/test/spec/json/unified-test-format/invalid/clientEncryptionOpts-kmsProviders-local-type.yml b/spec/unified-test-format/invalid/clientEncryptionOpts-kmsProviders-local-type.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/clientEncryptionOpts-kmsProviders-local-type.yml rename to spec/unified-test-format/invalid/clientEncryptionOpts-kmsProviders-local-type.yml diff --git a/src/test/spec/json/unified-test-format/invalid/clientEncryptionOpts-kmsProviders-required.json b/spec/unified-test-format/invalid/clientEncryptionOpts-kmsProviders-required.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/clientEncryptionOpts-kmsProviders-required.json rename to spec/unified-test-format/invalid/clientEncryptionOpts-kmsProviders-required.json diff --git a/src/test/spec/json/unified-test-format/invalid/clientEncryptionOpts-kmsProviders-required.yml b/spec/unified-test-format/invalid/clientEncryptionOpts-kmsProviders-required.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/clientEncryptionOpts-kmsProviders-required.yml rename to spec/unified-test-format/invalid/clientEncryptionOpts-kmsProviders-required.yml diff --git a/src/test/spec/json/unified-test-format/invalid/clientEncryptionOpts-kmsProviders-type.json b/spec/unified-test-format/invalid/clientEncryptionOpts-kmsProviders-type.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/clientEncryptionOpts-kmsProviders-type.json rename to spec/unified-test-format/invalid/clientEncryptionOpts-kmsProviders-type.json diff --git a/src/test/spec/json/unified-test-format/invalid/clientEncryptionOpts-kmsProviders-type.yml b/spec/unified-test-format/invalid/clientEncryptionOpts-kmsProviders-type.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/clientEncryptionOpts-kmsProviders-type.yml rename to spec/unified-test-format/invalid/clientEncryptionOpts-kmsProviders-type.yml diff --git a/src/test/spec/json/unified-test-format/invalid/clientEncryptionOpts-tlsOptions_not_supported.json b/spec/unified-test-format/invalid/clientEncryptionOpts-tlsOptions_not_supported.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/clientEncryptionOpts-tlsOptions_not_supported.json rename to spec/unified-test-format/invalid/clientEncryptionOpts-tlsOptions_not_supported.json diff --git a/src/test/spec/json/unified-test-format/invalid/clientEncryptionOpts-tlsOptions_not_supported.yml b/spec/unified-test-format/invalid/clientEncryptionOpts-tlsOptions_not_supported.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/clientEncryptionOpts-tlsOptions_not_supported.yml rename to spec/unified-test-format/invalid/clientEncryptionOpts-tlsOptions_not_supported.yml diff --git a/src/test/spec/json/unified-test-format/invalid/collectionData-additionalProperties.json b/spec/unified-test-format/invalid/collectionData-additionalProperties.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/collectionData-additionalProperties.json rename to spec/unified-test-format/invalid/collectionData-additionalProperties.json diff --git a/src/test/spec/json/unified-test-format/invalid/collectionData-additionalProperties.yml b/spec/unified-test-format/invalid/collectionData-additionalProperties.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/collectionData-additionalProperties.yml rename to spec/unified-test-format/invalid/collectionData-additionalProperties.yml diff --git a/src/test/spec/json/unified-test-format/invalid/collectionData-collectionName-required.json b/spec/unified-test-format/invalid/collectionData-collectionName-required.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/collectionData-collectionName-required.json rename to spec/unified-test-format/invalid/collectionData-collectionName-required.json diff --git a/src/test/spec/json/unified-test-format/invalid/collectionData-collectionName-required.yml b/spec/unified-test-format/invalid/collectionData-collectionName-required.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/collectionData-collectionName-required.yml rename to spec/unified-test-format/invalid/collectionData-collectionName-required.yml diff --git a/src/test/spec/json/unified-test-format/invalid/collectionData-collectionName-type.json b/spec/unified-test-format/invalid/collectionData-collectionName-type.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/collectionData-collectionName-type.json rename to spec/unified-test-format/invalid/collectionData-collectionName-type.json diff --git a/src/test/spec/json/unified-test-format/invalid/collectionData-collectionName-type.yml b/spec/unified-test-format/invalid/collectionData-collectionName-type.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/collectionData-collectionName-type.yml rename to spec/unified-test-format/invalid/collectionData-collectionName-type.yml diff --git a/src/test/spec/json/unified-test-format/invalid/collectionData-createOptions-type.json b/spec/unified-test-format/invalid/collectionData-createOptions-type.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/collectionData-createOptions-type.json rename to spec/unified-test-format/invalid/collectionData-createOptions-type.json diff --git a/src/test/spec/json/unified-test-format/invalid/collectionData-createOptions-type.yml b/spec/unified-test-format/invalid/collectionData-createOptions-type.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/collectionData-createOptions-type.yml rename to spec/unified-test-format/invalid/collectionData-createOptions-type.yml diff --git a/src/test/spec/json/unified-test-format/invalid/collectionData-databaseName-required.json b/spec/unified-test-format/invalid/collectionData-databaseName-required.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/collectionData-databaseName-required.json rename to spec/unified-test-format/invalid/collectionData-databaseName-required.json diff --git a/src/test/spec/json/unified-test-format/invalid/collectionData-databaseName-required.yml b/spec/unified-test-format/invalid/collectionData-databaseName-required.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/collectionData-databaseName-required.yml rename to spec/unified-test-format/invalid/collectionData-databaseName-required.yml diff --git a/src/test/spec/json/unified-test-format/invalid/collectionData-databaseName-type.json b/spec/unified-test-format/invalid/collectionData-databaseName-type.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/collectionData-databaseName-type.json rename to spec/unified-test-format/invalid/collectionData-databaseName-type.json diff --git a/src/test/spec/json/unified-test-format/invalid/collectionData-databaseName-type.yml b/spec/unified-test-format/invalid/collectionData-databaseName-type.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/collectionData-databaseName-type.yml rename to spec/unified-test-format/invalid/collectionData-databaseName-type.yml diff --git a/src/test/spec/json/unified-test-format/invalid/collectionData-documents-items.json b/spec/unified-test-format/invalid/collectionData-documents-items.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/collectionData-documents-items.json rename to spec/unified-test-format/invalid/collectionData-documents-items.json diff --git a/src/test/spec/json/unified-test-format/invalid/collectionData-documents-items.yml b/spec/unified-test-format/invalid/collectionData-documents-items.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/collectionData-documents-items.yml rename to spec/unified-test-format/invalid/collectionData-documents-items.yml diff --git a/src/test/spec/json/unified-test-format/invalid/collectionData-documents-required.json b/spec/unified-test-format/invalid/collectionData-documents-required.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/collectionData-documents-required.json rename to spec/unified-test-format/invalid/collectionData-documents-required.json diff --git a/src/test/spec/json/unified-test-format/invalid/collectionData-documents-required.yml b/spec/unified-test-format/invalid/collectionData-documents-required.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/collectionData-documents-required.yml rename to spec/unified-test-format/invalid/collectionData-documents-required.yml diff --git a/src/test/spec/json/unified-test-format/invalid/collectionData-documents-type.json b/spec/unified-test-format/invalid/collectionData-documents-type.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/collectionData-documents-type.json rename to spec/unified-test-format/invalid/collectionData-documents-type.json diff --git a/src/test/spec/json/unified-test-format/invalid/collectionData-documents-type.yml b/spec/unified-test-format/invalid/collectionData-documents-type.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/collectionData-documents-type.yml rename to spec/unified-test-format/invalid/collectionData-documents-type.yml diff --git a/src/test/spec/json/unified-test-format/invalid/collectionOrDatabaseOptions-additionalProperties.json b/spec/unified-test-format/invalid/collectionOrDatabaseOptions-additionalProperties.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/collectionOrDatabaseOptions-additionalProperties.json rename to spec/unified-test-format/invalid/collectionOrDatabaseOptions-additionalProperties.json diff --git a/src/test/spec/json/unified-test-format/invalid/collectionOrDatabaseOptions-additionalProperties.yml b/spec/unified-test-format/invalid/collectionOrDatabaseOptions-additionalProperties.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/collectionOrDatabaseOptions-additionalProperties.yml rename to spec/unified-test-format/invalid/collectionOrDatabaseOptions-additionalProperties.yml diff --git a/src/test/spec/json/unified-test-format/invalid/collectionOrDatabaseOptions-readConcern-type.json b/spec/unified-test-format/invalid/collectionOrDatabaseOptions-readConcern-type.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/collectionOrDatabaseOptions-readConcern-type.json rename to spec/unified-test-format/invalid/collectionOrDatabaseOptions-readConcern-type.json diff --git a/src/test/spec/json/unified-test-format/invalid/collectionOrDatabaseOptions-readConcern-type.yml b/spec/unified-test-format/invalid/collectionOrDatabaseOptions-readConcern-type.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/collectionOrDatabaseOptions-readConcern-type.yml rename to spec/unified-test-format/invalid/collectionOrDatabaseOptions-readConcern-type.yml diff --git a/src/test/spec/json/unified-test-format/invalid/collectionOrDatabaseOptions-readPreference-type.json b/spec/unified-test-format/invalid/collectionOrDatabaseOptions-readPreference-type.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/collectionOrDatabaseOptions-readPreference-type.json rename to spec/unified-test-format/invalid/collectionOrDatabaseOptions-readPreference-type.json diff --git a/src/test/spec/json/unified-test-format/invalid/collectionOrDatabaseOptions-readPreference-type.yml b/spec/unified-test-format/invalid/collectionOrDatabaseOptions-readPreference-type.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/collectionOrDatabaseOptions-readPreference-type.yml rename to spec/unified-test-format/invalid/collectionOrDatabaseOptions-readPreference-type.yml diff --git a/src/test/spec/json/unified-test-format/invalid/collectionOrDatabaseOptions-timeoutMS-type.json b/spec/unified-test-format/invalid/collectionOrDatabaseOptions-timeoutMS-type.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/collectionOrDatabaseOptions-timeoutMS-type.json rename to spec/unified-test-format/invalid/collectionOrDatabaseOptions-timeoutMS-type.json diff --git a/src/test/spec/json/unified-test-format/invalid/collectionOrDatabaseOptions-timeoutMS-type.yml b/spec/unified-test-format/invalid/collectionOrDatabaseOptions-timeoutMS-type.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/collectionOrDatabaseOptions-timeoutMS-type.yml rename to spec/unified-test-format/invalid/collectionOrDatabaseOptions-timeoutMS-type.yml diff --git a/src/test/spec/json/unified-test-format/invalid/collectionOrDatabaseOptions-writeConcern-type.json b/spec/unified-test-format/invalid/collectionOrDatabaseOptions-writeConcern-type.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/collectionOrDatabaseOptions-writeConcern-type.json rename to spec/unified-test-format/invalid/collectionOrDatabaseOptions-writeConcern-type.json diff --git a/src/test/spec/json/unified-test-format/invalid/collectionOrDatabaseOptions-writeConcern-type.yml b/spec/unified-test-format/invalid/collectionOrDatabaseOptions-writeConcern-type.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/collectionOrDatabaseOptions-writeConcern-type.yml rename to spec/unified-test-format/invalid/collectionOrDatabaseOptions-writeConcern-type.yml diff --git a/src/test/spec/json/unified-test-format/invalid/createEntities-items.json b/spec/unified-test-format/invalid/createEntities-items.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/createEntities-items.json rename to spec/unified-test-format/invalid/createEntities-items.json diff --git a/src/test/spec/json/unified-test-format/invalid/createEntities-items.yml b/spec/unified-test-format/invalid/createEntities-items.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/createEntities-items.yml rename to spec/unified-test-format/invalid/createEntities-items.yml diff --git a/src/test/spec/json/unified-test-format/invalid/createEntities-minItems.json b/spec/unified-test-format/invalid/createEntities-minItems.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/createEntities-minItems.json rename to spec/unified-test-format/invalid/createEntities-minItems.json diff --git a/src/test/spec/json/unified-test-format/invalid/createEntities-minItems.yml b/spec/unified-test-format/invalid/createEntities-minItems.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/createEntities-minItems.yml rename to spec/unified-test-format/invalid/createEntities-minItems.yml diff --git a/src/test/spec/json/unified-test-format/invalid/createEntities-type.json b/spec/unified-test-format/invalid/createEntities-type.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/createEntities-type.json rename to spec/unified-test-format/invalid/createEntities-type.json diff --git a/src/test/spec/json/unified-test-format/invalid/createEntities-type.yml b/spec/unified-test-format/invalid/createEntities-type.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/createEntities-type.yml rename to spec/unified-test-format/invalid/createEntities-type.yml diff --git a/src/test/spec/json/unified-test-format/invalid/description-required.json b/spec/unified-test-format/invalid/description-required.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/description-required.json rename to spec/unified-test-format/invalid/description-required.json diff --git a/src/test/spec/json/unified-test-format/invalid/description-required.yml b/spec/unified-test-format/invalid/description-required.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/description-required.yml rename to spec/unified-test-format/invalid/description-required.yml diff --git a/src/test/spec/json/unified-test-format/invalid/entity-additionalProperties.json b/spec/unified-test-format/invalid/entity-additionalProperties.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/entity-additionalProperties.json rename to spec/unified-test-format/invalid/entity-additionalProperties.json diff --git a/src/test/spec/json/unified-test-format/invalid/entity-additionalProperties.yml b/spec/unified-test-format/invalid/entity-additionalProperties.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/entity-additionalProperties.yml rename to spec/unified-test-format/invalid/entity-additionalProperties.yml diff --git a/src/test/spec/json/unified-test-format/invalid/entity-bucket-additionalProperties.json b/spec/unified-test-format/invalid/entity-bucket-additionalProperties.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/entity-bucket-additionalProperties.json rename to spec/unified-test-format/invalid/entity-bucket-additionalProperties.json diff --git a/src/test/spec/json/unified-test-format/invalid/entity-bucket-additionalProperties.yml b/spec/unified-test-format/invalid/entity-bucket-additionalProperties.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/entity-bucket-additionalProperties.yml rename to spec/unified-test-format/invalid/entity-bucket-additionalProperties.yml diff --git a/src/test/spec/json/unified-test-format/invalid/entity-bucket-bucketOptions-type.json b/spec/unified-test-format/invalid/entity-bucket-bucketOptions-type.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/entity-bucket-bucketOptions-type.json rename to spec/unified-test-format/invalid/entity-bucket-bucketOptions-type.json diff --git a/src/test/spec/json/unified-test-format/invalid/entity-bucket-bucketOptions-type.yml b/spec/unified-test-format/invalid/entity-bucket-bucketOptions-type.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/entity-bucket-bucketOptions-type.yml rename to spec/unified-test-format/invalid/entity-bucket-bucketOptions-type.yml diff --git a/src/test/spec/json/unified-test-format/invalid/entity-bucket-database-required.json b/spec/unified-test-format/invalid/entity-bucket-database-required.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/entity-bucket-database-required.json rename to spec/unified-test-format/invalid/entity-bucket-database-required.json diff --git a/src/test/spec/json/unified-test-format/invalid/entity-bucket-database-required.yml b/spec/unified-test-format/invalid/entity-bucket-database-required.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/entity-bucket-database-required.yml rename to spec/unified-test-format/invalid/entity-bucket-database-required.yml diff --git a/src/test/spec/json/unified-test-format/invalid/entity-bucket-database-type.json b/spec/unified-test-format/invalid/entity-bucket-database-type.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/entity-bucket-database-type.json rename to spec/unified-test-format/invalid/entity-bucket-database-type.json diff --git a/src/test/spec/json/unified-test-format/invalid/entity-bucket-database-type.yml b/spec/unified-test-format/invalid/entity-bucket-database-type.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/entity-bucket-database-type.yml rename to spec/unified-test-format/invalid/entity-bucket-database-type.yml diff --git a/src/test/spec/json/unified-test-format/invalid/entity-bucket-id-required.json b/spec/unified-test-format/invalid/entity-bucket-id-required.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/entity-bucket-id-required.json rename to spec/unified-test-format/invalid/entity-bucket-id-required.json diff --git a/src/test/spec/json/unified-test-format/invalid/entity-bucket-id-required.yml b/spec/unified-test-format/invalid/entity-bucket-id-required.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/entity-bucket-id-required.yml rename to spec/unified-test-format/invalid/entity-bucket-id-required.yml diff --git a/src/test/spec/json/unified-test-format/invalid/entity-bucket-id-type.json b/spec/unified-test-format/invalid/entity-bucket-id-type.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/entity-bucket-id-type.json rename to spec/unified-test-format/invalid/entity-bucket-id-type.json diff --git a/src/test/spec/json/unified-test-format/invalid/entity-bucket-id-type.yml b/spec/unified-test-format/invalid/entity-bucket-id-type.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/entity-bucket-id-type.yml rename to spec/unified-test-format/invalid/entity-bucket-id-type.yml diff --git a/src/test/spec/json/unified-test-format/invalid/entity-client-additionalProperties.json b/spec/unified-test-format/invalid/entity-client-additionalProperties.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/entity-client-additionalProperties.json rename to spec/unified-test-format/invalid/entity-client-additionalProperties.json diff --git a/src/test/spec/json/unified-test-format/invalid/entity-client-additionalProperties.yml b/spec/unified-test-format/invalid/entity-client-additionalProperties.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/entity-client-additionalProperties.yml rename to spec/unified-test-format/invalid/entity-client-additionalProperties.yml diff --git a/src/test/spec/json/unified-test-format/invalid/entity-client-id-required.json b/spec/unified-test-format/invalid/entity-client-id-required.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/entity-client-id-required.json rename to spec/unified-test-format/invalid/entity-client-id-required.json diff --git a/src/test/spec/json/unified-test-format/invalid/entity-client-id-required.yml b/spec/unified-test-format/invalid/entity-client-id-required.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/entity-client-id-required.yml rename to spec/unified-test-format/invalid/entity-client-id-required.yml diff --git a/src/test/spec/json/unified-test-format/invalid/entity-client-id-type.json b/spec/unified-test-format/invalid/entity-client-id-type.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/entity-client-id-type.json rename to spec/unified-test-format/invalid/entity-client-id-type.json diff --git a/src/test/spec/json/unified-test-format/invalid/entity-client-id-type.yml b/spec/unified-test-format/invalid/entity-client-id-type.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/entity-client-id-type.yml rename to spec/unified-test-format/invalid/entity-client-id-type.yml diff --git a/src/test/spec/json/unified-test-format/invalid/entity-client-ignoreCommandMonitoringEvents-items.json b/spec/unified-test-format/invalid/entity-client-ignoreCommandMonitoringEvents-items.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/entity-client-ignoreCommandMonitoringEvents-items.json rename to spec/unified-test-format/invalid/entity-client-ignoreCommandMonitoringEvents-items.json diff --git a/src/test/spec/json/unified-test-format/invalid/entity-client-ignoreCommandMonitoringEvents-items.yml b/spec/unified-test-format/invalid/entity-client-ignoreCommandMonitoringEvents-items.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/entity-client-ignoreCommandMonitoringEvents-items.yml rename to spec/unified-test-format/invalid/entity-client-ignoreCommandMonitoringEvents-items.yml diff --git a/src/test/spec/json/unified-test-format/invalid/entity-client-ignoreCommandMonitoringEvents-minItems.json b/spec/unified-test-format/invalid/entity-client-ignoreCommandMonitoringEvents-minItems.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/entity-client-ignoreCommandMonitoringEvents-minItems.json rename to spec/unified-test-format/invalid/entity-client-ignoreCommandMonitoringEvents-minItems.json diff --git a/src/test/spec/json/unified-test-format/invalid/entity-client-ignoreCommandMonitoringEvents-minItems.yml b/spec/unified-test-format/invalid/entity-client-ignoreCommandMonitoringEvents-minItems.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/entity-client-ignoreCommandMonitoringEvents-minItems.yml rename to spec/unified-test-format/invalid/entity-client-ignoreCommandMonitoringEvents-minItems.yml diff --git a/src/test/spec/json/unified-test-format/invalid/entity-client-ignoreCommandMonitoringEvents-type.json b/spec/unified-test-format/invalid/entity-client-ignoreCommandMonitoringEvents-type.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/entity-client-ignoreCommandMonitoringEvents-type.json rename to spec/unified-test-format/invalid/entity-client-ignoreCommandMonitoringEvents-type.json diff --git a/src/test/spec/json/unified-test-format/invalid/entity-client-ignoreCommandMonitoringEvents-type.yml b/spec/unified-test-format/invalid/entity-client-ignoreCommandMonitoringEvents-type.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/entity-client-ignoreCommandMonitoringEvents-type.yml rename to spec/unified-test-format/invalid/entity-client-ignoreCommandMonitoringEvents-type.yml diff --git a/src/test/spec/json/unified-test-format/invalid/entity-client-observeEvents-enum.json b/spec/unified-test-format/invalid/entity-client-observeEvents-enum.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/entity-client-observeEvents-enum.json rename to spec/unified-test-format/invalid/entity-client-observeEvents-enum.json diff --git a/src/test/spec/json/unified-test-format/invalid/entity-client-observeEvents-enum.yml b/spec/unified-test-format/invalid/entity-client-observeEvents-enum.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/entity-client-observeEvents-enum.yml rename to spec/unified-test-format/invalid/entity-client-observeEvents-enum.yml diff --git a/src/test/spec/json/unified-test-format/invalid/entity-client-observeEvents-items.json b/spec/unified-test-format/invalid/entity-client-observeEvents-items.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/entity-client-observeEvents-items.json rename to spec/unified-test-format/invalid/entity-client-observeEvents-items.json diff --git a/src/test/spec/json/unified-test-format/invalid/entity-client-observeEvents-items.yml b/spec/unified-test-format/invalid/entity-client-observeEvents-items.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/entity-client-observeEvents-items.yml rename to spec/unified-test-format/invalid/entity-client-observeEvents-items.yml diff --git a/src/test/spec/json/unified-test-format/invalid/entity-client-observeEvents-minItems.json b/spec/unified-test-format/invalid/entity-client-observeEvents-minItems.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/entity-client-observeEvents-minItems.json rename to spec/unified-test-format/invalid/entity-client-observeEvents-minItems.json diff --git a/src/test/spec/json/unified-test-format/invalid/entity-client-observeEvents-minItems.yml b/spec/unified-test-format/invalid/entity-client-observeEvents-minItems.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/entity-client-observeEvents-minItems.yml rename to spec/unified-test-format/invalid/entity-client-observeEvents-minItems.yml diff --git a/src/test/spec/json/unified-test-format/invalid/entity-client-observeEvents-type.json b/spec/unified-test-format/invalid/entity-client-observeEvents-type.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/entity-client-observeEvents-type.json rename to spec/unified-test-format/invalid/entity-client-observeEvents-type.json diff --git a/src/test/spec/json/unified-test-format/invalid/entity-client-observeEvents-type.yml b/spec/unified-test-format/invalid/entity-client-observeEvents-type.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/entity-client-observeEvents-type.yml rename to spec/unified-test-format/invalid/entity-client-observeEvents-type.yml diff --git a/src/test/spec/json/unified-test-format/invalid/entity-client-observeLogMessages-minProperties.json b/spec/unified-test-format/invalid/entity-client-observeLogMessages-minProperties.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/entity-client-observeLogMessages-minProperties.json rename to spec/unified-test-format/invalid/entity-client-observeLogMessages-minProperties.json diff --git a/src/test/spec/json/unified-test-format/invalid/entity-client-observeLogMessages-minProperties.yml b/spec/unified-test-format/invalid/entity-client-observeLogMessages-minProperties.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/entity-client-observeLogMessages-minProperties.yml rename to spec/unified-test-format/invalid/entity-client-observeLogMessages-minProperties.yml diff --git a/src/test/spec/json/unified-test-format/invalid/entity-client-observeLogMessages-property-type.json b/spec/unified-test-format/invalid/entity-client-observeLogMessages-property-type.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/entity-client-observeLogMessages-property-type.json rename to spec/unified-test-format/invalid/entity-client-observeLogMessages-property-type.json diff --git a/src/test/spec/json/unified-test-format/invalid/entity-client-observeLogMessages-property-type.yml b/spec/unified-test-format/invalid/entity-client-observeLogMessages-property-type.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/entity-client-observeLogMessages-property-type.yml rename to spec/unified-test-format/invalid/entity-client-observeLogMessages-property-type.yml diff --git a/src/test/spec/json/unified-test-format/invalid/entity-client-observeLogMessages-property-value.json b/spec/unified-test-format/invalid/entity-client-observeLogMessages-property-value.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/entity-client-observeLogMessages-property-value.json rename to spec/unified-test-format/invalid/entity-client-observeLogMessages-property-value.json diff --git a/src/test/spec/json/unified-test-format/invalid/entity-client-observeLogMessages-property-value.yml b/spec/unified-test-format/invalid/entity-client-observeLogMessages-property-value.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/entity-client-observeLogMessages-property-value.yml rename to spec/unified-test-format/invalid/entity-client-observeLogMessages-property-value.yml diff --git a/src/test/spec/json/unified-test-format/invalid/entity-client-observeLogMessages-type.json b/spec/unified-test-format/invalid/entity-client-observeLogMessages-type.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/entity-client-observeLogMessages-type.json rename to spec/unified-test-format/invalid/entity-client-observeLogMessages-type.json diff --git a/src/test/spec/json/unified-test-format/invalid/entity-client-observeLogMessages-type.yml b/spec/unified-test-format/invalid/entity-client-observeLogMessages-type.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/entity-client-observeLogMessages-type.yml rename to spec/unified-test-format/invalid/entity-client-observeLogMessages-type.yml diff --git a/src/test/spec/json/unified-test-format/invalid/entity-client-observeSensitiveCommands-type.json b/spec/unified-test-format/invalid/entity-client-observeSensitiveCommands-type.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/entity-client-observeSensitiveCommands-type.json rename to spec/unified-test-format/invalid/entity-client-observeSensitiveCommands-type.json diff --git a/src/test/spec/json/unified-test-format/invalid/entity-client-observeSensitiveCommands-type.yml b/spec/unified-test-format/invalid/entity-client-observeSensitiveCommands-type.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/entity-client-observeSensitiveCommands-type.yml rename to spec/unified-test-format/invalid/entity-client-observeSensitiveCommands-type.yml diff --git a/src/test/spec/json/unified-test-format/invalid/entity-client-serverApi-deprecationErrors-type.json b/spec/unified-test-format/invalid/entity-client-serverApi-deprecationErrors-type.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/entity-client-serverApi-deprecationErrors-type.json rename to spec/unified-test-format/invalid/entity-client-serverApi-deprecationErrors-type.json diff --git a/src/test/spec/json/unified-test-format/invalid/entity-client-serverApi-deprecationErrors-type.yml b/spec/unified-test-format/invalid/entity-client-serverApi-deprecationErrors-type.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/entity-client-serverApi-deprecationErrors-type.yml rename to spec/unified-test-format/invalid/entity-client-serverApi-deprecationErrors-type.yml diff --git a/src/test/spec/json/unified-test-format/invalid/entity-client-serverApi-strict-type.json b/spec/unified-test-format/invalid/entity-client-serverApi-strict-type.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/entity-client-serverApi-strict-type.json rename to spec/unified-test-format/invalid/entity-client-serverApi-strict-type.json diff --git a/src/test/spec/json/unified-test-format/invalid/entity-client-serverApi-strict-type.yml b/spec/unified-test-format/invalid/entity-client-serverApi-strict-type.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/entity-client-serverApi-strict-type.yml rename to spec/unified-test-format/invalid/entity-client-serverApi-strict-type.yml diff --git a/src/test/spec/json/unified-test-format/invalid/entity-client-serverApi-type.json b/spec/unified-test-format/invalid/entity-client-serverApi-type.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/entity-client-serverApi-type.json rename to spec/unified-test-format/invalid/entity-client-serverApi-type.json diff --git a/src/test/spec/json/unified-test-format/invalid/entity-client-serverApi-type.yml b/spec/unified-test-format/invalid/entity-client-serverApi-type.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/entity-client-serverApi-type.yml rename to spec/unified-test-format/invalid/entity-client-serverApi-type.yml diff --git a/src/test/spec/json/unified-test-format/invalid/entity-client-serverApi-version-required.json b/spec/unified-test-format/invalid/entity-client-serverApi-version-required.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/entity-client-serverApi-version-required.json rename to spec/unified-test-format/invalid/entity-client-serverApi-version-required.json diff --git a/src/test/spec/json/unified-test-format/invalid/entity-client-serverApi-version-required.yml b/spec/unified-test-format/invalid/entity-client-serverApi-version-required.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/entity-client-serverApi-version-required.yml rename to spec/unified-test-format/invalid/entity-client-serverApi-version-required.yml diff --git a/src/test/spec/json/unified-test-format/invalid/entity-client-serverApi-version-type.json b/spec/unified-test-format/invalid/entity-client-serverApi-version-type.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/entity-client-serverApi-version-type.json rename to spec/unified-test-format/invalid/entity-client-serverApi-version-type.json diff --git a/src/test/spec/json/unified-test-format/invalid/entity-client-serverApi-version-type.yml b/spec/unified-test-format/invalid/entity-client-serverApi-version-type.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/entity-client-serverApi-version-type.yml rename to spec/unified-test-format/invalid/entity-client-serverApi-version-type.yml diff --git a/src/test/spec/json/unified-test-format/invalid/entity-client-uriOptions-type.json b/spec/unified-test-format/invalid/entity-client-uriOptions-type.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/entity-client-uriOptions-type.json rename to spec/unified-test-format/invalid/entity-client-uriOptions-type.json diff --git a/src/test/spec/json/unified-test-format/invalid/entity-client-uriOptions-type.yml b/spec/unified-test-format/invalid/entity-client-uriOptions-type.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/entity-client-uriOptions-type.yml rename to spec/unified-test-format/invalid/entity-client-uriOptions-type.yml diff --git a/src/test/spec/json/unified-test-format/invalid/entity-client-useMultipleMongoses-type.json b/spec/unified-test-format/invalid/entity-client-useMultipleMongoses-type.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/entity-client-useMultipleMongoses-type.json rename to spec/unified-test-format/invalid/entity-client-useMultipleMongoses-type.json diff --git a/src/test/spec/json/unified-test-format/invalid/entity-client-useMultipleMongoses-type.yml b/spec/unified-test-format/invalid/entity-client-useMultipleMongoses-type.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/entity-client-useMultipleMongoses-type.yml rename to spec/unified-test-format/invalid/entity-client-useMultipleMongoses-type.yml diff --git a/src/test/spec/json/unified-test-format/invalid/entity-clientEncryption-additionalProperties.json b/spec/unified-test-format/invalid/entity-clientEncryption-additionalProperties.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/entity-clientEncryption-additionalProperties.json rename to spec/unified-test-format/invalid/entity-clientEncryption-additionalProperties.json diff --git a/src/test/spec/json/unified-test-format/invalid/entity-clientEncryption-additionalProperties.yml b/spec/unified-test-format/invalid/entity-clientEncryption-additionalProperties.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/entity-clientEncryption-additionalProperties.yml rename to spec/unified-test-format/invalid/entity-clientEncryption-additionalProperties.yml diff --git a/src/test/spec/json/unified-test-format/invalid/entity-clientEncryption-clientEncryptionOpts-required.json b/spec/unified-test-format/invalid/entity-clientEncryption-clientEncryptionOpts-required.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/entity-clientEncryption-clientEncryptionOpts-required.json rename to spec/unified-test-format/invalid/entity-clientEncryption-clientEncryptionOpts-required.json diff --git a/src/test/spec/json/unified-test-format/invalid/entity-clientEncryption-clientEncryptionOpts-required.yml b/spec/unified-test-format/invalid/entity-clientEncryption-clientEncryptionOpts-required.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/entity-clientEncryption-clientEncryptionOpts-required.yml rename to spec/unified-test-format/invalid/entity-clientEncryption-clientEncryptionOpts-required.yml diff --git a/src/test/spec/json/unified-test-format/invalid/entity-clientEncryption-clientEncryptionOpts-type.json b/spec/unified-test-format/invalid/entity-clientEncryption-clientEncryptionOpts-type.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/entity-clientEncryption-clientEncryptionOpts-type.json rename to spec/unified-test-format/invalid/entity-clientEncryption-clientEncryptionOpts-type.json diff --git a/src/test/spec/json/unified-test-format/invalid/entity-clientEncryption-clientEncryptionOpts-type.yml b/spec/unified-test-format/invalid/entity-clientEncryption-clientEncryptionOpts-type.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/entity-clientEncryption-clientEncryptionOpts-type.yml rename to spec/unified-test-format/invalid/entity-clientEncryption-clientEncryptionOpts-type.yml diff --git a/src/test/spec/json/unified-test-format/invalid/entity-clientEncryption-id-required.json b/spec/unified-test-format/invalid/entity-clientEncryption-id-required.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/entity-clientEncryption-id-required.json rename to spec/unified-test-format/invalid/entity-clientEncryption-id-required.json diff --git a/src/test/spec/json/unified-test-format/invalid/entity-clientEncryption-id-required.yml b/spec/unified-test-format/invalid/entity-clientEncryption-id-required.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/entity-clientEncryption-id-required.yml rename to spec/unified-test-format/invalid/entity-clientEncryption-id-required.yml diff --git a/src/test/spec/json/unified-test-format/invalid/entity-clientEncryption-id-type.json b/spec/unified-test-format/invalid/entity-clientEncryption-id-type.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/entity-clientEncryption-id-type.json rename to spec/unified-test-format/invalid/entity-clientEncryption-id-type.json diff --git a/src/test/spec/json/unified-test-format/invalid/entity-clientEncryption-id-type.yml b/spec/unified-test-format/invalid/entity-clientEncryption-id-type.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/entity-clientEncryption-id-type.yml rename to spec/unified-test-format/invalid/entity-clientEncryption-id-type.yml diff --git a/src/test/spec/json/unified-test-format/invalid/entity-collection-additionalProperties.json b/spec/unified-test-format/invalid/entity-collection-additionalProperties.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/entity-collection-additionalProperties.json rename to spec/unified-test-format/invalid/entity-collection-additionalProperties.json diff --git a/src/test/spec/json/unified-test-format/invalid/entity-collection-additionalProperties.yml b/spec/unified-test-format/invalid/entity-collection-additionalProperties.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/entity-collection-additionalProperties.yml rename to spec/unified-test-format/invalid/entity-collection-additionalProperties.yml diff --git a/src/test/spec/json/unified-test-format/invalid/entity-collection-collectionName-required.json b/spec/unified-test-format/invalid/entity-collection-collectionName-required.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/entity-collection-collectionName-required.json rename to spec/unified-test-format/invalid/entity-collection-collectionName-required.json diff --git a/src/test/spec/json/unified-test-format/invalid/entity-collection-collectionName-required.yml b/spec/unified-test-format/invalid/entity-collection-collectionName-required.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/entity-collection-collectionName-required.yml rename to spec/unified-test-format/invalid/entity-collection-collectionName-required.yml diff --git a/src/test/spec/json/unified-test-format/invalid/entity-collection-collectionName-type.json b/spec/unified-test-format/invalid/entity-collection-collectionName-type.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/entity-collection-collectionName-type.json rename to spec/unified-test-format/invalid/entity-collection-collectionName-type.json diff --git a/src/test/spec/json/unified-test-format/invalid/entity-collection-collectionName-type.yml b/spec/unified-test-format/invalid/entity-collection-collectionName-type.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/entity-collection-collectionName-type.yml rename to spec/unified-test-format/invalid/entity-collection-collectionName-type.yml diff --git a/src/test/spec/json/unified-test-format/invalid/entity-collection-collectionOptions-type.json b/spec/unified-test-format/invalid/entity-collection-collectionOptions-type.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/entity-collection-collectionOptions-type.json rename to spec/unified-test-format/invalid/entity-collection-collectionOptions-type.json diff --git a/src/test/spec/json/unified-test-format/invalid/entity-collection-collectionOptions-type.yml b/spec/unified-test-format/invalid/entity-collection-collectionOptions-type.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/entity-collection-collectionOptions-type.yml rename to spec/unified-test-format/invalid/entity-collection-collectionOptions-type.yml diff --git a/src/test/spec/json/unified-test-format/invalid/entity-collection-database-required.json b/spec/unified-test-format/invalid/entity-collection-database-required.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/entity-collection-database-required.json rename to spec/unified-test-format/invalid/entity-collection-database-required.json diff --git a/src/test/spec/json/unified-test-format/invalid/entity-collection-database-required.yml b/spec/unified-test-format/invalid/entity-collection-database-required.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/entity-collection-database-required.yml rename to spec/unified-test-format/invalid/entity-collection-database-required.yml diff --git a/src/test/spec/json/unified-test-format/invalid/entity-collection-database-type.json b/spec/unified-test-format/invalid/entity-collection-database-type.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/entity-collection-database-type.json rename to spec/unified-test-format/invalid/entity-collection-database-type.json diff --git a/src/test/spec/json/unified-test-format/invalid/entity-collection-database-type.yml b/spec/unified-test-format/invalid/entity-collection-database-type.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/entity-collection-database-type.yml rename to spec/unified-test-format/invalid/entity-collection-database-type.yml diff --git a/src/test/spec/json/unified-test-format/invalid/entity-collection-id-required.json b/spec/unified-test-format/invalid/entity-collection-id-required.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/entity-collection-id-required.json rename to spec/unified-test-format/invalid/entity-collection-id-required.json diff --git a/src/test/spec/json/unified-test-format/invalid/entity-collection-id-required.yml b/spec/unified-test-format/invalid/entity-collection-id-required.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/entity-collection-id-required.yml rename to spec/unified-test-format/invalid/entity-collection-id-required.yml diff --git a/src/test/spec/json/unified-test-format/invalid/entity-collection-id-type.json b/spec/unified-test-format/invalid/entity-collection-id-type.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/entity-collection-id-type.json rename to spec/unified-test-format/invalid/entity-collection-id-type.json diff --git a/src/test/spec/json/unified-test-format/invalid/entity-collection-id-type.yml b/spec/unified-test-format/invalid/entity-collection-id-type.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/entity-collection-id-type.yml rename to spec/unified-test-format/invalid/entity-collection-id-type.yml diff --git a/src/test/spec/json/unified-test-format/invalid/entity-database-additionalProperties.json b/spec/unified-test-format/invalid/entity-database-additionalProperties.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/entity-database-additionalProperties.json rename to spec/unified-test-format/invalid/entity-database-additionalProperties.json diff --git a/src/test/spec/json/unified-test-format/invalid/entity-database-additionalProperties.yml b/spec/unified-test-format/invalid/entity-database-additionalProperties.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/entity-database-additionalProperties.yml rename to spec/unified-test-format/invalid/entity-database-additionalProperties.yml diff --git a/src/test/spec/json/unified-test-format/invalid/entity-database-client-required.json b/spec/unified-test-format/invalid/entity-database-client-required.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/entity-database-client-required.json rename to spec/unified-test-format/invalid/entity-database-client-required.json diff --git a/src/test/spec/json/unified-test-format/invalid/entity-database-client-required.yml b/spec/unified-test-format/invalid/entity-database-client-required.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/entity-database-client-required.yml rename to spec/unified-test-format/invalid/entity-database-client-required.yml diff --git a/src/test/spec/json/unified-test-format/invalid/entity-database-client-type.json b/spec/unified-test-format/invalid/entity-database-client-type.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/entity-database-client-type.json rename to spec/unified-test-format/invalid/entity-database-client-type.json diff --git a/src/test/spec/json/unified-test-format/invalid/entity-database-client-type.yml b/spec/unified-test-format/invalid/entity-database-client-type.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/entity-database-client-type.yml rename to spec/unified-test-format/invalid/entity-database-client-type.yml diff --git a/src/test/spec/json/unified-test-format/invalid/entity-database-databaseName-required.json b/spec/unified-test-format/invalid/entity-database-databaseName-required.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/entity-database-databaseName-required.json rename to spec/unified-test-format/invalid/entity-database-databaseName-required.json diff --git a/src/test/spec/json/unified-test-format/invalid/entity-database-databaseName-required.yml b/spec/unified-test-format/invalid/entity-database-databaseName-required.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/entity-database-databaseName-required.yml rename to spec/unified-test-format/invalid/entity-database-databaseName-required.yml diff --git a/src/test/spec/json/unified-test-format/invalid/entity-database-databaseName-type.json b/spec/unified-test-format/invalid/entity-database-databaseName-type.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/entity-database-databaseName-type.json rename to spec/unified-test-format/invalid/entity-database-databaseName-type.json diff --git a/src/test/spec/json/unified-test-format/invalid/entity-database-databaseName-type.yml b/spec/unified-test-format/invalid/entity-database-databaseName-type.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/entity-database-databaseName-type.yml rename to spec/unified-test-format/invalid/entity-database-databaseName-type.yml diff --git a/src/test/spec/json/unified-test-format/invalid/entity-database-databaseOptions-type.json b/spec/unified-test-format/invalid/entity-database-databaseOptions-type.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/entity-database-databaseOptions-type.json rename to spec/unified-test-format/invalid/entity-database-databaseOptions-type.json diff --git a/src/test/spec/json/unified-test-format/invalid/entity-database-databaseOptions-type.yml b/spec/unified-test-format/invalid/entity-database-databaseOptions-type.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/entity-database-databaseOptions-type.yml rename to spec/unified-test-format/invalid/entity-database-databaseOptions-type.yml diff --git a/src/test/spec/json/unified-test-format/invalid/entity-database-id-required.json b/spec/unified-test-format/invalid/entity-database-id-required.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/entity-database-id-required.json rename to spec/unified-test-format/invalid/entity-database-id-required.json diff --git a/src/test/spec/json/unified-test-format/invalid/entity-database-id-required.yml b/spec/unified-test-format/invalid/entity-database-id-required.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/entity-database-id-required.yml rename to spec/unified-test-format/invalid/entity-database-id-required.yml diff --git a/src/test/spec/json/unified-test-format/invalid/entity-database-id-type.json b/spec/unified-test-format/invalid/entity-database-id-type.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/entity-database-id-type.json rename to spec/unified-test-format/invalid/entity-database-id-type.json diff --git a/src/test/spec/json/unified-test-format/invalid/entity-database-id-type.yml b/spec/unified-test-format/invalid/entity-database-id-type.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/entity-database-id-type.yml rename to spec/unified-test-format/invalid/entity-database-id-type.yml diff --git a/src/test/spec/json/unified-test-format/invalid/entity-maxProperties.json b/spec/unified-test-format/invalid/entity-maxProperties.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/entity-maxProperties.json rename to spec/unified-test-format/invalid/entity-maxProperties.json diff --git a/src/test/spec/json/unified-test-format/invalid/entity-maxProperties.yml b/spec/unified-test-format/invalid/entity-maxProperties.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/entity-maxProperties.yml rename to spec/unified-test-format/invalid/entity-maxProperties.yml diff --git a/src/test/spec/json/unified-test-format/invalid/entity-minProperties.json b/spec/unified-test-format/invalid/entity-minProperties.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/entity-minProperties.json rename to spec/unified-test-format/invalid/entity-minProperties.json diff --git a/src/test/spec/json/unified-test-format/invalid/entity-minProperties.yml b/spec/unified-test-format/invalid/entity-minProperties.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/entity-minProperties.yml rename to spec/unified-test-format/invalid/entity-minProperties.yml diff --git a/src/test/spec/json/unified-test-format/invalid/entity-session-additionalProperties.json b/spec/unified-test-format/invalid/entity-session-additionalProperties.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/entity-session-additionalProperties.json rename to spec/unified-test-format/invalid/entity-session-additionalProperties.json diff --git a/src/test/spec/json/unified-test-format/invalid/entity-session-additionalProperties.yml b/spec/unified-test-format/invalid/entity-session-additionalProperties.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/entity-session-additionalProperties.yml rename to spec/unified-test-format/invalid/entity-session-additionalProperties.yml diff --git a/src/test/spec/json/unified-test-format/invalid/entity-session-client-required.json b/spec/unified-test-format/invalid/entity-session-client-required.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/entity-session-client-required.json rename to spec/unified-test-format/invalid/entity-session-client-required.json diff --git a/src/test/spec/json/unified-test-format/invalid/entity-session-client-required.yml b/spec/unified-test-format/invalid/entity-session-client-required.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/entity-session-client-required.yml rename to spec/unified-test-format/invalid/entity-session-client-required.yml diff --git a/src/test/spec/json/unified-test-format/invalid/entity-session-client-type.json b/spec/unified-test-format/invalid/entity-session-client-type.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/entity-session-client-type.json rename to spec/unified-test-format/invalid/entity-session-client-type.json diff --git a/src/test/spec/json/unified-test-format/invalid/entity-session-client-type.yml b/spec/unified-test-format/invalid/entity-session-client-type.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/entity-session-client-type.yml rename to spec/unified-test-format/invalid/entity-session-client-type.yml diff --git a/src/test/spec/json/unified-test-format/invalid/entity-session-id-required.json b/spec/unified-test-format/invalid/entity-session-id-required.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/entity-session-id-required.json rename to spec/unified-test-format/invalid/entity-session-id-required.json diff --git a/src/test/spec/json/unified-test-format/invalid/entity-session-id-required.yml b/spec/unified-test-format/invalid/entity-session-id-required.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/entity-session-id-required.yml rename to spec/unified-test-format/invalid/entity-session-id-required.yml diff --git a/src/test/spec/json/unified-test-format/invalid/entity-session-id-type.json b/spec/unified-test-format/invalid/entity-session-id-type.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/entity-session-id-type.json rename to spec/unified-test-format/invalid/entity-session-id-type.json diff --git a/src/test/spec/json/unified-test-format/invalid/entity-session-id-type.yml b/spec/unified-test-format/invalid/entity-session-id-type.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/entity-session-id-type.yml rename to spec/unified-test-format/invalid/entity-session-id-type.yml diff --git a/src/test/spec/json/unified-test-format/invalid/entity-session-sessionOptions-type.json b/spec/unified-test-format/invalid/entity-session-sessionOptions-type.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/entity-session-sessionOptions-type.json rename to spec/unified-test-format/invalid/entity-session-sessionOptions-type.json diff --git a/src/test/spec/json/unified-test-format/invalid/entity-session-sessionOptions-type.yml b/spec/unified-test-format/invalid/entity-session-sessionOptions-type.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/entity-session-sessionOptions-type.yml rename to spec/unified-test-format/invalid/entity-session-sessionOptions-type.yml diff --git a/src/test/spec/json/unified-test-format/invalid/entity-stream-additionalProperties.json b/spec/unified-test-format/invalid/entity-stream-additionalProperties.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/entity-stream-additionalProperties.json rename to spec/unified-test-format/invalid/entity-stream-additionalProperties.json diff --git a/src/test/spec/json/unified-test-format/invalid/entity-stream-additionalProperties.yml b/spec/unified-test-format/invalid/entity-stream-additionalProperties.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/entity-stream-additionalProperties.yml rename to spec/unified-test-format/invalid/entity-stream-additionalProperties.yml diff --git a/src/test/spec/json/unified-test-format/invalid/entity-stream-hexBytes-pattern.json b/spec/unified-test-format/invalid/entity-stream-hexBytes-pattern.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/entity-stream-hexBytes-pattern.json rename to spec/unified-test-format/invalid/entity-stream-hexBytes-pattern.json diff --git a/src/test/spec/json/unified-test-format/invalid/entity-stream-hexBytes-pattern.yml b/spec/unified-test-format/invalid/entity-stream-hexBytes-pattern.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/entity-stream-hexBytes-pattern.yml rename to spec/unified-test-format/invalid/entity-stream-hexBytes-pattern.yml diff --git a/src/test/spec/json/unified-test-format/invalid/entity-stream-hexBytes-required.json b/spec/unified-test-format/invalid/entity-stream-hexBytes-required.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/entity-stream-hexBytes-required.json rename to spec/unified-test-format/invalid/entity-stream-hexBytes-required.json diff --git a/src/test/spec/json/unified-test-format/invalid/entity-stream-hexBytes-required.yml b/spec/unified-test-format/invalid/entity-stream-hexBytes-required.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/entity-stream-hexBytes-required.yml rename to spec/unified-test-format/invalid/entity-stream-hexBytes-required.yml diff --git a/src/test/spec/json/unified-test-format/invalid/entity-stream-hexBytes-type.json b/spec/unified-test-format/invalid/entity-stream-hexBytes-type.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/entity-stream-hexBytes-type.json rename to spec/unified-test-format/invalid/entity-stream-hexBytes-type.json diff --git a/src/test/spec/json/unified-test-format/invalid/entity-stream-hexBytes-type.yml b/spec/unified-test-format/invalid/entity-stream-hexBytes-type.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/entity-stream-hexBytes-type.yml rename to spec/unified-test-format/invalid/entity-stream-hexBytes-type.yml diff --git a/src/test/spec/json/unified-test-format/invalid/entity-stream-id-required.json b/spec/unified-test-format/invalid/entity-stream-id-required.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/entity-stream-id-required.json rename to spec/unified-test-format/invalid/entity-stream-id-required.json diff --git a/src/test/spec/json/unified-test-format/invalid/entity-stream-id-required.yml b/spec/unified-test-format/invalid/entity-stream-id-required.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/entity-stream-id-required.yml rename to spec/unified-test-format/invalid/entity-stream-id-required.yml diff --git a/src/test/spec/json/unified-test-format/invalid/entity-stream-id-type.json b/spec/unified-test-format/invalid/entity-stream-id-type.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/entity-stream-id-type.json rename to spec/unified-test-format/invalid/entity-stream-id-type.json diff --git a/src/test/spec/json/unified-test-format/invalid/entity-stream-id-type.yml b/spec/unified-test-format/invalid/entity-stream-id-type.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/entity-stream-id-type.yml rename to spec/unified-test-format/invalid/entity-stream-id-type.yml diff --git a/src/test/spec/json/unified-test-format/invalid/entity-thread-additionalProperties.json b/spec/unified-test-format/invalid/entity-thread-additionalProperties.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/entity-thread-additionalProperties.json rename to spec/unified-test-format/invalid/entity-thread-additionalProperties.json diff --git a/src/test/spec/json/unified-test-format/invalid/entity-thread-additionalProperties.yml b/spec/unified-test-format/invalid/entity-thread-additionalProperties.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/entity-thread-additionalProperties.yml rename to spec/unified-test-format/invalid/entity-thread-additionalProperties.yml diff --git a/src/test/spec/json/unified-test-format/invalid/entity-thread-id-required.json b/spec/unified-test-format/invalid/entity-thread-id-required.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/entity-thread-id-required.json rename to spec/unified-test-format/invalid/entity-thread-id-required.json diff --git a/src/test/spec/json/unified-test-format/invalid/entity-thread-id-required.yml b/spec/unified-test-format/invalid/entity-thread-id-required.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/entity-thread-id-required.yml rename to spec/unified-test-format/invalid/entity-thread-id-required.yml diff --git a/src/test/spec/json/unified-test-format/invalid/entity-thread-id-type.json b/spec/unified-test-format/invalid/entity-thread-id-type.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/entity-thread-id-type.json rename to spec/unified-test-format/invalid/entity-thread-id-type.json diff --git a/src/test/spec/json/unified-test-format/invalid/entity-thread-id-type.yml b/spec/unified-test-format/invalid/entity-thread-id-type.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/entity-thread-id-type.yml rename to spec/unified-test-format/invalid/entity-thread-id-type.yml diff --git a/src/test/spec/json/unified-test-format/invalid/expectedCmapEvent-connectionCheckOutFailedEvent-reason-type.json b/spec/unified-test-format/invalid/expectedCmapEvent-connectionCheckOutFailedEvent-reason-type.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedCmapEvent-connectionCheckOutFailedEvent-reason-type.json rename to spec/unified-test-format/invalid/expectedCmapEvent-connectionCheckOutFailedEvent-reason-type.json diff --git a/src/test/spec/json/unified-test-format/invalid/expectedCmapEvent-connectionCheckOutFailedEvent-reason-type.yml b/spec/unified-test-format/invalid/expectedCmapEvent-connectionCheckOutFailedEvent-reason-type.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedCmapEvent-connectionCheckOutFailedEvent-reason-type.yml rename to spec/unified-test-format/invalid/expectedCmapEvent-connectionCheckOutFailedEvent-reason-type.yml diff --git a/src/test/spec/json/unified-test-format/invalid/expectedCmapEvent-connectionCheckOutStartedEvent-additionalProperties.json b/spec/unified-test-format/invalid/expectedCmapEvent-connectionCheckOutStartedEvent-additionalProperties.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedCmapEvent-connectionCheckOutStartedEvent-additionalProperties.json rename to spec/unified-test-format/invalid/expectedCmapEvent-connectionCheckOutStartedEvent-additionalProperties.json diff --git a/src/test/spec/json/unified-test-format/invalid/expectedCmapEvent-connectionCheckOutStartedEvent-additionalProperties.yml b/spec/unified-test-format/invalid/expectedCmapEvent-connectionCheckOutStartedEvent-additionalProperties.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedCmapEvent-connectionCheckOutStartedEvent-additionalProperties.yml rename to spec/unified-test-format/invalid/expectedCmapEvent-connectionCheckOutStartedEvent-additionalProperties.yml diff --git a/src/test/spec/json/unified-test-format/invalid/expectedCmapEvent-connectionCheckedInEvent-additionalProperties.json b/spec/unified-test-format/invalid/expectedCmapEvent-connectionCheckedInEvent-additionalProperties.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedCmapEvent-connectionCheckedInEvent-additionalProperties.json rename to spec/unified-test-format/invalid/expectedCmapEvent-connectionCheckedInEvent-additionalProperties.json diff --git a/src/test/spec/json/unified-test-format/invalid/expectedCmapEvent-connectionCheckedInEvent-additionalProperties.yml b/spec/unified-test-format/invalid/expectedCmapEvent-connectionCheckedInEvent-additionalProperties.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedCmapEvent-connectionCheckedInEvent-additionalProperties.yml rename to spec/unified-test-format/invalid/expectedCmapEvent-connectionCheckedInEvent-additionalProperties.yml diff --git a/src/test/spec/json/unified-test-format/invalid/expectedCmapEvent-connectionCheckedOutEvent-additionalProperties.json b/spec/unified-test-format/invalid/expectedCmapEvent-connectionCheckedOutEvent-additionalProperties.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedCmapEvent-connectionCheckedOutEvent-additionalProperties.json rename to spec/unified-test-format/invalid/expectedCmapEvent-connectionCheckedOutEvent-additionalProperties.json diff --git a/src/test/spec/json/unified-test-format/invalid/expectedCmapEvent-connectionCheckedOutEvent-additionalProperties.yml b/spec/unified-test-format/invalid/expectedCmapEvent-connectionCheckedOutEvent-additionalProperties.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedCmapEvent-connectionCheckedOutEvent-additionalProperties.yml rename to spec/unified-test-format/invalid/expectedCmapEvent-connectionCheckedOutEvent-additionalProperties.yml diff --git a/src/test/spec/json/unified-test-format/invalid/expectedCmapEvent-connectionClosedEvent-reason-type.json b/spec/unified-test-format/invalid/expectedCmapEvent-connectionClosedEvent-reason-type.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedCmapEvent-connectionClosedEvent-reason-type.json rename to spec/unified-test-format/invalid/expectedCmapEvent-connectionClosedEvent-reason-type.json diff --git a/src/test/spec/json/unified-test-format/invalid/expectedCmapEvent-connectionClosedEvent-reason-type.yml b/spec/unified-test-format/invalid/expectedCmapEvent-connectionClosedEvent-reason-type.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedCmapEvent-connectionClosedEvent-reason-type.yml rename to spec/unified-test-format/invalid/expectedCmapEvent-connectionClosedEvent-reason-type.yml diff --git a/src/test/spec/json/unified-test-format/invalid/expectedCmapEvent-connectionCreatedEvent-additionalProperties.json b/spec/unified-test-format/invalid/expectedCmapEvent-connectionCreatedEvent-additionalProperties.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedCmapEvent-connectionCreatedEvent-additionalProperties.json rename to spec/unified-test-format/invalid/expectedCmapEvent-connectionCreatedEvent-additionalProperties.json diff --git a/src/test/spec/json/unified-test-format/invalid/expectedCmapEvent-connectionCreatedEvent-additionalProperties.yml b/spec/unified-test-format/invalid/expectedCmapEvent-connectionCreatedEvent-additionalProperties.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedCmapEvent-connectionCreatedEvent-additionalProperties.yml rename to spec/unified-test-format/invalid/expectedCmapEvent-connectionCreatedEvent-additionalProperties.yml diff --git a/src/test/spec/json/unified-test-format/invalid/expectedCmapEvent-connectionReadyEvent-additionalProperties.json b/spec/unified-test-format/invalid/expectedCmapEvent-connectionReadyEvent-additionalProperties.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedCmapEvent-connectionReadyEvent-additionalProperties.json rename to spec/unified-test-format/invalid/expectedCmapEvent-connectionReadyEvent-additionalProperties.json diff --git a/src/test/spec/json/unified-test-format/invalid/expectedCmapEvent-connectionReadyEvent-additionalProperties.yml b/spec/unified-test-format/invalid/expectedCmapEvent-connectionReadyEvent-additionalProperties.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedCmapEvent-connectionReadyEvent-additionalProperties.yml rename to spec/unified-test-format/invalid/expectedCmapEvent-connectionReadyEvent-additionalProperties.yml diff --git a/src/test/spec/json/unified-test-format/invalid/expectedCmapEvent-poolClearedEvent-hasServiceId-type.json b/spec/unified-test-format/invalid/expectedCmapEvent-poolClearedEvent-hasServiceId-type.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedCmapEvent-poolClearedEvent-hasServiceId-type.json rename to spec/unified-test-format/invalid/expectedCmapEvent-poolClearedEvent-hasServiceId-type.json diff --git a/src/test/spec/json/unified-test-format/invalid/expectedCmapEvent-poolClearedEvent-hasServiceId-type.yml b/spec/unified-test-format/invalid/expectedCmapEvent-poolClearedEvent-hasServiceId-type.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedCmapEvent-poolClearedEvent-hasServiceId-type.yml rename to spec/unified-test-format/invalid/expectedCmapEvent-poolClearedEvent-hasServiceId-type.yml diff --git a/src/test/spec/json/unified-test-format/invalid/expectedCmapEvent-poolClearedEvent-interruptInUseConnections-type.json b/spec/unified-test-format/invalid/expectedCmapEvent-poolClearedEvent-interruptInUseConnections-type.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedCmapEvent-poolClearedEvent-interruptInUseConnections-type.json rename to spec/unified-test-format/invalid/expectedCmapEvent-poolClearedEvent-interruptInUseConnections-type.json diff --git a/src/test/spec/json/unified-test-format/invalid/expectedCmapEvent-poolClearedEvent-interruptInUseConnections-type.yml b/spec/unified-test-format/invalid/expectedCmapEvent-poolClearedEvent-interruptInUseConnections-type.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedCmapEvent-poolClearedEvent-interruptInUseConnections-type.yml rename to spec/unified-test-format/invalid/expectedCmapEvent-poolClearedEvent-interruptInUseConnections-type.yml diff --git a/src/test/spec/json/unified-test-format/invalid/expectedCmapEvent-poolClosedEvent-additionalProperties.json b/spec/unified-test-format/invalid/expectedCmapEvent-poolClosedEvent-additionalProperties.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedCmapEvent-poolClosedEvent-additionalProperties.json rename to spec/unified-test-format/invalid/expectedCmapEvent-poolClosedEvent-additionalProperties.json diff --git a/src/test/spec/json/unified-test-format/invalid/expectedCmapEvent-poolClosedEvent-additionalProperties.yml b/spec/unified-test-format/invalid/expectedCmapEvent-poolClosedEvent-additionalProperties.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedCmapEvent-poolClosedEvent-additionalProperties.yml rename to spec/unified-test-format/invalid/expectedCmapEvent-poolClosedEvent-additionalProperties.yml diff --git a/src/test/spec/json/unified-test-format/invalid/expectedCmapEvent-poolCreatedEvent-additionalProperties.json b/spec/unified-test-format/invalid/expectedCmapEvent-poolCreatedEvent-additionalProperties.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedCmapEvent-poolCreatedEvent-additionalProperties.json rename to spec/unified-test-format/invalid/expectedCmapEvent-poolCreatedEvent-additionalProperties.json diff --git a/src/test/spec/json/unified-test-format/invalid/expectedCmapEvent-poolCreatedEvent-additionalProperties.yml b/spec/unified-test-format/invalid/expectedCmapEvent-poolCreatedEvent-additionalProperties.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedCmapEvent-poolCreatedEvent-additionalProperties.yml rename to spec/unified-test-format/invalid/expectedCmapEvent-poolCreatedEvent-additionalProperties.yml diff --git a/src/test/spec/json/unified-test-format/invalid/expectedCmapEvent-poolReadyEvent-additionalProperties.json b/spec/unified-test-format/invalid/expectedCmapEvent-poolReadyEvent-additionalProperties.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedCmapEvent-poolReadyEvent-additionalProperties.json rename to spec/unified-test-format/invalid/expectedCmapEvent-poolReadyEvent-additionalProperties.json diff --git a/src/test/spec/json/unified-test-format/invalid/expectedCmapEvent-poolReadyEvent-additionalProperties.yml b/spec/unified-test-format/invalid/expectedCmapEvent-poolReadyEvent-additionalProperties.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedCmapEvent-poolReadyEvent-additionalProperties.yml rename to spec/unified-test-format/invalid/expectedCmapEvent-poolReadyEvent-additionalProperties.yml diff --git a/src/test/spec/json/unified-test-format/invalid/expectedCommandEvent-additionalProperties.json b/spec/unified-test-format/invalid/expectedCommandEvent-additionalProperties.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedCommandEvent-additionalProperties.json rename to spec/unified-test-format/invalid/expectedCommandEvent-additionalProperties.json diff --git a/src/test/spec/json/unified-test-format/invalid/expectedCommandEvent-additionalProperties.yml b/spec/unified-test-format/invalid/expectedCommandEvent-additionalProperties.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedCommandEvent-additionalProperties.yml rename to spec/unified-test-format/invalid/expectedCommandEvent-additionalProperties.yml diff --git a/src/test/spec/json/unified-test-format/invalid/expectedCommandEvent-commandFailedEvent-commandName-type.json b/spec/unified-test-format/invalid/expectedCommandEvent-commandFailedEvent-commandName-type.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedCommandEvent-commandFailedEvent-commandName-type.json rename to spec/unified-test-format/invalid/expectedCommandEvent-commandFailedEvent-commandName-type.json diff --git a/src/test/spec/json/unified-test-format/invalid/expectedCommandEvent-commandFailedEvent-commandName-type.yml b/spec/unified-test-format/invalid/expectedCommandEvent-commandFailedEvent-commandName-type.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedCommandEvent-commandFailedEvent-commandName-type.yml rename to spec/unified-test-format/invalid/expectedCommandEvent-commandFailedEvent-commandName-type.yml diff --git a/src/test/spec/json/unified-test-format/invalid/expectedCommandEvent-commandFailedEvent-databaseName-type.json b/spec/unified-test-format/invalid/expectedCommandEvent-commandFailedEvent-databaseName-type.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedCommandEvent-commandFailedEvent-databaseName-type.json rename to spec/unified-test-format/invalid/expectedCommandEvent-commandFailedEvent-databaseName-type.json diff --git a/src/test/spec/json/unified-test-format/invalid/expectedCommandEvent-commandFailedEvent-databaseName-type.yml b/spec/unified-test-format/invalid/expectedCommandEvent-commandFailedEvent-databaseName-type.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedCommandEvent-commandFailedEvent-databaseName-type.yml rename to spec/unified-test-format/invalid/expectedCommandEvent-commandFailedEvent-databaseName-type.yml diff --git a/src/test/spec/json/unified-test-format/invalid/expectedCommandEvent-commandFailedEvent-hasServerConnectionId-type.json b/spec/unified-test-format/invalid/expectedCommandEvent-commandFailedEvent-hasServerConnectionId-type.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedCommandEvent-commandFailedEvent-hasServerConnectionId-type.json rename to spec/unified-test-format/invalid/expectedCommandEvent-commandFailedEvent-hasServerConnectionId-type.json diff --git a/src/test/spec/json/unified-test-format/invalid/expectedCommandEvent-commandFailedEvent-hasServerConnectionId-type.yml b/spec/unified-test-format/invalid/expectedCommandEvent-commandFailedEvent-hasServerConnectionId-type.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedCommandEvent-commandFailedEvent-hasServerConnectionId-type.yml rename to spec/unified-test-format/invalid/expectedCommandEvent-commandFailedEvent-hasServerConnectionId-type.yml diff --git a/src/test/spec/json/unified-test-format/invalid/expectedCommandEvent-commandFailedEvent-hasServiceId-type.json b/spec/unified-test-format/invalid/expectedCommandEvent-commandFailedEvent-hasServiceId-type.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedCommandEvent-commandFailedEvent-hasServiceId-type.json rename to spec/unified-test-format/invalid/expectedCommandEvent-commandFailedEvent-hasServiceId-type.json diff --git a/src/test/spec/json/unified-test-format/invalid/expectedCommandEvent-commandFailedEvent-hasServiceId-type.yml b/spec/unified-test-format/invalid/expectedCommandEvent-commandFailedEvent-hasServiceId-type.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedCommandEvent-commandFailedEvent-hasServiceId-type.yml rename to spec/unified-test-format/invalid/expectedCommandEvent-commandFailedEvent-hasServiceId-type.yml diff --git a/src/test/spec/json/unified-test-format/invalid/expectedCommandEvent-commandStartedEvent-additionalProperties.json b/spec/unified-test-format/invalid/expectedCommandEvent-commandStartedEvent-additionalProperties.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedCommandEvent-commandStartedEvent-additionalProperties.json rename to spec/unified-test-format/invalid/expectedCommandEvent-commandStartedEvent-additionalProperties.json diff --git a/src/test/spec/json/unified-test-format/invalid/expectedCommandEvent-commandStartedEvent-additionalProperties.yml b/spec/unified-test-format/invalid/expectedCommandEvent-commandStartedEvent-additionalProperties.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedCommandEvent-commandStartedEvent-additionalProperties.yml rename to spec/unified-test-format/invalid/expectedCommandEvent-commandStartedEvent-additionalProperties.yml diff --git a/src/test/spec/json/unified-test-format/invalid/expectedCommandEvent-commandStartedEvent-command-type.json b/spec/unified-test-format/invalid/expectedCommandEvent-commandStartedEvent-command-type.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedCommandEvent-commandStartedEvent-command-type.json rename to spec/unified-test-format/invalid/expectedCommandEvent-commandStartedEvent-command-type.json diff --git a/src/test/spec/json/unified-test-format/invalid/expectedCommandEvent-commandStartedEvent-command-type.yml b/spec/unified-test-format/invalid/expectedCommandEvent-commandStartedEvent-command-type.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedCommandEvent-commandStartedEvent-command-type.yml rename to spec/unified-test-format/invalid/expectedCommandEvent-commandStartedEvent-command-type.yml diff --git a/src/test/spec/json/unified-test-format/invalid/expectedCommandEvent-commandStartedEvent-commandName-type.json b/spec/unified-test-format/invalid/expectedCommandEvent-commandStartedEvent-commandName-type.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedCommandEvent-commandStartedEvent-commandName-type.json rename to spec/unified-test-format/invalid/expectedCommandEvent-commandStartedEvent-commandName-type.json diff --git a/src/test/spec/json/unified-test-format/invalid/expectedCommandEvent-commandStartedEvent-commandName-type.yml b/spec/unified-test-format/invalid/expectedCommandEvent-commandStartedEvent-commandName-type.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedCommandEvent-commandStartedEvent-commandName-type.yml rename to spec/unified-test-format/invalid/expectedCommandEvent-commandStartedEvent-commandName-type.yml diff --git a/src/test/spec/json/unified-test-format/invalid/expectedCommandEvent-commandStartedEvent-databaseName-type.json b/spec/unified-test-format/invalid/expectedCommandEvent-commandStartedEvent-databaseName-type.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedCommandEvent-commandStartedEvent-databaseName-type.json rename to spec/unified-test-format/invalid/expectedCommandEvent-commandStartedEvent-databaseName-type.json diff --git a/src/test/spec/json/unified-test-format/invalid/expectedCommandEvent-commandStartedEvent-databaseName-type.yml b/spec/unified-test-format/invalid/expectedCommandEvent-commandStartedEvent-databaseName-type.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedCommandEvent-commandStartedEvent-databaseName-type.yml rename to spec/unified-test-format/invalid/expectedCommandEvent-commandStartedEvent-databaseName-type.yml diff --git a/src/test/spec/json/unified-test-format/invalid/expectedCommandEvent-commandStartedEvent-hasServerConnectionId-type.json b/spec/unified-test-format/invalid/expectedCommandEvent-commandStartedEvent-hasServerConnectionId-type.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedCommandEvent-commandStartedEvent-hasServerConnectionId-type.json rename to spec/unified-test-format/invalid/expectedCommandEvent-commandStartedEvent-hasServerConnectionId-type.json diff --git a/src/test/spec/json/unified-test-format/invalid/expectedCommandEvent-commandStartedEvent-hasServerConnectionId-type.yml b/spec/unified-test-format/invalid/expectedCommandEvent-commandStartedEvent-hasServerConnectionId-type.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedCommandEvent-commandStartedEvent-hasServerConnectionId-type.yml rename to spec/unified-test-format/invalid/expectedCommandEvent-commandStartedEvent-hasServerConnectionId-type.yml diff --git a/src/test/spec/json/unified-test-format/invalid/expectedCommandEvent-commandStartedEvent-hasServiceId-type.json b/spec/unified-test-format/invalid/expectedCommandEvent-commandStartedEvent-hasServiceId-type.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedCommandEvent-commandStartedEvent-hasServiceId-type.json rename to spec/unified-test-format/invalid/expectedCommandEvent-commandStartedEvent-hasServiceId-type.json diff --git a/src/test/spec/json/unified-test-format/invalid/expectedCommandEvent-commandStartedEvent-hasServiceId-type.yml b/spec/unified-test-format/invalid/expectedCommandEvent-commandStartedEvent-hasServiceId-type.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedCommandEvent-commandStartedEvent-hasServiceId-type.yml rename to spec/unified-test-format/invalid/expectedCommandEvent-commandStartedEvent-hasServiceId-type.yml diff --git a/src/test/spec/json/unified-test-format/invalid/expectedCommandEvent-commandSucceededEvent-commandName-type.json b/spec/unified-test-format/invalid/expectedCommandEvent-commandSucceededEvent-commandName-type.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedCommandEvent-commandSucceededEvent-commandName-type.json rename to spec/unified-test-format/invalid/expectedCommandEvent-commandSucceededEvent-commandName-type.json diff --git a/src/test/spec/json/unified-test-format/invalid/expectedCommandEvent-commandSucceededEvent-commandName-type.yml b/spec/unified-test-format/invalid/expectedCommandEvent-commandSucceededEvent-commandName-type.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedCommandEvent-commandSucceededEvent-commandName-type.yml rename to spec/unified-test-format/invalid/expectedCommandEvent-commandSucceededEvent-commandName-type.yml diff --git a/src/test/spec/json/unified-test-format/invalid/expectedCommandEvent-commandSucceededEvent-databaseName-type.json b/spec/unified-test-format/invalid/expectedCommandEvent-commandSucceededEvent-databaseName-type.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedCommandEvent-commandSucceededEvent-databaseName-type.json rename to spec/unified-test-format/invalid/expectedCommandEvent-commandSucceededEvent-databaseName-type.json diff --git a/src/test/spec/json/unified-test-format/invalid/expectedCommandEvent-commandSucceededEvent-databaseName-type.yml b/spec/unified-test-format/invalid/expectedCommandEvent-commandSucceededEvent-databaseName-type.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedCommandEvent-commandSucceededEvent-databaseName-type.yml rename to spec/unified-test-format/invalid/expectedCommandEvent-commandSucceededEvent-databaseName-type.yml diff --git a/src/test/spec/json/unified-test-format/invalid/expectedCommandEvent-commandSucceededEvent-hasServerConnectionId-type.json b/spec/unified-test-format/invalid/expectedCommandEvent-commandSucceededEvent-hasServerConnectionId-type.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedCommandEvent-commandSucceededEvent-hasServerConnectionId-type.json rename to spec/unified-test-format/invalid/expectedCommandEvent-commandSucceededEvent-hasServerConnectionId-type.json diff --git a/src/test/spec/json/unified-test-format/invalid/expectedCommandEvent-commandSucceededEvent-hasServerConnectionId-type.yml b/spec/unified-test-format/invalid/expectedCommandEvent-commandSucceededEvent-hasServerConnectionId-type.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedCommandEvent-commandSucceededEvent-hasServerConnectionId-type.yml rename to spec/unified-test-format/invalid/expectedCommandEvent-commandSucceededEvent-hasServerConnectionId-type.yml diff --git a/src/test/spec/json/unified-test-format/invalid/expectedCommandEvent-commandSucceededEvent-hasServiceId-type.json b/spec/unified-test-format/invalid/expectedCommandEvent-commandSucceededEvent-hasServiceId-type.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedCommandEvent-commandSucceededEvent-hasServiceId-type.json rename to spec/unified-test-format/invalid/expectedCommandEvent-commandSucceededEvent-hasServiceId-type.json diff --git a/src/test/spec/json/unified-test-format/invalid/expectedCommandEvent-commandSucceededEvent-hasServiceId-type.yml b/spec/unified-test-format/invalid/expectedCommandEvent-commandSucceededEvent-hasServiceId-type.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedCommandEvent-commandSucceededEvent-hasServiceId-type.yml rename to spec/unified-test-format/invalid/expectedCommandEvent-commandSucceededEvent-hasServiceId-type.yml diff --git a/src/test/spec/json/unified-test-format/invalid/expectedCommandEvent-commandSucceededEvent-reply-type.json b/spec/unified-test-format/invalid/expectedCommandEvent-commandSucceededEvent-reply-type.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedCommandEvent-commandSucceededEvent-reply-type.json rename to spec/unified-test-format/invalid/expectedCommandEvent-commandSucceededEvent-reply-type.json diff --git a/src/test/spec/json/unified-test-format/invalid/expectedCommandEvent-commandSucceededEvent-reply-type.yml b/spec/unified-test-format/invalid/expectedCommandEvent-commandSucceededEvent-reply-type.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedCommandEvent-commandSucceededEvent-reply-type.yml rename to spec/unified-test-format/invalid/expectedCommandEvent-commandSucceededEvent-reply-type.yml diff --git a/src/test/spec/json/unified-test-format/invalid/expectedCommandEvent-maxProperties.json b/spec/unified-test-format/invalid/expectedCommandEvent-maxProperties.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedCommandEvent-maxProperties.json rename to spec/unified-test-format/invalid/expectedCommandEvent-maxProperties.json diff --git a/src/test/spec/json/unified-test-format/invalid/expectedCommandEvent-maxProperties.yml b/spec/unified-test-format/invalid/expectedCommandEvent-maxProperties.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedCommandEvent-maxProperties.yml rename to spec/unified-test-format/invalid/expectedCommandEvent-maxProperties.yml diff --git a/src/test/spec/json/unified-test-format/invalid/expectedCommandEvent-minProperties.json b/spec/unified-test-format/invalid/expectedCommandEvent-minProperties.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedCommandEvent-minProperties.json rename to spec/unified-test-format/invalid/expectedCommandEvent-minProperties.json diff --git a/src/test/spec/json/unified-test-format/invalid/expectedCommandEvent-minProperties.yml b/spec/unified-test-format/invalid/expectedCommandEvent-minProperties.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedCommandEvent-minProperties.yml rename to spec/unified-test-format/invalid/expectedCommandEvent-minProperties.yml diff --git a/src/test/spec/json/unified-test-format/invalid/expectedError-additionalProperties.json b/spec/unified-test-format/invalid/expectedError-additionalProperties.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedError-additionalProperties.json rename to spec/unified-test-format/invalid/expectedError-additionalProperties.json diff --git a/src/test/spec/json/unified-test-format/invalid/expectedError-additionalProperties.yml b/spec/unified-test-format/invalid/expectedError-additionalProperties.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedError-additionalProperties.yml rename to spec/unified-test-format/invalid/expectedError-additionalProperties.yml diff --git a/src/test/spec/json/unified-test-format/invalid/expectedError-errorCode-type.json b/spec/unified-test-format/invalid/expectedError-errorCode-type.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedError-errorCode-type.json rename to spec/unified-test-format/invalid/expectedError-errorCode-type.json diff --git a/src/test/spec/json/unified-test-format/invalid/expectedError-errorCode-type.yml b/spec/unified-test-format/invalid/expectedError-errorCode-type.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedError-errorCode-type.yml rename to spec/unified-test-format/invalid/expectedError-errorCode-type.yml diff --git a/src/test/spec/json/unified-test-format/invalid/expectedError-errorCodeName-type.json b/spec/unified-test-format/invalid/expectedError-errorCodeName-type.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedError-errorCodeName-type.json rename to spec/unified-test-format/invalid/expectedError-errorCodeName-type.json diff --git a/src/test/spec/json/unified-test-format/invalid/expectedError-errorCodeName-type.yml b/spec/unified-test-format/invalid/expectedError-errorCodeName-type.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedError-errorCodeName-type.yml rename to spec/unified-test-format/invalid/expectedError-errorCodeName-type.yml diff --git a/src/test/spec/json/unified-test-format/invalid/expectedError-errorContains-type.json b/spec/unified-test-format/invalid/expectedError-errorContains-type.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedError-errorContains-type.json rename to spec/unified-test-format/invalid/expectedError-errorContains-type.json diff --git a/src/test/spec/json/unified-test-format/invalid/expectedError-errorContains-type.yml b/spec/unified-test-format/invalid/expectedError-errorContains-type.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedError-errorContains-type.yml rename to spec/unified-test-format/invalid/expectedError-errorContains-type.yml diff --git a/src/test/spec/json/unified-test-format/invalid/expectedError-errorLabelsContain-items.json b/spec/unified-test-format/invalid/expectedError-errorLabelsContain-items.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedError-errorLabelsContain-items.json rename to spec/unified-test-format/invalid/expectedError-errorLabelsContain-items.json diff --git a/src/test/spec/json/unified-test-format/invalid/expectedError-errorLabelsContain-items.yml b/spec/unified-test-format/invalid/expectedError-errorLabelsContain-items.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedError-errorLabelsContain-items.yml rename to spec/unified-test-format/invalid/expectedError-errorLabelsContain-items.yml diff --git a/src/test/spec/json/unified-test-format/invalid/expectedError-errorLabelsContain-minItems.json b/spec/unified-test-format/invalid/expectedError-errorLabelsContain-minItems.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedError-errorLabelsContain-minItems.json rename to spec/unified-test-format/invalid/expectedError-errorLabelsContain-minItems.json diff --git a/src/test/spec/json/unified-test-format/invalid/expectedError-errorLabelsContain-minItems.yml b/spec/unified-test-format/invalid/expectedError-errorLabelsContain-minItems.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedError-errorLabelsContain-minItems.yml rename to spec/unified-test-format/invalid/expectedError-errorLabelsContain-minItems.yml diff --git a/src/test/spec/json/unified-test-format/invalid/expectedError-errorLabelsContain-type.json b/spec/unified-test-format/invalid/expectedError-errorLabelsContain-type.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedError-errorLabelsContain-type.json rename to spec/unified-test-format/invalid/expectedError-errorLabelsContain-type.json diff --git a/src/test/spec/json/unified-test-format/invalid/expectedError-errorLabelsContain-type.yml b/spec/unified-test-format/invalid/expectedError-errorLabelsContain-type.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedError-errorLabelsContain-type.yml rename to spec/unified-test-format/invalid/expectedError-errorLabelsContain-type.yml diff --git a/src/test/spec/json/unified-test-format/invalid/expectedError-errorLabelsOmit-items.json b/spec/unified-test-format/invalid/expectedError-errorLabelsOmit-items.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedError-errorLabelsOmit-items.json rename to spec/unified-test-format/invalid/expectedError-errorLabelsOmit-items.json diff --git a/src/test/spec/json/unified-test-format/invalid/expectedError-errorLabelsOmit-items.yml b/spec/unified-test-format/invalid/expectedError-errorLabelsOmit-items.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedError-errorLabelsOmit-items.yml rename to spec/unified-test-format/invalid/expectedError-errorLabelsOmit-items.yml diff --git a/src/test/spec/json/unified-test-format/invalid/expectedError-errorLabelsOmit-minItems.json b/spec/unified-test-format/invalid/expectedError-errorLabelsOmit-minItems.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedError-errorLabelsOmit-minItems.json rename to spec/unified-test-format/invalid/expectedError-errorLabelsOmit-minItems.json diff --git a/src/test/spec/json/unified-test-format/invalid/expectedError-errorLabelsOmit-minItems.yml b/spec/unified-test-format/invalid/expectedError-errorLabelsOmit-minItems.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedError-errorLabelsOmit-minItems.yml rename to spec/unified-test-format/invalid/expectedError-errorLabelsOmit-minItems.yml diff --git a/src/test/spec/json/unified-test-format/invalid/expectedError-errorLabelsOmit-type.json b/spec/unified-test-format/invalid/expectedError-errorLabelsOmit-type.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedError-errorLabelsOmit-type.json rename to spec/unified-test-format/invalid/expectedError-errorLabelsOmit-type.json diff --git a/src/test/spec/json/unified-test-format/invalid/expectedError-errorLabelsOmit-type.yml b/spec/unified-test-format/invalid/expectedError-errorLabelsOmit-type.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedError-errorLabelsOmit-type.yml rename to spec/unified-test-format/invalid/expectedError-errorLabelsOmit-type.yml diff --git a/src/test/spec/json/unified-test-format/invalid/expectedError-errorResponse-type.json b/spec/unified-test-format/invalid/expectedError-errorResponse-type.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedError-errorResponse-type.json rename to spec/unified-test-format/invalid/expectedError-errorResponse-type.json diff --git a/src/test/spec/json/unified-test-format/invalid/expectedError-errorResponse-type.yml b/spec/unified-test-format/invalid/expectedError-errorResponse-type.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedError-errorResponse-type.yml rename to spec/unified-test-format/invalid/expectedError-errorResponse-type.yml diff --git a/src/test/spec/json/unified-test-format/invalid/expectedError-isClientError-type.json b/spec/unified-test-format/invalid/expectedError-isClientError-type.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedError-isClientError-type.json rename to spec/unified-test-format/invalid/expectedError-isClientError-type.json diff --git a/src/test/spec/json/unified-test-format/invalid/expectedError-isClientError-type.yml b/spec/unified-test-format/invalid/expectedError-isClientError-type.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedError-isClientError-type.yml rename to spec/unified-test-format/invalid/expectedError-isClientError-type.yml diff --git a/src/test/spec/json/unified-test-format/invalid/expectedError-isError-const.json b/spec/unified-test-format/invalid/expectedError-isError-const.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedError-isError-const.json rename to spec/unified-test-format/invalid/expectedError-isError-const.json diff --git a/src/test/spec/json/unified-test-format/invalid/expectedError-isError-const.yml b/spec/unified-test-format/invalid/expectedError-isError-const.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedError-isError-const.yml rename to spec/unified-test-format/invalid/expectedError-isError-const.yml diff --git a/src/test/spec/json/unified-test-format/invalid/expectedError-isError-type.json b/spec/unified-test-format/invalid/expectedError-isError-type.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedError-isError-type.json rename to spec/unified-test-format/invalid/expectedError-isError-type.json diff --git a/src/test/spec/json/unified-test-format/invalid/expectedError-isError-type.yml b/spec/unified-test-format/invalid/expectedError-isError-type.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedError-isError-type.yml rename to spec/unified-test-format/invalid/expectedError-isError-type.yml diff --git a/src/test/spec/json/unified-test-format/invalid/expectedError-isTimeoutError-type.json b/spec/unified-test-format/invalid/expectedError-isTimeoutError-type.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedError-isTimeoutError-type.json rename to spec/unified-test-format/invalid/expectedError-isTimeoutError-type.json diff --git a/src/test/spec/json/unified-test-format/invalid/expectedError-isTimeoutError-type.yml b/spec/unified-test-format/invalid/expectedError-isTimeoutError-type.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedError-isTimeoutError-type.yml rename to spec/unified-test-format/invalid/expectedError-isTimeoutError-type.yml diff --git a/src/test/spec/json/unified-test-format/invalid/expectedError-minProperties.json b/spec/unified-test-format/invalid/expectedError-minProperties.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedError-minProperties.json rename to spec/unified-test-format/invalid/expectedError-minProperties.json diff --git a/src/test/spec/json/unified-test-format/invalid/expectedError-minProperties.yml b/spec/unified-test-format/invalid/expectedError-minProperties.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedError-minProperties.yml rename to spec/unified-test-format/invalid/expectedError-minProperties.yml diff --git a/src/test/spec/json/unified-test-format/invalid/expectedEventsForClient-additionalProperties.json b/spec/unified-test-format/invalid/expectedEventsForClient-additionalProperties.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedEventsForClient-additionalProperties.json rename to spec/unified-test-format/invalid/expectedEventsForClient-additionalProperties.json diff --git a/src/test/spec/json/unified-test-format/invalid/expectedEventsForClient-additionalProperties.yml b/spec/unified-test-format/invalid/expectedEventsForClient-additionalProperties.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedEventsForClient-additionalProperties.yml rename to spec/unified-test-format/invalid/expectedEventsForClient-additionalProperties.yml diff --git a/src/test/spec/json/unified-test-format/invalid/expectedEventsForClient-client-required.json b/spec/unified-test-format/invalid/expectedEventsForClient-client-required.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedEventsForClient-client-required.json rename to spec/unified-test-format/invalid/expectedEventsForClient-client-required.json diff --git a/src/test/spec/json/unified-test-format/invalid/expectedEventsForClient-client-required.yml b/spec/unified-test-format/invalid/expectedEventsForClient-client-required.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedEventsForClient-client-required.yml rename to spec/unified-test-format/invalid/expectedEventsForClient-client-required.yml diff --git a/src/test/spec/json/unified-test-format/invalid/expectedEventsForClient-client-type.json b/spec/unified-test-format/invalid/expectedEventsForClient-client-type.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedEventsForClient-client-type.json rename to spec/unified-test-format/invalid/expectedEventsForClient-client-type.json diff --git a/src/test/spec/json/unified-test-format/invalid/expectedEventsForClient-client-type.yml b/spec/unified-test-format/invalid/expectedEventsForClient-client-type.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedEventsForClient-client-type.yml rename to spec/unified-test-format/invalid/expectedEventsForClient-client-type.yml diff --git a/src/test/spec/json/unified-test-format/invalid/expectedEventsForClient-eventType-enum.json b/spec/unified-test-format/invalid/expectedEventsForClient-eventType-enum.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedEventsForClient-eventType-enum.json rename to spec/unified-test-format/invalid/expectedEventsForClient-eventType-enum.json diff --git a/src/test/spec/json/unified-test-format/invalid/expectedEventsForClient-eventType-enum.yml b/spec/unified-test-format/invalid/expectedEventsForClient-eventType-enum.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedEventsForClient-eventType-enum.yml rename to spec/unified-test-format/invalid/expectedEventsForClient-eventType-enum.yml diff --git a/src/test/spec/json/unified-test-format/invalid/expectedEventsForClient-eventType-type.json b/spec/unified-test-format/invalid/expectedEventsForClient-eventType-type.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedEventsForClient-eventType-type.json rename to spec/unified-test-format/invalid/expectedEventsForClient-eventType-type.json diff --git a/src/test/spec/json/unified-test-format/invalid/expectedEventsForClient-eventType-type.yml b/spec/unified-test-format/invalid/expectedEventsForClient-eventType-type.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedEventsForClient-eventType-type.yml rename to spec/unified-test-format/invalid/expectedEventsForClient-eventType-type.yml diff --git a/src/test/spec/json/unified-test-format/invalid/expectedEventsForClient-events-items.json b/spec/unified-test-format/invalid/expectedEventsForClient-events-items.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedEventsForClient-events-items.json rename to spec/unified-test-format/invalid/expectedEventsForClient-events-items.json diff --git a/src/test/spec/json/unified-test-format/invalid/expectedEventsForClient-events-items.yml b/spec/unified-test-format/invalid/expectedEventsForClient-events-items.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedEventsForClient-events-items.yml rename to spec/unified-test-format/invalid/expectedEventsForClient-events-items.yml diff --git a/src/test/spec/json/unified-test-format/invalid/expectedEventsForClient-events-required.json b/spec/unified-test-format/invalid/expectedEventsForClient-events-required.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedEventsForClient-events-required.json rename to spec/unified-test-format/invalid/expectedEventsForClient-events-required.json diff --git a/src/test/spec/json/unified-test-format/invalid/expectedEventsForClient-events-required.yml b/spec/unified-test-format/invalid/expectedEventsForClient-events-required.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedEventsForClient-events-required.yml rename to spec/unified-test-format/invalid/expectedEventsForClient-events-required.yml diff --git a/src/test/spec/json/unified-test-format/invalid/expectedEventsForClient-events-type.json b/spec/unified-test-format/invalid/expectedEventsForClient-events-type.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedEventsForClient-events-type.json rename to spec/unified-test-format/invalid/expectedEventsForClient-events-type.json diff --git a/src/test/spec/json/unified-test-format/invalid/expectedEventsForClient-events-type.yml b/spec/unified-test-format/invalid/expectedEventsForClient-events-type.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedEventsForClient-events-type.yml rename to spec/unified-test-format/invalid/expectedEventsForClient-events-type.yml diff --git a/src/test/spec/json/unified-test-format/invalid/expectedEventsForClient-events_conflicts_with_cmap_eventType.json b/spec/unified-test-format/invalid/expectedEventsForClient-events_conflicts_with_cmap_eventType.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedEventsForClient-events_conflicts_with_cmap_eventType.json rename to spec/unified-test-format/invalid/expectedEventsForClient-events_conflicts_with_cmap_eventType.json diff --git a/src/test/spec/json/unified-test-format/invalid/expectedEventsForClient-events_conflicts_with_cmap_eventType.yml b/spec/unified-test-format/invalid/expectedEventsForClient-events_conflicts_with_cmap_eventType.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedEventsForClient-events_conflicts_with_cmap_eventType.yml rename to spec/unified-test-format/invalid/expectedEventsForClient-events_conflicts_with_cmap_eventType.yml diff --git a/src/test/spec/json/unified-test-format/invalid/expectedEventsForClient-events_conflicts_with_command_eventType.json b/spec/unified-test-format/invalid/expectedEventsForClient-events_conflicts_with_command_eventType.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedEventsForClient-events_conflicts_with_command_eventType.json rename to spec/unified-test-format/invalid/expectedEventsForClient-events_conflicts_with_command_eventType.json diff --git a/src/test/spec/json/unified-test-format/invalid/expectedEventsForClient-events_conflicts_with_command_eventType.yml b/spec/unified-test-format/invalid/expectedEventsForClient-events_conflicts_with_command_eventType.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedEventsForClient-events_conflicts_with_command_eventType.yml rename to spec/unified-test-format/invalid/expectedEventsForClient-events_conflicts_with_command_eventType.yml diff --git a/src/test/spec/json/unified-test-format/invalid/expectedEventsForClient-events_conflicts_with_default_eventType.json b/spec/unified-test-format/invalid/expectedEventsForClient-events_conflicts_with_default_eventType.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedEventsForClient-events_conflicts_with_default_eventType.json rename to spec/unified-test-format/invalid/expectedEventsForClient-events_conflicts_with_default_eventType.json diff --git a/src/test/spec/json/unified-test-format/invalid/expectedEventsForClient-events_conflicts_with_default_eventType.yml b/spec/unified-test-format/invalid/expectedEventsForClient-events_conflicts_with_default_eventType.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedEventsForClient-events_conflicts_with_default_eventType.yml rename to spec/unified-test-format/invalid/expectedEventsForClient-events_conflicts_with_default_eventType.yml diff --git a/src/test/spec/json/unified-test-format/invalid/expectedEventsForClient-ignoreExtraEvents-type.json b/spec/unified-test-format/invalid/expectedEventsForClient-ignoreExtraEvents-type.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedEventsForClient-ignoreExtraEvents-type.json rename to spec/unified-test-format/invalid/expectedEventsForClient-ignoreExtraEvents-type.json diff --git a/src/test/spec/json/unified-test-format/invalid/expectedEventsForClient-ignoreExtraEvents-type.yml b/spec/unified-test-format/invalid/expectedEventsForClient-ignoreExtraEvents-type.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedEventsForClient-ignoreExtraEvents-type.yml rename to spec/unified-test-format/invalid/expectedEventsForClient-ignoreExtraEvents-type.yml diff --git a/src/test/spec/json/unified-test-format/invalid/expectedLogMessage-additionalProperties.json b/spec/unified-test-format/invalid/expectedLogMessage-additionalProperties.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedLogMessage-additionalProperties.json rename to spec/unified-test-format/invalid/expectedLogMessage-additionalProperties.json diff --git a/src/test/spec/json/unified-test-format/invalid/expectedLogMessage-additionalProperties.yml b/spec/unified-test-format/invalid/expectedLogMessage-additionalProperties.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedLogMessage-additionalProperties.yml rename to spec/unified-test-format/invalid/expectedLogMessage-additionalProperties.yml diff --git a/src/test/spec/json/unified-test-format/invalid/expectedLogMessage-component-enum.json b/spec/unified-test-format/invalid/expectedLogMessage-component-enum.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedLogMessage-component-enum.json rename to spec/unified-test-format/invalid/expectedLogMessage-component-enum.json diff --git a/src/test/spec/json/unified-test-format/invalid/expectedLogMessage-component-enum.yml b/spec/unified-test-format/invalid/expectedLogMessage-component-enum.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedLogMessage-component-enum.yml rename to spec/unified-test-format/invalid/expectedLogMessage-component-enum.yml diff --git a/src/test/spec/json/unified-test-format/invalid/expectedLogMessage-component-required.json b/spec/unified-test-format/invalid/expectedLogMessage-component-required.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedLogMessage-component-required.json rename to spec/unified-test-format/invalid/expectedLogMessage-component-required.json diff --git a/src/test/spec/json/unified-test-format/invalid/expectedLogMessage-component-required.yml b/spec/unified-test-format/invalid/expectedLogMessage-component-required.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedLogMessage-component-required.yml rename to spec/unified-test-format/invalid/expectedLogMessage-component-required.yml diff --git a/src/test/spec/json/unified-test-format/invalid/expectedLogMessage-component-type.json b/spec/unified-test-format/invalid/expectedLogMessage-component-type.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedLogMessage-component-type.json rename to spec/unified-test-format/invalid/expectedLogMessage-component-type.json diff --git a/src/test/spec/json/unified-test-format/invalid/expectedLogMessage-component-type.yml b/spec/unified-test-format/invalid/expectedLogMessage-component-type.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedLogMessage-component-type.yml rename to spec/unified-test-format/invalid/expectedLogMessage-component-type.yml diff --git a/src/test/spec/json/unified-test-format/invalid/expectedLogMessage-data-required.json b/spec/unified-test-format/invalid/expectedLogMessage-data-required.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedLogMessage-data-required.json rename to spec/unified-test-format/invalid/expectedLogMessage-data-required.json diff --git a/src/test/spec/json/unified-test-format/invalid/expectedLogMessage-data-required.yml b/spec/unified-test-format/invalid/expectedLogMessage-data-required.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedLogMessage-data-required.yml rename to spec/unified-test-format/invalid/expectedLogMessage-data-required.yml diff --git a/src/test/spec/json/unified-test-format/invalid/expectedLogMessage-data-type.json b/spec/unified-test-format/invalid/expectedLogMessage-data-type.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedLogMessage-data-type.json rename to spec/unified-test-format/invalid/expectedLogMessage-data-type.json diff --git a/src/test/spec/json/unified-test-format/invalid/expectedLogMessage-data-type.yml b/spec/unified-test-format/invalid/expectedLogMessage-data-type.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedLogMessage-data-type.yml rename to spec/unified-test-format/invalid/expectedLogMessage-data-type.yml diff --git a/src/test/spec/json/unified-test-format/invalid/expectedLogMessage-failureIsRedacted-type.json b/spec/unified-test-format/invalid/expectedLogMessage-failureIsRedacted-type.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedLogMessage-failureIsRedacted-type.json rename to spec/unified-test-format/invalid/expectedLogMessage-failureIsRedacted-type.json diff --git a/src/test/spec/json/unified-test-format/invalid/expectedLogMessage-failureIsRedacted-type.yml b/spec/unified-test-format/invalid/expectedLogMessage-failureIsRedacted-type.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedLogMessage-failureIsRedacted-type.yml rename to spec/unified-test-format/invalid/expectedLogMessage-failureIsRedacted-type.yml diff --git a/src/test/spec/json/unified-test-format/invalid/expectedLogMessage-level-enum.json b/spec/unified-test-format/invalid/expectedLogMessage-level-enum.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedLogMessage-level-enum.json rename to spec/unified-test-format/invalid/expectedLogMessage-level-enum.json diff --git a/src/test/spec/json/unified-test-format/invalid/expectedLogMessage-level-enum.yml b/spec/unified-test-format/invalid/expectedLogMessage-level-enum.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedLogMessage-level-enum.yml rename to spec/unified-test-format/invalid/expectedLogMessage-level-enum.yml diff --git a/src/test/spec/json/unified-test-format/invalid/expectedLogMessage-level-required.json b/spec/unified-test-format/invalid/expectedLogMessage-level-required.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedLogMessage-level-required.json rename to spec/unified-test-format/invalid/expectedLogMessage-level-required.json diff --git a/src/test/spec/json/unified-test-format/invalid/expectedLogMessage-level-required.yml b/spec/unified-test-format/invalid/expectedLogMessage-level-required.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedLogMessage-level-required.yml rename to spec/unified-test-format/invalid/expectedLogMessage-level-required.yml diff --git a/src/test/spec/json/unified-test-format/invalid/expectedLogMessage-level-type.json b/spec/unified-test-format/invalid/expectedLogMessage-level-type.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedLogMessage-level-type.json rename to spec/unified-test-format/invalid/expectedLogMessage-level-type.json diff --git a/src/test/spec/json/unified-test-format/invalid/expectedLogMessage-level-type.yml b/spec/unified-test-format/invalid/expectedLogMessage-level-type.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedLogMessage-level-type.yml rename to spec/unified-test-format/invalid/expectedLogMessage-level-type.yml diff --git a/src/test/spec/json/unified-test-format/invalid/expectedLogMessagesForClient-additionalProperties.json b/spec/unified-test-format/invalid/expectedLogMessagesForClient-additionalProperties.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedLogMessagesForClient-additionalProperties.json rename to spec/unified-test-format/invalid/expectedLogMessagesForClient-additionalProperties.json diff --git a/src/test/spec/json/unified-test-format/invalid/expectedLogMessagesForClient-additionalProperties.yml b/spec/unified-test-format/invalid/expectedLogMessagesForClient-additionalProperties.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedLogMessagesForClient-additionalProperties.yml rename to spec/unified-test-format/invalid/expectedLogMessagesForClient-additionalProperties.yml diff --git a/src/test/spec/json/unified-test-format/invalid/expectedLogMessagesForClient-client-required.json b/spec/unified-test-format/invalid/expectedLogMessagesForClient-client-required.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedLogMessagesForClient-client-required.json rename to spec/unified-test-format/invalid/expectedLogMessagesForClient-client-required.json diff --git a/src/test/spec/json/unified-test-format/invalid/expectedLogMessagesForClient-client-required.yml b/spec/unified-test-format/invalid/expectedLogMessagesForClient-client-required.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedLogMessagesForClient-client-required.yml rename to spec/unified-test-format/invalid/expectedLogMessagesForClient-client-required.yml diff --git a/src/test/spec/json/unified-test-format/invalid/expectedLogMessagesForClient-client-type.json b/spec/unified-test-format/invalid/expectedLogMessagesForClient-client-type.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedLogMessagesForClient-client-type.json rename to spec/unified-test-format/invalid/expectedLogMessagesForClient-client-type.json diff --git a/src/test/spec/json/unified-test-format/invalid/expectedLogMessagesForClient-client-type.yml b/spec/unified-test-format/invalid/expectedLogMessagesForClient-client-type.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedLogMessagesForClient-client-type.yml rename to spec/unified-test-format/invalid/expectedLogMessagesForClient-client-type.yml diff --git a/src/test/spec/json/unified-test-format/invalid/expectedLogMessagesForClient-ignoreExtraMessages-type.json b/spec/unified-test-format/invalid/expectedLogMessagesForClient-ignoreExtraMessages-type.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedLogMessagesForClient-ignoreExtraMessages-type.json rename to spec/unified-test-format/invalid/expectedLogMessagesForClient-ignoreExtraMessages-type.json diff --git a/src/test/spec/json/unified-test-format/invalid/expectedLogMessagesForClient-ignoreExtraMessages-type.yml b/spec/unified-test-format/invalid/expectedLogMessagesForClient-ignoreExtraMessages-type.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedLogMessagesForClient-ignoreExtraMessages-type.yml rename to spec/unified-test-format/invalid/expectedLogMessagesForClient-ignoreExtraMessages-type.yml diff --git a/src/test/spec/json/unified-test-format/invalid/expectedLogMessagesForClient-ignoreMessages-items.json b/spec/unified-test-format/invalid/expectedLogMessagesForClient-ignoreMessages-items.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedLogMessagesForClient-ignoreMessages-items.json rename to spec/unified-test-format/invalid/expectedLogMessagesForClient-ignoreMessages-items.json diff --git a/src/test/spec/json/unified-test-format/invalid/expectedLogMessagesForClient-ignoreMessages-items.yml b/spec/unified-test-format/invalid/expectedLogMessagesForClient-ignoreMessages-items.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedLogMessagesForClient-ignoreMessages-items.yml rename to spec/unified-test-format/invalid/expectedLogMessagesForClient-ignoreMessages-items.yml diff --git a/src/test/spec/json/unified-test-format/invalid/expectedLogMessagesForClient-ignoreMessages-type.json b/spec/unified-test-format/invalid/expectedLogMessagesForClient-ignoreMessages-type.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedLogMessagesForClient-ignoreMessages-type.json rename to spec/unified-test-format/invalid/expectedLogMessagesForClient-ignoreMessages-type.json diff --git a/src/test/spec/json/unified-test-format/invalid/expectedLogMessagesForClient-ignoreMessages-type.yml b/spec/unified-test-format/invalid/expectedLogMessagesForClient-ignoreMessages-type.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedLogMessagesForClient-ignoreMessages-type.yml rename to spec/unified-test-format/invalid/expectedLogMessagesForClient-ignoreMessages-type.yml diff --git a/src/test/spec/json/unified-test-format/invalid/expectedLogMessagesForClient-messages-items.json b/spec/unified-test-format/invalid/expectedLogMessagesForClient-messages-items.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedLogMessagesForClient-messages-items.json rename to spec/unified-test-format/invalid/expectedLogMessagesForClient-messages-items.json diff --git a/src/test/spec/json/unified-test-format/invalid/expectedLogMessagesForClient-messages-items.yml b/spec/unified-test-format/invalid/expectedLogMessagesForClient-messages-items.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedLogMessagesForClient-messages-items.yml rename to spec/unified-test-format/invalid/expectedLogMessagesForClient-messages-items.yml diff --git a/src/test/spec/json/unified-test-format/invalid/expectedLogMessagesForClient-messages-required.json b/spec/unified-test-format/invalid/expectedLogMessagesForClient-messages-required.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedLogMessagesForClient-messages-required.json rename to spec/unified-test-format/invalid/expectedLogMessagesForClient-messages-required.json diff --git a/src/test/spec/json/unified-test-format/invalid/expectedLogMessagesForClient-messages-required.yml b/spec/unified-test-format/invalid/expectedLogMessagesForClient-messages-required.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedLogMessagesForClient-messages-required.yml rename to spec/unified-test-format/invalid/expectedLogMessagesForClient-messages-required.yml diff --git a/src/test/spec/json/unified-test-format/invalid/expectedLogMessagesForClient-messages-type.json b/spec/unified-test-format/invalid/expectedLogMessagesForClient-messages-type.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedLogMessagesForClient-messages-type.json rename to spec/unified-test-format/invalid/expectedLogMessagesForClient-messages-type.json diff --git a/src/test/spec/json/unified-test-format/invalid/expectedLogMessagesForClient-messages-type.yml b/spec/unified-test-format/invalid/expectedLogMessagesForClient-messages-type.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedLogMessagesForClient-messages-type.yml rename to spec/unified-test-format/invalid/expectedLogMessagesForClient-messages-type.yml diff --git a/src/test/spec/json/unified-test-format/invalid/expectedSdamEvent-serverDescriptionChangedEvent-additionalProperties.json b/spec/unified-test-format/invalid/expectedSdamEvent-serverDescriptionChangedEvent-additionalProperties.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedSdamEvent-serverDescriptionChangedEvent-additionalProperties.json rename to spec/unified-test-format/invalid/expectedSdamEvent-serverDescriptionChangedEvent-additionalProperties.json diff --git a/src/test/spec/json/unified-test-format/invalid/expectedSdamEvent-serverDescriptionChangedEvent-additionalProperties.yml b/spec/unified-test-format/invalid/expectedSdamEvent-serverDescriptionChangedEvent-additionalProperties.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedSdamEvent-serverDescriptionChangedEvent-additionalProperties.yml rename to spec/unified-test-format/invalid/expectedSdamEvent-serverDescriptionChangedEvent-additionalProperties.yml diff --git a/src/test/spec/json/unified-test-format/invalid/expectedSdamEvent-serverDescriptionChangedEvent-serverDescription-additionalProperties.json b/spec/unified-test-format/invalid/expectedSdamEvent-serverDescriptionChangedEvent-serverDescription-additionalProperties.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedSdamEvent-serverDescriptionChangedEvent-serverDescription-additionalProperties.json rename to spec/unified-test-format/invalid/expectedSdamEvent-serverDescriptionChangedEvent-serverDescription-additionalProperties.json diff --git a/src/test/spec/json/unified-test-format/invalid/expectedSdamEvent-serverDescriptionChangedEvent-serverDescription-additionalProperties.yml b/spec/unified-test-format/invalid/expectedSdamEvent-serverDescriptionChangedEvent-serverDescription-additionalProperties.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedSdamEvent-serverDescriptionChangedEvent-serverDescription-additionalProperties.yml rename to spec/unified-test-format/invalid/expectedSdamEvent-serverDescriptionChangedEvent-serverDescription-additionalProperties.yml diff --git a/src/test/spec/json/unified-test-format/invalid/expectedSdamEvent-serverDescriptionChangedEvent-serverDescription-type-enum.json b/spec/unified-test-format/invalid/expectedSdamEvent-serverDescriptionChangedEvent-serverDescription-type-enum.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedSdamEvent-serverDescriptionChangedEvent-serverDescription-type-enum.json rename to spec/unified-test-format/invalid/expectedSdamEvent-serverDescriptionChangedEvent-serverDescription-type-enum.json diff --git a/src/test/spec/json/unified-test-format/invalid/expectedSdamEvent-serverDescriptionChangedEvent-serverDescription-type-enum.yml b/spec/unified-test-format/invalid/expectedSdamEvent-serverDescriptionChangedEvent-serverDescription-type-enum.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedSdamEvent-serverDescriptionChangedEvent-serverDescription-type-enum.yml rename to spec/unified-test-format/invalid/expectedSdamEvent-serverDescriptionChangedEvent-serverDescription-type-enum.yml diff --git a/src/test/spec/json/unified-test-format/invalid/expectedSdamEvent-serverDescriptionChangedEvent-serverDescription-type-type.json b/spec/unified-test-format/invalid/expectedSdamEvent-serverDescriptionChangedEvent-serverDescription-type-type.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedSdamEvent-serverDescriptionChangedEvent-serverDescription-type-type.json rename to spec/unified-test-format/invalid/expectedSdamEvent-serverDescriptionChangedEvent-serverDescription-type-type.json diff --git a/src/test/spec/json/unified-test-format/invalid/expectedSdamEvent-serverDescriptionChangedEvent-serverDescription-type-type.yml b/spec/unified-test-format/invalid/expectedSdamEvent-serverDescriptionChangedEvent-serverDescription-type-type.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedSdamEvent-serverDescriptionChangedEvent-serverDescription-type-type.yml rename to spec/unified-test-format/invalid/expectedSdamEvent-serverDescriptionChangedEvent-serverDescription-type-type.yml diff --git a/src/test/spec/json/unified-test-format/invalid/expectedSdamEvent-topologyDescriptionChangedEvent-additionalProperties.json b/spec/unified-test-format/invalid/expectedSdamEvent-topologyDescriptionChangedEvent-additionalProperties.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedSdamEvent-topologyDescriptionChangedEvent-additionalProperties.json rename to spec/unified-test-format/invalid/expectedSdamEvent-topologyDescriptionChangedEvent-additionalProperties.json diff --git a/src/test/spec/json/unified-test-format/invalid/expectedSdamEvent-topologyDescriptionChangedEvent-additionalProperties.yml b/spec/unified-test-format/invalid/expectedSdamEvent-topologyDescriptionChangedEvent-additionalProperties.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/expectedSdamEvent-topologyDescriptionChangedEvent-additionalProperties.yml rename to spec/unified-test-format/invalid/expectedSdamEvent-topologyDescriptionChangedEvent-additionalProperties.yml diff --git a/src/test/spec/json/unified-test-format/invalid/initialData-items.json b/spec/unified-test-format/invalid/initialData-items.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/initialData-items.json rename to spec/unified-test-format/invalid/initialData-items.json diff --git a/src/test/spec/json/unified-test-format/invalid/initialData-items.yml b/spec/unified-test-format/invalid/initialData-items.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/initialData-items.yml rename to spec/unified-test-format/invalid/initialData-items.yml diff --git a/src/test/spec/json/unified-test-format/invalid/initialData-minItems.json b/spec/unified-test-format/invalid/initialData-minItems.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/initialData-minItems.json rename to spec/unified-test-format/invalid/initialData-minItems.json diff --git a/src/test/spec/json/unified-test-format/invalid/initialData-minItems.yml b/spec/unified-test-format/invalid/initialData-minItems.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/initialData-minItems.yml rename to spec/unified-test-format/invalid/initialData-minItems.yml diff --git a/src/test/spec/json/unified-test-format/invalid/initialData-type.json b/spec/unified-test-format/invalid/initialData-type.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/initialData-type.json rename to spec/unified-test-format/invalid/initialData-type.json diff --git a/src/test/spec/json/unified-test-format/invalid/initialData-type.yml b/spec/unified-test-format/invalid/initialData-type.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/initialData-type.yml rename to spec/unified-test-format/invalid/initialData-type.yml diff --git a/src/test/spec/json/unified-test-format/invalid/operation-additionalProperties.json b/spec/unified-test-format/invalid/operation-additionalProperties.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/operation-additionalProperties.json rename to spec/unified-test-format/invalid/operation-additionalProperties.json diff --git a/src/test/spec/json/unified-test-format/invalid/operation-additionalProperties.yml b/spec/unified-test-format/invalid/operation-additionalProperties.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/operation-additionalProperties.yml rename to spec/unified-test-format/invalid/operation-additionalProperties.yml diff --git a/src/test/spec/json/unified-test-format/invalid/operation-arguments-type.json b/spec/unified-test-format/invalid/operation-arguments-type.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/operation-arguments-type.json rename to spec/unified-test-format/invalid/operation-arguments-type.json diff --git a/src/test/spec/json/unified-test-format/invalid/operation-arguments-type.yml b/spec/unified-test-format/invalid/operation-arguments-type.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/operation-arguments-type.yml rename to spec/unified-test-format/invalid/operation-arguments-type.yml diff --git a/src/test/spec/json/unified-test-format/invalid/operation-expectError-conflicts_with_expectResult.json b/spec/unified-test-format/invalid/operation-expectError-conflicts_with_expectResult.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/operation-expectError-conflicts_with_expectResult.json rename to spec/unified-test-format/invalid/operation-expectError-conflicts_with_expectResult.json diff --git a/src/test/spec/json/unified-test-format/invalid/operation-expectError-conflicts_with_expectResult.yml b/spec/unified-test-format/invalid/operation-expectError-conflicts_with_expectResult.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/operation-expectError-conflicts_with_expectResult.yml rename to spec/unified-test-format/invalid/operation-expectError-conflicts_with_expectResult.yml diff --git a/src/test/spec/json/unified-test-format/invalid/operation-expectError-conflicts_with_saveResultAsEntity.json b/spec/unified-test-format/invalid/operation-expectError-conflicts_with_saveResultAsEntity.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/operation-expectError-conflicts_with_saveResultAsEntity.json rename to spec/unified-test-format/invalid/operation-expectError-conflicts_with_saveResultAsEntity.json diff --git a/src/test/spec/json/unified-test-format/invalid/operation-expectError-conflicts_with_saveResultAsEntity.yml b/spec/unified-test-format/invalid/operation-expectError-conflicts_with_saveResultAsEntity.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/operation-expectError-conflicts_with_saveResultAsEntity.yml rename to spec/unified-test-format/invalid/operation-expectError-conflicts_with_saveResultAsEntity.yml diff --git a/src/test/spec/json/unified-test-format/invalid/operation-expectError-type.json b/spec/unified-test-format/invalid/operation-expectError-type.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/operation-expectError-type.json rename to spec/unified-test-format/invalid/operation-expectError-type.json diff --git a/src/test/spec/json/unified-test-format/invalid/operation-expectError-type.yml b/spec/unified-test-format/invalid/operation-expectError-type.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/operation-expectError-type.yml rename to spec/unified-test-format/invalid/operation-expectError-type.yml diff --git a/src/test/spec/json/unified-test-format/invalid/operation-expectEvents-type.json b/spec/unified-test-format/invalid/operation-expectEvents-type.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/operation-expectEvents-type.json rename to spec/unified-test-format/invalid/operation-expectEvents-type.json diff --git a/src/test/spec/json/unified-test-format/invalid/operation-expectEvents-type.yml b/spec/unified-test-format/invalid/operation-expectEvents-type.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/operation-expectEvents-type.yml rename to spec/unified-test-format/invalid/operation-expectEvents-type.yml diff --git a/src/test/spec/json/unified-test-format/invalid/operation-ignoreResultAndError-conflicts_with_expectError.json b/spec/unified-test-format/invalid/operation-ignoreResultAndError-conflicts_with_expectError.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/operation-ignoreResultAndError-conflicts_with_expectError.json rename to spec/unified-test-format/invalid/operation-ignoreResultAndError-conflicts_with_expectError.json diff --git a/src/test/spec/json/unified-test-format/invalid/operation-ignoreResultAndError-conflicts_with_expectError.yml b/spec/unified-test-format/invalid/operation-ignoreResultAndError-conflicts_with_expectError.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/operation-ignoreResultAndError-conflicts_with_expectError.yml rename to spec/unified-test-format/invalid/operation-ignoreResultAndError-conflicts_with_expectError.yml diff --git a/src/test/spec/json/unified-test-format/invalid/operation-ignoreResultAndError-conflicts_with_expectResult.json b/spec/unified-test-format/invalid/operation-ignoreResultAndError-conflicts_with_expectResult.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/operation-ignoreResultAndError-conflicts_with_expectResult.json rename to spec/unified-test-format/invalid/operation-ignoreResultAndError-conflicts_with_expectResult.json diff --git a/src/test/spec/json/unified-test-format/invalid/operation-ignoreResultAndError-conflicts_with_expectResult.yml b/spec/unified-test-format/invalid/operation-ignoreResultAndError-conflicts_with_expectResult.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/operation-ignoreResultAndError-conflicts_with_expectResult.yml rename to spec/unified-test-format/invalid/operation-ignoreResultAndError-conflicts_with_expectResult.yml diff --git a/src/test/spec/json/unified-test-format/invalid/operation-ignoreResultAndError-conflicts_with_saveResultAsEntity.json b/spec/unified-test-format/invalid/operation-ignoreResultAndError-conflicts_with_saveResultAsEntity.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/operation-ignoreResultAndError-conflicts_with_saveResultAsEntity.json rename to spec/unified-test-format/invalid/operation-ignoreResultAndError-conflicts_with_saveResultAsEntity.json diff --git a/src/test/spec/json/unified-test-format/invalid/operation-ignoreResultAndError-conflicts_with_saveResultAsEntity.yml b/spec/unified-test-format/invalid/operation-ignoreResultAndError-conflicts_with_saveResultAsEntity.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/operation-ignoreResultAndError-conflicts_with_saveResultAsEntity.yml rename to spec/unified-test-format/invalid/operation-ignoreResultAndError-conflicts_with_saveResultAsEntity.yml diff --git a/src/test/spec/json/unified-test-format/invalid/operation-name-required.json b/spec/unified-test-format/invalid/operation-name-required.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/operation-name-required.json rename to spec/unified-test-format/invalid/operation-name-required.json diff --git a/src/test/spec/json/unified-test-format/invalid/operation-name-required.yml b/spec/unified-test-format/invalid/operation-name-required.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/operation-name-required.yml rename to spec/unified-test-format/invalid/operation-name-required.yml diff --git a/src/test/spec/json/unified-test-format/invalid/operation-name-type.json b/spec/unified-test-format/invalid/operation-name-type.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/operation-name-type.json rename to spec/unified-test-format/invalid/operation-name-type.json diff --git a/src/test/spec/json/unified-test-format/invalid/operation-name-type.yml b/spec/unified-test-format/invalid/operation-name-type.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/operation-name-type.yml rename to spec/unified-test-format/invalid/operation-name-type.yml diff --git a/src/test/spec/json/unified-test-format/invalid/operation-object-required.json b/spec/unified-test-format/invalid/operation-object-required.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/operation-object-required.json rename to spec/unified-test-format/invalid/operation-object-required.json diff --git a/src/test/spec/json/unified-test-format/invalid/operation-object-required.yml b/spec/unified-test-format/invalid/operation-object-required.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/operation-object-required.yml rename to spec/unified-test-format/invalid/operation-object-required.yml diff --git a/src/test/spec/json/unified-test-format/invalid/operation-object-type.json b/spec/unified-test-format/invalid/operation-object-type.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/operation-object-type.json rename to spec/unified-test-format/invalid/operation-object-type.json diff --git a/src/test/spec/json/unified-test-format/invalid/operation-object-type.yml b/spec/unified-test-format/invalid/operation-object-type.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/operation-object-type.yml rename to spec/unified-test-format/invalid/operation-object-type.yml diff --git a/src/test/spec/json/unified-test-format/invalid/operation-saveResultAsEntity-type.json b/spec/unified-test-format/invalid/operation-saveResultAsEntity-type.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/operation-saveResultAsEntity-type.json rename to spec/unified-test-format/invalid/operation-saveResultAsEntity-type.json diff --git a/src/test/spec/json/unified-test-format/invalid/operation-saveResultAsEntity-type.yml b/spec/unified-test-format/invalid/operation-saveResultAsEntity-type.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/operation-saveResultAsEntity-type.yml rename to spec/unified-test-format/invalid/operation-saveResultAsEntity-type.yml diff --git a/src/test/spec/json/unified-test-format/invalid/runOnRequirement-additionalProperties.json b/spec/unified-test-format/invalid/runOnRequirement-additionalProperties.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/runOnRequirement-additionalProperties.json rename to spec/unified-test-format/invalid/runOnRequirement-additionalProperties.json diff --git a/src/test/spec/json/unified-test-format/invalid/runOnRequirement-additionalProperties.yml b/spec/unified-test-format/invalid/runOnRequirement-additionalProperties.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/runOnRequirement-additionalProperties.yml rename to spec/unified-test-format/invalid/runOnRequirement-additionalProperties.yml diff --git a/src/test/spec/json/unified-test-format/invalid/runOnRequirement-auth-type.json b/spec/unified-test-format/invalid/runOnRequirement-auth-type.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/runOnRequirement-auth-type.json rename to spec/unified-test-format/invalid/runOnRequirement-auth-type.json diff --git a/src/test/spec/json/unified-test-format/invalid/runOnRequirement-auth-type.yml b/spec/unified-test-format/invalid/runOnRequirement-auth-type.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/runOnRequirement-auth-type.yml rename to spec/unified-test-format/invalid/runOnRequirement-auth-type.yml diff --git a/src/test/spec/json/unified-test-format/invalid/runOnRequirement-authMechanism-type.json b/spec/unified-test-format/invalid/runOnRequirement-authMechanism-type.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/runOnRequirement-authMechanism-type.json rename to spec/unified-test-format/invalid/runOnRequirement-authMechanism-type.json diff --git a/src/test/spec/json/unified-test-format/invalid/runOnRequirement-authMechanism-type.yml b/spec/unified-test-format/invalid/runOnRequirement-authMechanism-type.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/runOnRequirement-authMechanism-type.yml rename to spec/unified-test-format/invalid/runOnRequirement-authMechanism-type.yml diff --git a/src/test/spec/json/unified-test-format/invalid/runOnRequirement-csfle-type.json b/spec/unified-test-format/invalid/runOnRequirement-csfle-type.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/runOnRequirement-csfle-type.json rename to spec/unified-test-format/invalid/runOnRequirement-csfle-type.json diff --git a/src/test/spec/json/unified-test-format/invalid/runOnRequirement-csfle-type.yml b/spec/unified-test-format/invalid/runOnRequirement-csfle-type.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/runOnRequirement-csfle-type.yml rename to spec/unified-test-format/invalid/runOnRequirement-csfle-type.yml diff --git a/src/test/spec/json/unified-test-format/invalid/runOnRequirement-maxServerVersion-pattern.json b/spec/unified-test-format/invalid/runOnRequirement-maxServerVersion-pattern.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/runOnRequirement-maxServerVersion-pattern.json rename to spec/unified-test-format/invalid/runOnRequirement-maxServerVersion-pattern.json diff --git a/src/test/spec/json/unified-test-format/invalid/runOnRequirement-maxServerVersion-pattern.yml b/spec/unified-test-format/invalid/runOnRequirement-maxServerVersion-pattern.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/runOnRequirement-maxServerVersion-pattern.yml rename to spec/unified-test-format/invalid/runOnRequirement-maxServerVersion-pattern.yml diff --git a/src/test/spec/json/unified-test-format/invalid/runOnRequirement-maxServerVersion-type.json b/spec/unified-test-format/invalid/runOnRequirement-maxServerVersion-type.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/runOnRequirement-maxServerVersion-type.json rename to spec/unified-test-format/invalid/runOnRequirement-maxServerVersion-type.json diff --git a/src/test/spec/json/unified-test-format/invalid/runOnRequirement-maxServerVersion-type.yml b/spec/unified-test-format/invalid/runOnRequirement-maxServerVersion-type.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/runOnRequirement-maxServerVersion-type.yml rename to spec/unified-test-format/invalid/runOnRequirement-maxServerVersion-type.yml diff --git a/src/test/spec/json/unified-test-format/invalid/runOnRequirement-minProperties.json b/spec/unified-test-format/invalid/runOnRequirement-minProperties.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/runOnRequirement-minProperties.json rename to spec/unified-test-format/invalid/runOnRequirement-minProperties.json diff --git a/src/test/spec/json/unified-test-format/invalid/runOnRequirement-minProperties.yml b/spec/unified-test-format/invalid/runOnRequirement-minProperties.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/runOnRequirement-minProperties.yml rename to spec/unified-test-format/invalid/runOnRequirement-minProperties.yml diff --git a/src/test/spec/json/unified-test-format/invalid/runOnRequirement-minServerVersion-pattern.json b/spec/unified-test-format/invalid/runOnRequirement-minServerVersion-pattern.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/runOnRequirement-minServerVersion-pattern.json rename to spec/unified-test-format/invalid/runOnRequirement-minServerVersion-pattern.json diff --git a/src/test/spec/json/unified-test-format/invalid/runOnRequirement-minServerVersion-pattern.yml b/spec/unified-test-format/invalid/runOnRequirement-minServerVersion-pattern.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/runOnRequirement-minServerVersion-pattern.yml rename to spec/unified-test-format/invalid/runOnRequirement-minServerVersion-pattern.yml diff --git a/src/test/spec/json/unified-test-format/invalid/runOnRequirement-minServerVersion-type.json b/spec/unified-test-format/invalid/runOnRequirement-minServerVersion-type.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/runOnRequirement-minServerVersion-type.json rename to spec/unified-test-format/invalid/runOnRequirement-minServerVersion-type.json diff --git a/src/test/spec/json/unified-test-format/invalid/runOnRequirement-minServerVersion-type.yml b/spec/unified-test-format/invalid/runOnRequirement-minServerVersion-type.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/runOnRequirement-minServerVersion-type.yml rename to spec/unified-test-format/invalid/runOnRequirement-minServerVersion-type.yml diff --git a/src/test/spec/json/unified-test-format/invalid/runOnRequirement-serverless-enum.json b/spec/unified-test-format/invalid/runOnRequirement-serverless-enum.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/runOnRequirement-serverless-enum.json rename to spec/unified-test-format/invalid/runOnRequirement-serverless-enum.json diff --git a/src/test/spec/json/unified-test-format/invalid/runOnRequirement-serverless-enum.yml b/spec/unified-test-format/invalid/runOnRequirement-serverless-enum.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/runOnRequirement-serverless-enum.yml rename to spec/unified-test-format/invalid/runOnRequirement-serverless-enum.yml diff --git a/src/test/spec/json/unified-test-format/invalid/runOnRequirement-serverless-type.json b/spec/unified-test-format/invalid/runOnRequirement-serverless-type.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/runOnRequirement-serverless-type.json rename to spec/unified-test-format/invalid/runOnRequirement-serverless-type.json diff --git a/src/test/spec/json/unified-test-format/invalid/runOnRequirement-serverless-type.yml b/spec/unified-test-format/invalid/runOnRequirement-serverless-type.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/runOnRequirement-serverless-type.yml rename to spec/unified-test-format/invalid/runOnRequirement-serverless-type.yml diff --git a/src/test/spec/json/unified-test-format/invalid/runOnRequirement-topologies-enum.json b/spec/unified-test-format/invalid/runOnRequirement-topologies-enum.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/runOnRequirement-topologies-enum.json rename to spec/unified-test-format/invalid/runOnRequirement-topologies-enum.json diff --git a/src/test/spec/json/unified-test-format/invalid/runOnRequirement-topologies-enum.yml b/spec/unified-test-format/invalid/runOnRequirement-topologies-enum.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/runOnRequirement-topologies-enum.yml rename to spec/unified-test-format/invalid/runOnRequirement-topologies-enum.yml diff --git a/src/test/spec/json/unified-test-format/invalid/runOnRequirement-topologies-items.json b/spec/unified-test-format/invalid/runOnRequirement-topologies-items.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/runOnRequirement-topologies-items.json rename to spec/unified-test-format/invalid/runOnRequirement-topologies-items.json diff --git a/src/test/spec/json/unified-test-format/invalid/runOnRequirement-topologies-items.yml b/spec/unified-test-format/invalid/runOnRequirement-topologies-items.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/runOnRequirement-topologies-items.yml rename to spec/unified-test-format/invalid/runOnRequirement-topologies-items.yml diff --git a/src/test/spec/json/unified-test-format/invalid/runOnRequirement-topologies-minItems.json b/spec/unified-test-format/invalid/runOnRequirement-topologies-minItems.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/runOnRequirement-topologies-minItems.json rename to spec/unified-test-format/invalid/runOnRequirement-topologies-minItems.json diff --git a/src/test/spec/json/unified-test-format/invalid/runOnRequirement-topologies-minItems.yml b/spec/unified-test-format/invalid/runOnRequirement-topologies-minItems.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/runOnRequirement-topologies-minItems.yml rename to spec/unified-test-format/invalid/runOnRequirement-topologies-minItems.yml diff --git a/src/test/spec/json/unified-test-format/invalid/runOnRequirement-topologies-type.json b/spec/unified-test-format/invalid/runOnRequirement-topologies-type.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/runOnRequirement-topologies-type.json rename to spec/unified-test-format/invalid/runOnRequirement-topologies-type.json diff --git a/src/test/spec/json/unified-test-format/invalid/runOnRequirement-topologies-type.yml b/spec/unified-test-format/invalid/runOnRequirement-topologies-type.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/runOnRequirement-topologies-type.yml rename to spec/unified-test-format/invalid/runOnRequirement-topologies-type.yml diff --git a/src/test/spec/json/unified-test-format/invalid/runOnRequirements-items.json b/spec/unified-test-format/invalid/runOnRequirements-items.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/runOnRequirements-items.json rename to spec/unified-test-format/invalid/runOnRequirements-items.json diff --git a/src/test/spec/json/unified-test-format/invalid/runOnRequirements-items.yml b/spec/unified-test-format/invalid/runOnRequirements-items.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/runOnRequirements-items.yml rename to spec/unified-test-format/invalid/runOnRequirements-items.yml diff --git a/src/test/spec/json/unified-test-format/invalid/runOnRequirements-minItems.json b/spec/unified-test-format/invalid/runOnRequirements-minItems.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/runOnRequirements-minItems.json rename to spec/unified-test-format/invalid/runOnRequirements-minItems.json diff --git a/src/test/spec/json/unified-test-format/invalid/runOnRequirements-minItems.yml b/spec/unified-test-format/invalid/runOnRequirements-minItems.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/runOnRequirements-minItems.yml rename to spec/unified-test-format/invalid/runOnRequirements-minItems.yml diff --git a/src/test/spec/json/unified-test-format/invalid/runOnRequirements-type.json b/spec/unified-test-format/invalid/runOnRequirements-type.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/runOnRequirements-type.json rename to spec/unified-test-format/invalid/runOnRequirements-type.json diff --git a/src/test/spec/json/unified-test-format/invalid/runOnRequirements-type.yml b/spec/unified-test-format/invalid/runOnRequirements-type.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/runOnRequirements-type.yml rename to spec/unified-test-format/invalid/runOnRequirements-type.yml diff --git a/src/test/spec/json/unified-test-format/invalid/schemaVersion-pattern.json b/spec/unified-test-format/invalid/schemaVersion-pattern.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/schemaVersion-pattern.json rename to spec/unified-test-format/invalid/schemaVersion-pattern.json diff --git a/src/test/spec/json/unified-test-format/invalid/schemaVersion-pattern.yml b/spec/unified-test-format/invalid/schemaVersion-pattern.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/schemaVersion-pattern.yml rename to spec/unified-test-format/invalid/schemaVersion-pattern.yml diff --git a/src/test/spec/json/unified-test-format/invalid/schemaVersion-required.json b/spec/unified-test-format/invalid/schemaVersion-required.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/schemaVersion-required.json rename to spec/unified-test-format/invalid/schemaVersion-required.json diff --git a/src/test/spec/json/unified-test-format/invalid/schemaVersion-required.yml b/spec/unified-test-format/invalid/schemaVersion-required.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/schemaVersion-required.yml rename to spec/unified-test-format/invalid/schemaVersion-required.yml diff --git a/src/test/spec/json/unified-test-format/invalid/schemaVersion-type.json b/spec/unified-test-format/invalid/schemaVersion-type.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/schemaVersion-type.json rename to spec/unified-test-format/invalid/schemaVersion-type.json diff --git a/src/test/spec/json/unified-test-format/invalid/schemaVersion-type.yml b/spec/unified-test-format/invalid/schemaVersion-type.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/schemaVersion-type.yml rename to spec/unified-test-format/invalid/schemaVersion-type.yml diff --git a/src/test/spec/json/unified-test-format/invalid/test-additionalProperties.json b/spec/unified-test-format/invalid/test-additionalProperties.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/test-additionalProperties.json rename to spec/unified-test-format/invalid/test-additionalProperties.json diff --git a/src/test/spec/json/unified-test-format/invalid/test-additionalProperties.yml b/spec/unified-test-format/invalid/test-additionalProperties.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/test-additionalProperties.yml rename to spec/unified-test-format/invalid/test-additionalProperties.yml diff --git a/src/test/spec/json/unified-test-format/invalid/test-description-required.json b/spec/unified-test-format/invalid/test-description-required.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/test-description-required.json rename to spec/unified-test-format/invalid/test-description-required.json diff --git a/src/test/spec/json/unified-test-format/invalid/test-description-required.yml b/spec/unified-test-format/invalid/test-description-required.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/test-description-required.yml rename to spec/unified-test-format/invalid/test-description-required.yml diff --git a/src/test/spec/json/unified-test-format/invalid/test-description-type.json b/spec/unified-test-format/invalid/test-description-type.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/test-description-type.json rename to spec/unified-test-format/invalid/test-description-type.json diff --git a/src/test/spec/json/unified-test-format/invalid/test-description-type.yml b/spec/unified-test-format/invalid/test-description-type.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/test-description-type.yml rename to spec/unified-test-format/invalid/test-description-type.yml diff --git a/src/test/spec/json/unified-test-format/invalid/test-expectEvents-items.json b/spec/unified-test-format/invalid/test-expectEvents-items.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/test-expectEvents-items.json rename to spec/unified-test-format/invalid/test-expectEvents-items.json diff --git a/src/test/spec/json/unified-test-format/invalid/test-expectEvents-items.yml b/spec/unified-test-format/invalid/test-expectEvents-items.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/test-expectEvents-items.yml rename to spec/unified-test-format/invalid/test-expectEvents-items.yml diff --git a/src/test/spec/json/unified-test-format/invalid/test-expectEvents-minItems.json b/spec/unified-test-format/invalid/test-expectEvents-minItems.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/test-expectEvents-minItems.json rename to spec/unified-test-format/invalid/test-expectEvents-minItems.json diff --git a/src/test/spec/json/unified-test-format/invalid/test-expectEvents-minItems.yml b/spec/unified-test-format/invalid/test-expectEvents-minItems.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/test-expectEvents-minItems.yml rename to spec/unified-test-format/invalid/test-expectEvents-minItems.yml diff --git a/src/test/spec/json/unified-test-format/invalid/test-expectEvents-type.json b/spec/unified-test-format/invalid/test-expectEvents-type.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/test-expectEvents-type.json rename to spec/unified-test-format/invalid/test-expectEvents-type.json diff --git a/src/test/spec/json/unified-test-format/invalid/test-expectEvents-type.yml b/spec/unified-test-format/invalid/test-expectEvents-type.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/test-expectEvents-type.yml rename to spec/unified-test-format/invalid/test-expectEvents-type.yml diff --git a/src/test/spec/json/unified-test-format/invalid/test-expectLogMessages-items.json b/spec/unified-test-format/invalid/test-expectLogMessages-items.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/test-expectLogMessages-items.json rename to spec/unified-test-format/invalid/test-expectLogMessages-items.json diff --git a/src/test/spec/json/unified-test-format/invalid/test-expectLogMessages-items.yml b/spec/unified-test-format/invalid/test-expectLogMessages-items.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/test-expectLogMessages-items.yml rename to spec/unified-test-format/invalid/test-expectLogMessages-items.yml diff --git a/src/test/spec/json/unified-test-format/invalid/test-expectLogMessages-minItems.json b/spec/unified-test-format/invalid/test-expectLogMessages-minItems.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/test-expectLogMessages-minItems.json rename to spec/unified-test-format/invalid/test-expectLogMessages-minItems.json diff --git a/src/test/spec/json/unified-test-format/invalid/test-expectLogMessages-minItems.yml b/spec/unified-test-format/invalid/test-expectLogMessages-minItems.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/test-expectLogMessages-minItems.yml rename to spec/unified-test-format/invalid/test-expectLogMessages-minItems.yml diff --git a/src/test/spec/json/unified-test-format/invalid/test-expectLogMessages-type.json b/spec/unified-test-format/invalid/test-expectLogMessages-type.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/test-expectLogMessages-type.json rename to spec/unified-test-format/invalid/test-expectLogMessages-type.json diff --git a/src/test/spec/json/unified-test-format/invalid/test-expectLogMessages-type.yml b/spec/unified-test-format/invalid/test-expectLogMessages-type.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/test-expectLogMessages-type.yml rename to spec/unified-test-format/invalid/test-expectLogMessages-type.yml diff --git a/src/test/spec/json/unified-test-format/invalid/test-operations-items.json b/spec/unified-test-format/invalid/test-operations-items.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/test-operations-items.json rename to spec/unified-test-format/invalid/test-operations-items.json diff --git a/src/test/spec/json/unified-test-format/invalid/test-operations-items.yml b/spec/unified-test-format/invalid/test-operations-items.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/test-operations-items.yml rename to spec/unified-test-format/invalid/test-operations-items.yml diff --git a/src/test/spec/json/unified-test-format/invalid/test-operations-required.json b/spec/unified-test-format/invalid/test-operations-required.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/test-operations-required.json rename to spec/unified-test-format/invalid/test-operations-required.json diff --git a/src/test/spec/json/unified-test-format/invalid/test-operations-required.yml b/spec/unified-test-format/invalid/test-operations-required.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/test-operations-required.yml rename to spec/unified-test-format/invalid/test-operations-required.yml diff --git a/src/test/spec/json/unified-test-format/invalid/test-operations-type.json b/spec/unified-test-format/invalid/test-operations-type.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/test-operations-type.json rename to spec/unified-test-format/invalid/test-operations-type.json diff --git a/src/test/spec/json/unified-test-format/invalid/test-operations-type.yml b/spec/unified-test-format/invalid/test-operations-type.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/test-operations-type.yml rename to spec/unified-test-format/invalid/test-operations-type.yml diff --git a/src/test/spec/json/unified-test-format/invalid/test-outcome-items.json b/spec/unified-test-format/invalid/test-outcome-items.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/test-outcome-items.json rename to spec/unified-test-format/invalid/test-outcome-items.json diff --git a/src/test/spec/json/unified-test-format/invalid/test-outcome-items.yml b/spec/unified-test-format/invalid/test-outcome-items.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/test-outcome-items.yml rename to spec/unified-test-format/invalid/test-outcome-items.yml diff --git a/src/test/spec/json/unified-test-format/invalid/test-outcome-minItems.json b/spec/unified-test-format/invalid/test-outcome-minItems.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/test-outcome-minItems.json rename to spec/unified-test-format/invalid/test-outcome-minItems.json diff --git a/src/test/spec/json/unified-test-format/invalid/test-outcome-minItems.yml b/spec/unified-test-format/invalid/test-outcome-minItems.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/test-outcome-minItems.yml rename to spec/unified-test-format/invalid/test-outcome-minItems.yml diff --git a/src/test/spec/json/unified-test-format/invalid/test-outcome-type.json b/spec/unified-test-format/invalid/test-outcome-type.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/test-outcome-type.json rename to spec/unified-test-format/invalid/test-outcome-type.json diff --git a/src/test/spec/json/unified-test-format/invalid/test-outcome-type.yml b/spec/unified-test-format/invalid/test-outcome-type.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/test-outcome-type.yml rename to spec/unified-test-format/invalid/test-outcome-type.yml diff --git a/src/test/spec/json/unified-test-format/invalid/test-runOnRequirements-items.json b/spec/unified-test-format/invalid/test-runOnRequirements-items.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/test-runOnRequirements-items.json rename to spec/unified-test-format/invalid/test-runOnRequirements-items.json diff --git a/src/test/spec/json/unified-test-format/invalid/test-runOnRequirements-items.yml b/spec/unified-test-format/invalid/test-runOnRequirements-items.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/test-runOnRequirements-items.yml rename to spec/unified-test-format/invalid/test-runOnRequirements-items.yml diff --git a/src/test/spec/json/unified-test-format/invalid/test-runOnRequirements-minItems.json b/spec/unified-test-format/invalid/test-runOnRequirements-minItems.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/test-runOnRequirements-minItems.json rename to spec/unified-test-format/invalid/test-runOnRequirements-minItems.json diff --git a/src/test/spec/json/unified-test-format/invalid/test-runOnRequirements-minItems.yml b/spec/unified-test-format/invalid/test-runOnRequirements-minItems.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/test-runOnRequirements-minItems.yml rename to spec/unified-test-format/invalid/test-runOnRequirements-minItems.yml diff --git a/src/test/spec/json/unified-test-format/invalid/test-runOnRequirements-type.json b/spec/unified-test-format/invalid/test-runOnRequirements-type.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/test-runOnRequirements-type.json rename to spec/unified-test-format/invalid/test-runOnRequirements-type.json diff --git a/src/test/spec/json/unified-test-format/invalid/test-runOnRequirements-type.yml b/spec/unified-test-format/invalid/test-runOnRequirements-type.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/test-runOnRequirements-type.yml rename to spec/unified-test-format/invalid/test-runOnRequirements-type.yml diff --git a/src/test/spec/json/unified-test-format/invalid/test-skipReason-type.json b/spec/unified-test-format/invalid/test-skipReason-type.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/test-skipReason-type.json rename to spec/unified-test-format/invalid/test-skipReason-type.json diff --git a/src/test/spec/json/unified-test-format/invalid/test-skipReason-type.yml b/spec/unified-test-format/invalid/test-skipReason-type.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/test-skipReason-type.yml rename to spec/unified-test-format/invalid/test-skipReason-type.yml diff --git a/src/test/spec/json/unified-test-format/invalid/tests-items.json b/spec/unified-test-format/invalid/tests-items.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/tests-items.json rename to spec/unified-test-format/invalid/tests-items.json diff --git a/src/test/spec/json/unified-test-format/invalid/tests-items.yml b/spec/unified-test-format/invalid/tests-items.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/tests-items.yml rename to spec/unified-test-format/invalid/tests-items.yml diff --git a/src/test/spec/json/unified-test-format/invalid/tests-minItems.json b/spec/unified-test-format/invalid/tests-minItems.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/tests-minItems.json rename to spec/unified-test-format/invalid/tests-minItems.json diff --git a/src/test/spec/json/unified-test-format/invalid/tests-minItems.yml b/spec/unified-test-format/invalid/tests-minItems.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/tests-minItems.yml rename to spec/unified-test-format/invalid/tests-minItems.yml diff --git a/src/test/spec/json/unified-test-format/invalid/tests-required.json b/spec/unified-test-format/invalid/tests-required.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/tests-required.json rename to spec/unified-test-format/invalid/tests-required.json diff --git a/src/test/spec/json/unified-test-format/invalid/tests-required.yml b/spec/unified-test-format/invalid/tests-required.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/tests-required.yml rename to spec/unified-test-format/invalid/tests-required.yml diff --git a/src/test/spec/json/unified-test-format/invalid/tests-type.json b/spec/unified-test-format/invalid/tests-type.json similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/tests-type.json rename to spec/unified-test-format/invalid/tests-type.json diff --git a/src/test/spec/json/unified-test-format/invalid/tests-type.yml b/spec/unified-test-format/invalid/tests-type.yml similarity index 100% rename from src/test/spec/json/unified-test-format/invalid/tests-type.yml rename to spec/unified-test-format/invalid/tests-type.yml diff --git a/src/test/spec/json/unified-test-format/valid-fail/assertNumberConnectionsCheckedOut.json b/spec/unified-test-format/valid-fail/assertNumberConnectionsCheckedOut.json similarity index 100% rename from src/test/spec/json/unified-test-format/valid-fail/assertNumberConnectionsCheckedOut.json rename to spec/unified-test-format/valid-fail/assertNumberConnectionsCheckedOut.json diff --git a/src/test/spec/json/unified-test-format/valid-fail/assertNumberConnectionsCheckedOut.yml b/spec/unified-test-format/valid-fail/assertNumberConnectionsCheckedOut.yml similarity index 100% rename from src/test/spec/json/unified-test-format/valid-fail/assertNumberConnectionsCheckedOut.yml rename to spec/unified-test-format/valid-fail/assertNumberConnectionsCheckedOut.yml diff --git a/src/test/spec/json/unified-test-format/valid-fail/entity-bucket-database-undefined.json b/spec/unified-test-format/valid-fail/entity-bucket-database-undefined.json similarity index 100% rename from src/test/spec/json/unified-test-format/valid-fail/entity-bucket-database-undefined.json rename to spec/unified-test-format/valid-fail/entity-bucket-database-undefined.json diff --git a/src/test/spec/json/unified-test-format/valid-fail/entity-bucket-database-undefined.yml b/spec/unified-test-format/valid-fail/entity-bucket-database-undefined.yml similarity index 100% rename from src/test/spec/json/unified-test-format/valid-fail/entity-bucket-database-undefined.yml rename to spec/unified-test-format/valid-fail/entity-bucket-database-undefined.yml diff --git a/src/test/spec/json/unified-test-format/valid-fail/entity-client-apiVersion-unsupported.json b/spec/unified-test-format/valid-fail/entity-client-apiVersion-unsupported.json similarity index 100% rename from src/test/spec/json/unified-test-format/valid-fail/entity-client-apiVersion-unsupported.json rename to spec/unified-test-format/valid-fail/entity-client-apiVersion-unsupported.json diff --git a/src/test/spec/json/unified-test-format/valid-fail/entity-client-apiVersion-unsupported.yml b/spec/unified-test-format/valid-fail/entity-client-apiVersion-unsupported.yml similarity index 100% rename from src/test/spec/json/unified-test-format/valid-fail/entity-client-apiVersion-unsupported.yml rename to spec/unified-test-format/valid-fail/entity-client-apiVersion-unsupported.yml diff --git a/src/test/spec/json/unified-test-format/valid-fail/entity-collection-database-undefined.json b/spec/unified-test-format/valid-fail/entity-collection-database-undefined.json similarity index 100% rename from src/test/spec/json/unified-test-format/valid-fail/entity-collection-database-undefined.json rename to spec/unified-test-format/valid-fail/entity-collection-database-undefined.json diff --git a/src/test/spec/json/unified-test-format/valid-fail/entity-collection-database-undefined.yml b/spec/unified-test-format/valid-fail/entity-collection-database-undefined.yml similarity index 100% rename from src/test/spec/json/unified-test-format/valid-fail/entity-collection-database-undefined.yml rename to spec/unified-test-format/valid-fail/entity-collection-database-undefined.yml diff --git a/src/test/spec/json/unified-test-format/valid-fail/entity-database-client-undefined.json b/spec/unified-test-format/valid-fail/entity-database-client-undefined.json similarity index 100% rename from src/test/spec/json/unified-test-format/valid-fail/entity-database-client-undefined.json rename to spec/unified-test-format/valid-fail/entity-database-client-undefined.json diff --git a/src/test/spec/json/unified-test-format/valid-fail/entity-database-client-undefined.yml b/spec/unified-test-format/valid-fail/entity-database-client-undefined.yml similarity index 100% rename from src/test/spec/json/unified-test-format/valid-fail/entity-database-client-undefined.yml rename to spec/unified-test-format/valid-fail/entity-database-client-undefined.yml diff --git a/src/test/spec/json/unified-test-format/valid-fail/entity-findCursor-malformed.json b/spec/unified-test-format/valid-fail/entity-findCursor-malformed.json similarity index 100% rename from src/test/spec/json/unified-test-format/valid-fail/entity-findCursor-malformed.json rename to spec/unified-test-format/valid-fail/entity-findCursor-malformed.json diff --git a/src/test/spec/json/unified-test-format/valid-fail/entity-findCursor-malformed.yml b/spec/unified-test-format/valid-fail/entity-findCursor-malformed.yml similarity index 100% rename from src/test/spec/json/unified-test-format/valid-fail/entity-findCursor-malformed.yml rename to spec/unified-test-format/valid-fail/entity-findCursor-malformed.yml diff --git a/src/test/spec/json/unified-test-format/valid-fail/entity-findCursor.json b/spec/unified-test-format/valid-fail/entity-findCursor.json similarity index 100% rename from src/test/spec/json/unified-test-format/valid-fail/entity-findCursor.json rename to spec/unified-test-format/valid-fail/entity-findCursor.json diff --git a/src/test/spec/json/unified-test-format/valid-fail/entity-findCursor.yml b/spec/unified-test-format/valid-fail/entity-findCursor.yml similarity index 100% rename from src/test/spec/json/unified-test-format/valid-fail/entity-findCursor.yml rename to spec/unified-test-format/valid-fail/entity-findCursor.yml diff --git a/src/test/spec/json/unified-test-format/valid-fail/entity-session-client-undefined.json b/spec/unified-test-format/valid-fail/entity-session-client-undefined.json similarity index 100% rename from src/test/spec/json/unified-test-format/valid-fail/entity-session-client-undefined.json rename to spec/unified-test-format/valid-fail/entity-session-client-undefined.json diff --git a/src/test/spec/json/unified-test-format/valid-fail/entity-session-client-undefined.yml b/spec/unified-test-format/valid-fail/entity-session-client-undefined.yml similarity index 100% rename from src/test/spec/json/unified-test-format/valid-fail/entity-session-client-undefined.yml rename to spec/unified-test-format/valid-fail/entity-session-client-undefined.yml diff --git a/src/test/spec/json/unified-test-format/valid-fail/ignoreResultAndError-malformed.json b/spec/unified-test-format/valid-fail/ignoreResultAndError-malformed.json similarity index 100% rename from src/test/spec/json/unified-test-format/valid-fail/ignoreResultAndError-malformed.json rename to spec/unified-test-format/valid-fail/ignoreResultAndError-malformed.json diff --git a/src/test/spec/json/unified-test-format/valid-fail/ignoreResultAndError-malformed.yml b/spec/unified-test-format/valid-fail/ignoreResultAndError-malformed.yml similarity index 100% rename from src/test/spec/json/unified-test-format/valid-fail/ignoreResultAndError-malformed.yml rename to spec/unified-test-format/valid-fail/ignoreResultAndError-malformed.yml diff --git a/src/test/spec/json/unified-test-format/valid-fail/ignoreResultAndError.json b/spec/unified-test-format/valid-fail/ignoreResultAndError.json similarity index 100% rename from src/test/spec/json/unified-test-format/valid-fail/ignoreResultAndError.json rename to spec/unified-test-format/valid-fail/ignoreResultAndError.json diff --git a/src/test/spec/json/unified-test-format/valid-fail/ignoreResultAndError.yml b/spec/unified-test-format/valid-fail/ignoreResultAndError.yml similarity index 100% rename from src/test/spec/json/unified-test-format/valid-fail/ignoreResultAndError.yml rename to spec/unified-test-format/valid-fail/ignoreResultAndError.yml diff --git a/src/test/spec/json/unified-test-format/valid-fail/kmsProviders-missing_aws_kms_credentials.json b/spec/unified-test-format/valid-fail/kmsProviders-missing_aws_kms_credentials.json similarity index 100% rename from src/test/spec/json/unified-test-format/valid-fail/kmsProviders-missing_aws_kms_credentials.json rename to spec/unified-test-format/valid-fail/kmsProviders-missing_aws_kms_credentials.json diff --git a/src/test/spec/json/unified-test-format/valid-fail/kmsProviders-missing_aws_kms_credentials.yml b/spec/unified-test-format/valid-fail/kmsProviders-missing_aws_kms_credentials.yml similarity index 100% rename from src/test/spec/json/unified-test-format/valid-fail/kmsProviders-missing_aws_kms_credentials.yml rename to spec/unified-test-format/valid-fail/kmsProviders-missing_aws_kms_credentials.yml diff --git a/src/test/spec/json/unified-test-format/valid-fail/kmsProviders-missing_azure_kms_credentials.json b/spec/unified-test-format/valid-fail/kmsProviders-missing_azure_kms_credentials.json similarity index 100% rename from src/test/spec/json/unified-test-format/valid-fail/kmsProviders-missing_azure_kms_credentials.json rename to spec/unified-test-format/valid-fail/kmsProviders-missing_azure_kms_credentials.json diff --git a/src/test/spec/json/unified-test-format/valid-fail/kmsProviders-missing_azure_kms_credentials.yml b/spec/unified-test-format/valid-fail/kmsProviders-missing_azure_kms_credentials.yml similarity index 100% rename from src/test/spec/json/unified-test-format/valid-fail/kmsProviders-missing_azure_kms_credentials.yml rename to spec/unified-test-format/valid-fail/kmsProviders-missing_azure_kms_credentials.yml diff --git a/src/test/spec/json/unified-test-format/valid-fail/kmsProviders-missing_gcp_kms_credentials.json b/spec/unified-test-format/valid-fail/kmsProviders-missing_gcp_kms_credentials.json similarity index 100% rename from src/test/spec/json/unified-test-format/valid-fail/kmsProviders-missing_gcp_kms_credentials.json rename to spec/unified-test-format/valid-fail/kmsProviders-missing_gcp_kms_credentials.json diff --git a/src/test/spec/json/unified-test-format/valid-fail/kmsProviders-missing_gcp_kms_credentials.yml b/spec/unified-test-format/valid-fail/kmsProviders-missing_gcp_kms_credentials.yml similarity index 100% rename from src/test/spec/json/unified-test-format/valid-fail/kmsProviders-missing_gcp_kms_credentials.yml rename to spec/unified-test-format/valid-fail/kmsProviders-missing_gcp_kms_credentials.yml diff --git a/src/test/spec/json/unified-test-format/valid-fail/kmsProviders-no_kms.json b/spec/unified-test-format/valid-fail/kmsProviders-no_kms.json similarity index 100% rename from src/test/spec/json/unified-test-format/valid-fail/kmsProviders-no_kms.json rename to spec/unified-test-format/valid-fail/kmsProviders-no_kms.json diff --git a/src/test/spec/json/unified-test-format/valid-fail/kmsProviders-no_kms.yml b/spec/unified-test-format/valid-fail/kmsProviders-no_kms.yml similarity index 100% rename from src/test/spec/json/unified-test-format/valid-fail/kmsProviders-no_kms.yml rename to spec/unified-test-format/valid-fail/kmsProviders-no_kms.yml diff --git a/src/test/spec/json/unified-test-format/valid-fail/operation-failure.json b/spec/unified-test-format/valid-fail/operation-failure.json similarity index 100% rename from src/test/spec/json/unified-test-format/valid-fail/operation-failure.json rename to spec/unified-test-format/valid-fail/operation-failure.json diff --git a/src/test/spec/json/unified-test-format/valid-fail/operation-failure.yml b/spec/unified-test-format/valid-fail/operation-failure.yml similarity index 100% rename from src/test/spec/json/unified-test-format/valid-fail/operation-failure.yml rename to spec/unified-test-format/valid-fail/operation-failure.yml diff --git a/src/test/spec/json/unified-test-format/valid-fail/operation-unsupported.json b/spec/unified-test-format/valid-fail/operation-unsupported.json similarity index 100% rename from src/test/spec/json/unified-test-format/valid-fail/operation-unsupported.json rename to spec/unified-test-format/valid-fail/operation-unsupported.json diff --git a/src/test/spec/json/unified-test-format/valid-fail/operation-unsupported.yml b/spec/unified-test-format/valid-fail/operation-unsupported.yml similarity index 100% rename from src/test/spec/json/unified-test-format/valid-fail/operation-unsupported.yml rename to spec/unified-test-format/valid-fail/operation-unsupported.yml diff --git a/src/test/spec/json/unified-test-format/valid-fail/operator-matchAsDocument.json b/spec/unified-test-format/valid-fail/operator-matchAsDocument.json similarity index 100% rename from src/test/spec/json/unified-test-format/valid-fail/operator-matchAsDocument.json rename to spec/unified-test-format/valid-fail/operator-matchAsDocument.json diff --git a/src/test/spec/json/unified-test-format/valid-fail/operator-matchAsDocument.yml b/spec/unified-test-format/valid-fail/operator-matchAsDocument.yml similarity index 100% rename from src/test/spec/json/unified-test-format/valid-fail/operator-matchAsDocument.yml rename to spec/unified-test-format/valid-fail/operator-matchAsDocument.yml diff --git a/src/test/spec/json/unified-test-format/valid-fail/operator-matchAsRoot.json b/spec/unified-test-format/valid-fail/operator-matchAsRoot.json similarity index 100% rename from src/test/spec/json/unified-test-format/valid-fail/operator-matchAsRoot.json rename to spec/unified-test-format/valid-fail/operator-matchAsRoot.json diff --git a/src/test/spec/json/unified-test-format/valid-fail/operator-matchAsRoot.yml b/spec/unified-test-format/valid-fail/operator-matchAsRoot.yml similarity index 100% rename from src/test/spec/json/unified-test-format/valid-fail/operator-matchAsRoot.yml rename to spec/unified-test-format/valid-fail/operator-matchAsRoot.yml diff --git a/src/test/spec/json/unified-test-format/valid-fail/returnDocument-enum-invalid.json b/spec/unified-test-format/valid-fail/returnDocument-enum-invalid.json similarity index 100% rename from src/test/spec/json/unified-test-format/valid-fail/returnDocument-enum-invalid.json rename to spec/unified-test-format/valid-fail/returnDocument-enum-invalid.json diff --git a/src/test/spec/json/unified-test-format/valid-fail/returnDocument-enum-invalid.yml b/spec/unified-test-format/valid-fail/returnDocument-enum-invalid.yml similarity index 100% rename from src/test/spec/json/unified-test-format/valid-fail/returnDocument-enum-invalid.yml rename to spec/unified-test-format/valid-fail/returnDocument-enum-invalid.yml diff --git a/src/test/spec/json/unified-test-format/valid-fail/schemaVersion-unsupported.json b/spec/unified-test-format/valid-fail/schemaVersion-unsupported.json similarity index 100% rename from src/test/spec/json/unified-test-format/valid-fail/schemaVersion-unsupported.json rename to spec/unified-test-format/valid-fail/schemaVersion-unsupported.json diff --git a/src/test/spec/json/unified-test-format/valid-fail/schemaVersion-unsupported.yml b/spec/unified-test-format/valid-fail/schemaVersion-unsupported.yml similarity index 100% rename from src/test/spec/json/unified-test-format/valid-fail/schemaVersion-unsupported.yml rename to spec/unified-test-format/valid-fail/schemaVersion-unsupported.yml diff --git a/src/test/spec/json/unified-test-format/valid-pass/assertNumberConnectionsCheckedOut.json b/spec/unified-test-format/valid-pass/assertNumberConnectionsCheckedOut.json similarity index 100% rename from src/test/spec/json/unified-test-format/valid-pass/assertNumberConnectionsCheckedOut.json rename to spec/unified-test-format/valid-pass/assertNumberConnectionsCheckedOut.json diff --git a/src/test/spec/json/unified-test-format/valid-pass/assertNumberConnectionsCheckedOut.yml b/spec/unified-test-format/valid-pass/assertNumberConnectionsCheckedOut.yml similarity index 100% rename from src/test/spec/json/unified-test-format/valid-pass/assertNumberConnectionsCheckedOut.yml rename to spec/unified-test-format/valid-pass/assertNumberConnectionsCheckedOut.yml diff --git a/src/test/spec/json/unified-test-format/valid-pass/collectionData-createOptions.json b/spec/unified-test-format/valid-pass/collectionData-createOptions.json similarity index 100% rename from src/test/spec/json/unified-test-format/valid-pass/collectionData-createOptions.json rename to spec/unified-test-format/valid-pass/collectionData-createOptions.json diff --git a/src/test/spec/json/unified-test-format/valid-pass/collectionData-createOptions.yml b/spec/unified-test-format/valid-pass/collectionData-createOptions.yml similarity index 100% rename from src/test/spec/json/unified-test-format/valid-pass/collectionData-createOptions.yml rename to spec/unified-test-format/valid-pass/collectionData-createOptions.yml diff --git a/src/test/spec/json/unified-test-format/valid-pass/createEntities-operation.json b/spec/unified-test-format/valid-pass/createEntities-operation.json similarity index 100% rename from src/test/spec/json/unified-test-format/valid-pass/createEntities-operation.json rename to spec/unified-test-format/valid-pass/createEntities-operation.json diff --git a/src/test/spec/json/unified-test-format/valid-pass/createEntities-operation.yml b/spec/unified-test-format/valid-pass/createEntities-operation.yml similarity index 100% rename from src/test/spec/json/unified-test-format/valid-pass/createEntities-operation.yml rename to spec/unified-test-format/valid-pass/createEntities-operation.yml diff --git a/src/test/spec/json/unified-test-format/valid-pass/entity-client-cmap-events.json b/spec/unified-test-format/valid-pass/entity-client-cmap-events.json similarity index 100% rename from src/test/spec/json/unified-test-format/valid-pass/entity-client-cmap-events.json rename to spec/unified-test-format/valid-pass/entity-client-cmap-events.json diff --git a/src/test/spec/json/unified-test-format/valid-pass/entity-client-cmap-events.yml b/spec/unified-test-format/valid-pass/entity-client-cmap-events.yml similarity index 100% rename from src/test/spec/json/unified-test-format/valid-pass/entity-client-cmap-events.yml rename to spec/unified-test-format/valid-pass/entity-client-cmap-events.yml diff --git a/src/test/spec/json/unified-test-format/valid-pass/entity-commandCursor.json b/spec/unified-test-format/valid-pass/entity-commandCursor.json similarity index 100% rename from src/test/spec/json/unified-test-format/valid-pass/entity-commandCursor.json rename to spec/unified-test-format/valid-pass/entity-commandCursor.json diff --git a/src/test/spec/json/unified-test-format/valid-pass/entity-commandCursor.yml b/spec/unified-test-format/valid-pass/entity-commandCursor.yml similarity index 100% rename from src/test/spec/json/unified-test-format/valid-pass/entity-commandCursor.yml rename to spec/unified-test-format/valid-pass/entity-commandCursor.yml diff --git a/src/test/spec/json/unified-test-format/valid-pass/entity-cursor-iterateOnce.json b/spec/unified-test-format/valid-pass/entity-cursor-iterateOnce.json similarity index 100% rename from src/test/spec/json/unified-test-format/valid-pass/entity-cursor-iterateOnce.json rename to spec/unified-test-format/valid-pass/entity-cursor-iterateOnce.json diff --git a/src/test/spec/json/unified-test-format/valid-pass/entity-cursor-iterateOnce.yml b/spec/unified-test-format/valid-pass/entity-cursor-iterateOnce.yml similarity index 100% rename from src/test/spec/json/unified-test-format/valid-pass/entity-cursor-iterateOnce.yml rename to spec/unified-test-format/valid-pass/entity-cursor-iterateOnce.yml diff --git a/src/test/spec/json/unified-test-format/valid-pass/entity-find-cursor.json b/spec/unified-test-format/valid-pass/entity-find-cursor.json similarity index 100% rename from src/test/spec/json/unified-test-format/valid-pass/entity-find-cursor.json rename to spec/unified-test-format/valid-pass/entity-find-cursor.json diff --git a/src/test/spec/json/unified-test-format/valid-pass/entity-find-cursor.yml b/spec/unified-test-format/valid-pass/entity-find-cursor.yml similarity index 100% rename from src/test/spec/json/unified-test-format/valid-pass/entity-find-cursor.yml rename to spec/unified-test-format/valid-pass/entity-find-cursor.yml diff --git a/src/test/spec/json/unified-test-format/valid-pass/expectedError-errorResponse.json b/spec/unified-test-format/valid-pass/expectedError-errorResponse.json similarity index 100% rename from src/test/spec/json/unified-test-format/valid-pass/expectedError-errorResponse.json rename to spec/unified-test-format/valid-pass/expectedError-errorResponse.json diff --git a/src/test/spec/json/unified-test-format/valid-pass/expectedError-errorResponse.yml b/spec/unified-test-format/valid-pass/expectedError-errorResponse.yml similarity index 100% rename from src/test/spec/json/unified-test-format/valid-pass/expectedError-errorResponse.yml rename to spec/unified-test-format/valid-pass/expectedError-errorResponse.yml diff --git a/src/test/spec/json/unified-test-format/valid-pass/expectedError-isClientError.json b/spec/unified-test-format/valid-pass/expectedError-isClientError.json similarity index 100% rename from src/test/spec/json/unified-test-format/valid-pass/expectedError-isClientError.json rename to spec/unified-test-format/valid-pass/expectedError-isClientError.json diff --git a/src/test/spec/json/unified-test-format/valid-pass/expectedError-isClientError.yml b/spec/unified-test-format/valid-pass/expectedError-isClientError.yml similarity index 100% rename from src/test/spec/json/unified-test-format/valid-pass/expectedError-isClientError.yml rename to spec/unified-test-format/valid-pass/expectedError-isClientError.yml diff --git a/src/test/spec/json/unified-test-format/valid-pass/expectedEventsForClient-eventType.json b/spec/unified-test-format/valid-pass/expectedEventsForClient-eventType.json similarity index 100% rename from src/test/spec/json/unified-test-format/valid-pass/expectedEventsForClient-eventType.json rename to spec/unified-test-format/valid-pass/expectedEventsForClient-eventType.json diff --git a/src/test/spec/json/unified-test-format/valid-pass/expectedEventsForClient-eventType.yml b/spec/unified-test-format/valid-pass/expectedEventsForClient-eventType.yml similarity index 100% rename from src/test/spec/json/unified-test-format/valid-pass/expectedEventsForClient-eventType.yml rename to spec/unified-test-format/valid-pass/expectedEventsForClient-eventType.yml diff --git a/src/test/spec/json/unified-test-format/valid-pass/expectedEventsForClient-ignoreExtraEvents.json b/spec/unified-test-format/valid-pass/expectedEventsForClient-ignoreExtraEvents.json similarity index 100% rename from src/test/spec/json/unified-test-format/valid-pass/expectedEventsForClient-ignoreExtraEvents.json rename to spec/unified-test-format/valid-pass/expectedEventsForClient-ignoreExtraEvents.json diff --git a/src/test/spec/json/unified-test-format/valid-pass/expectedEventsForClient-ignoreExtraEvents.yml b/spec/unified-test-format/valid-pass/expectedEventsForClient-ignoreExtraEvents.yml similarity index 100% rename from src/test/spec/json/unified-test-format/valid-pass/expectedEventsForClient-ignoreExtraEvents.yml rename to spec/unified-test-format/valid-pass/expectedEventsForClient-ignoreExtraEvents.yml diff --git a/src/test/spec/json/unified-test-format/valid-pass/expectedEventsForClient-topologyDescriptionChangedEvent.json b/spec/unified-test-format/valid-pass/expectedEventsForClient-topologyDescriptionChangedEvent.json similarity index 100% rename from src/test/spec/json/unified-test-format/valid-pass/expectedEventsForClient-topologyDescriptionChangedEvent.json rename to spec/unified-test-format/valid-pass/expectedEventsForClient-topologyDescriptionChangedEvent.json diff --git a/src/test/spec/json/unified-test-format/valid-pass/expectedEventsForClient-topologyDescriptionChangedEvent.yml b/spec/unified-test-format/valid-pass/expectedEventsForClient-topologyDescriptionChangedEvent.yml similarity index 100% rename from src/test/spec/json/unified-test-format/valid-pass/expectedEventsForClient-topologyDescriptionChangedEvent.yml rename to spec/unified-test-format/valid-pass/expectedEventsForClient-topologyDescriptionChangedEvent.yml diff --git a/src/test/spec/json/unified-test-format/valid-pass/ignoreResultAndError.json b/spec/unified-test-format/valid-pass/ignoreResultAndError.json similarity index 100% rename from src/test/spec/json/unified-test-format/valid-pass/ignoreResultAndError.json rename to spec/unified-test-format/valid-pass/ignoreResultAndError.json diff --git a/src/test/spec/json/unified-test-format/valid-pass/ignoreResultAndError.yml b/spec/unified-test-format/valid-pass/ignoreResultAndError.yml similarity index 100% rename from src/test/spec/json/unified-test-format/valid-pass/ignoreResultAndError.yml rename to spec/unified-test-format/valid-pass/ignoreResultAndError.yml diff --git a/src/test/spec/json/unified-test-format/valid-pass/kmsProviders-explicit_kms_credentials.json b/spec/unified-test-format/valid-pass/kmsProviders-explicit_kms_credentials.json similarity index 100% rename from src/test/spec/json/unified-test-format/valid-pass/kmsProviders-explicit_kms_credentials.json rename to spec/unified-test-format/valid-pass/kmsProviders-explicit_kms_credentials.json diff --git a/src/test/spec/json/unified-test-format/valid-pass/kmsProviders-explicit_kms_credentials.yml b/spec/unified-test-format/valid-pass/kmsProviders-explicit_kms_credentials.yml similarity index 100% rename from src/test/spec/json/unified-test-format/valid-pass/kmsProviders-explicit_kms_credentials.yml rename to spec/unified-test-format/valid-pass/kmsProviders-explicit_kms_credentials.yml diff --git a/src/test/spec/json/unified-test-format/valid-pass/kmsProviders-mixed_kms_credential_fields.json b/spec/unified-test-format/valid-pass/kmsProviders-mixed_kms_credential_fields.json similarity index 100% rename from src/test/spec/json/unified-test-format/valid-pass/kmsProviders-mixed_kms_credential_fields.json rename to spec/unified-test-format/valid-pass/kmsProviders-mixed_kms_credential_fields.json diff --git a/src/test/spec/json/unified-test-format/valid-pass/kmsProviders-mixed_kms_credential_fields.yml b/spec/unified-test-format/valid-pass/kmsProviders-mixed_kms_credential_fields.yml similarity index 100% rename from src/test/spec/json/unified-test-format/valid-pass/kmsProviders-mixed_kms_credential_fields.yml rename to spec/unified-test-format/valid-pass/kmsProviders-mixed_kms_credential_fields.yml diff --git a/src/test/spec/json/unified-test-format/valid-pass/kmsProviders-placeholder_kms_credentials.json b/spec/unified-test-format/valid-pass/kmsProviders-placeholder_kms_credentials.json similarity index 100% rename from src/test/spec/json/unified-test-format/valid-pass/kmsProviders-placeholder_kms_credentials.json rename to spec/unified-test-format/valid-pass/kmsProviders-placeholder_kms_credentials.json diff --git a/src/test/spec/json/unified-test-format/valid-pass/kmsProviders-placeholder_kms_credentials.yml b/spec/unified-test-format/valid-pass/kmsProviders-placeholder_kms_credentials.yml similarity index 100% rename from src/test/spec/json/unified-test-format/valid-pass/kmsProviders-placeholder_kms_credentials.yml rename to spec/unified-test-format/valid-pass/kmsProviders-placeholder_kms_credentials.yml diff --git a/src/test/spec/json/unified-test-format/valid-pass/kmsProviders-unconfigured_kms.json b/spec/unified-test-format/valid-pass/kmsProviders-unconfigured_kms.json similarity index 100% rename from src/test/spec/json/unified-test-format/valid-pass/kmsProviders-unconfigured_kms.json rename to spec/unified-test-format/valid-pass/kmsProviders-unconfigured_kms.json diff --git a/src/test/spec/json/unified-test-format/valid-pass/kmsProviders-unconfigured_kms.yml b/spec/unified-test-format/valid-pass/kmsProviders-unconfigured_kms.yml similarity index 100% rename from src/test/spec/json/unified-test-format/valid-pass/kmsProviders-unconfigured_kms.yml rename to spec/unified-test-format/valid-pass/kmsProviders-unconfigured_kms.yml diff --git a/src/test/spec/json/unified-test-format/valid-pass/observeSensitiveCommands.json b/spec/unified-test-format/valid-pass/observeSensitiveCommands.json similarity index 100% rename from src/test/spec/json/unified-test-format/valid-pass/observeSensitiveCommands.json rename to spec/unified-test-format/valid-pass/observeSensitiveCommands.json diff --git a/src/test/spec/json/unified-test-format/valid-pass/observeSensitiveCommands.yml b/spec/unified-test-format/valid-pass/observeSensitiveCommands.yml similarity index 100% rename from src/test/spec/json/unified-test-format/valid-pass/observeSensitiveCommands.yml rename to spec/unified-test-format/valid-pass/observeSensitiveCommands.yml diff --git a/src/test/spec/json/unified-test-format/valid-pass/operation-empty_array.json b/spec/unified-test-format/valid-pass/operation-empty_array.json similarity index 100% rename from src/test/spec/json/unified-test-format/valid-pass/operation-empty_array.json rename to spec/unified-test-format/valid-pass/operation-empty_array.json diff --git a/src/test/spec/json/unified-test-format/valid-pass/operation-empty_array.yml b/spec/unified-test-format/valid-pass/operation-empty_array.yml similarity index 100% rename from src/test/spec/json/unified-test-format/valid-pass/operation-empty_array.yml rename to spec/unified-test-format/valid-pass/operation-empty_array.yml diff --git a/src/test/spec/json/unified-test-format/valid-pass/operator-lte.json b/spec/unified-test-format/valid-pass/operator-lte.json similarity index 100% rename from src/test/spec/json/unified-test-format/valid-pass/operator-lte.json rename to spec/unified-test-format/valid-pass/operator-lte.json diff --git a/src/test/spec/json/unified-test-format/valid-pass/operator-lte.yml b/spec/unified-test-format/valid-pass/operator-lte.yml similarity index 100% rename from src/test/spec/json/unified-test-format/valid-pass/operator-lte.yml rename to spec/unified-test-format/valid-pass/operator-lte.yml diff --git a/src/test/spec/json/unified-test-format/valid-pass/operator-matchAsDocument.json b/spec/unified-test-format/valid-pass/operator-matchAsDocument.json similarity index 100% rename from src/test/spec/json/unified-test-format/valid-pass/operator-matchAsDocument.json rename to spec/unified-test-format/valid-pass/operator-matchAsDocument.json diff --git a/src/test/spec/json/unified-test-format/valid-pass/operator-matchAsDocument.yml b/spec/unified-test-format/valid-pass/operator-matchAsDocument.yml similarity index 100% rename from src/test/spec/json/unified-test-format/valid-pass/operator-matchAsDocument.yml rename to spec/unified-test-format/valid-pass/operator-matchAsDocument.yml diff --git a/src/test/spec/json/unified-test-format/valid-pass/operator-matchAsRoot.json b/spec/unified-test-format/valid-pass/operator-matchAsRoot.json similarity index 100% rename from src/test/spec/json/unified-test-format/valid-pass/operator-matchAsRoot.json rename to spec/unified-test-format/valid-pass/operator-matchAsRoot.json diff --git a/src/test/spec/json/unified-test-format/valid-pass/operator-matchAsRoot.yml b/spec/unified-test-format/valid-pass/operator-matchAsRoot.yml similarity index 100% rename from src/test/spec/json/unified-test-format/valid-pass/operator-matchAsRoot.yml rename to spec/unified-test-format/valid-pass/operator-matchAsRoot.yml diff --git a/src/test/spec/json/unified-test-format/valid-pass/operator-type-number_alias.json b/spec/unified-test-format/valid-pass/operator-type-number_alias.json similarity index 100% rename from src/test/spec/json/unified-test-format/valid-pass/operator-type-number_alias.json rename to spec/unified-test-format/valid-pass/operator-type-number_alias.json diff --git a/src/test/spec/json/unified-test-format/valid-pass/operator-type-number_alias.yml b/spec/unified-test-format/valid-pass/operator-type-number_alias.yml similarity index 100% rename from src/test/spec/json/unified-test-format/valid-pass/operator-type-number_alias.yml rename to spec/unified-test-format/valid-pass/operator-type-number_alias.yml diff --git a/src/test/spec/json/unified-test-format/valid-pass/poc-change-streams.json b/spec/unified-test-format/valid-pass/poc-change-streams.json similarity index 100% rename from src/test/spec/json/unified-test-format/valid-pass/poc-change-streams.json rename to spec/unified-test-format/valid-pass/poc-change-streams.json diff --git a/src/test/spec/json/unified-test-format/valid-pass/poc-change-streams.yml b/spec/unified-test-format/valid-pass/poc-change-streams.yml similarity index 100% rename from src/test/spec/json/unified-test-format/valid-pass/poc-change-streams.yml rename to spec/unified-test-format/valid-pass/poc-change-streams.yml diff --git a/src/test/spec/json/unified-test-format/valid-pass/poc-command-monitoring.json b/spec/unified-test-format/valid-pass/poc-command-monitoring.json similarity index 100% rename from src/test/spec/json/unified-test-format/valid-pass/poc-command-monitoring.json rename to spec/unified-test-format/valid-pass/poc-command-monitoring.json diff --git a/src/test/spec/json/unified-test-format/valid-pass/poc-command-monitoring.yml b/spec/unified-test-format/valid-pass/poc-command-monitoring.yml similarity index 100% rename from src/test/spec/json/unified-test-format/valid-pass/poc-command-monitoring.yml rename to spec/unified-test-format/valid-pass/poc-command-monitoring.yml diff --git a/src/test/spec/json/unified-test-format/valid-pass/poc-crud.json b/spec/unified-test-format/valid-pass/poc-crud.json similarity index 100% rename from src/test/spec/json/unified-test-format/valid-pass/poc-crud.json rename to spec/unified-test-format/valid-pass/poc-crud.json diff --git a/src/test/spec/json/unified-test-format/valid-pass/poc-crud.yml b/spec/unified-test-format/valid-pass/poc-crud.yml similarity index 100% rename from src/test/spec/json/unified-test-format/valid-pass/poc-crud.yml rename to spec/unified-test-format/valid-pass/poc-crud.yml diff --git a/src/test/spec/json/unified-test-format/valid-pass/poc-gridfs.json b/spec/unified-test-format/valid-pass/poc-gridfs.json similarity index 100% rename from src/test/spec/json/unified-test-format/valid-pass/poc-gridfs.json rename to spec/unified-test-format/valid-pass/poc-gridfs.json diff --git a/src/test/spec/json/unified-test-format/valid-pass/poc-gridfs.yml b/spec/unified-test-format/valid-pass/poc-gridfs.yml similarity index 100% rename from src/test/spec/json/unified-test-format/valid-pass/poc-gridfs.yml rename to spec/unified-test-format/valid-pass/poc-gridfs.yml diff --git a/src/test/spec/json/unified-test-format/valid-pass/poc-queryable-encryption.json b/spec/unified-test-format/valid-pass/poc-queryable-encryption.json similarity index 100% rename from src/test/spec/json/unified-test-format/valid-pass/poc-queryable-encryption.json rename to spec/unified-test-format/valid-pass/poc-queryable-encryption.json diff --git a/src/test/spec/json/unified-test-format/valid-pass/poc-queryable-encryption.yml b/spec/unified-test-format/valid-pass/poc-queryable-encryption.yml similarity index 100% rename from src/test/spec/json/unified-test-format/valid-pass/poc-queryable-encryption.yml rename to spec/unified-test-format/valid-pass/poc-queryable-encryption.yml diff --git a/src/test/spec/json/unified-test-format/valid-pass/poc-retryable-reads.json b/spec/unified-test-format/valid-pass/poc-retryable-reads.json similarity index 100% rename from src/test/spec/json/unified-test-format/valid-pass/poc-retryable-reads.json rename to spec/unified-test-format/valid-pass/poc-retryable-reads.json diff --git a/src/test/spec/json/unified-test-format/valid-pass/poc-retryable-reads.yml b/spec/unified-test-format/valid-pass/poc-retryable-reads.yml similarity index 100% rename from src/test/spec/json/unified-test-format/valid-pass/poc-retryable-reads.yml rename to spec/unified-test-format/valid-pass/poc-retryable-reads.yml diff --git a/src/test/spec/json/unified-test-format/valid-pass/poc-retryable-writes.json b/spec/unified-test-format/valid-pass/poc-retryable-writes.json similarity index 100% rename from src/test/spec/json/unified-test-format/valid-pass/poc-retryable-writes.json rename to spec/unified-test-format/valid-pass/poc-retryable-writes.json diff --git a/src/test/spec/json/unified-test-format/valid-pass/poc-retryable-writes.yml b/spec/unified-test-format/valid-pass/poc-retryable-writes.yml similarity index 100% rename from src/test/spec/json/unified-test-format/valid-pass/poc-retryable-writes.yml rename to spec/unified-test-format/valid-pass/poc-retryable-writes.yml diff --git a/src/test/spec/json/unified-test-format/valid-pass/poc-sessions.json b/spec/unified-test-format/valid-pass/poc-sessions.json similarity index 100% rename from src/test/spec/json/unified-test-format/valid-pass/poc-sessions.json rename to spec/unified-test-format/valid-pass/poc-sessions.json diff --git a/src/test/spec/json/unified-test-format/valid-pass/poc-sessions.yml b/spec/unified-test-format/valid-pass/poc-sessions.yml similarity index 100% rename from src/test/spec/json/unified-test-format/valid-pass/poc-sessions.yml rename to spec/unified-test-format/valid-pass/poc-sessions.yml diff --git a/src/test/spec/json/unified-test-format/valid-pass/poc-transactions-convenient-api.json b/spec/unified-test-format/valid-pass/poc-transactions-convenient-api.json similarity index 100% rename from src/test/spec/json/unified-test-format/valid-pass/poc-transactions-convenient-api.json rename to spec/unified-test-format/valid-pass/poc-transactions-convenient-api.json diff --git a/src/test/spec/json/unified-test-format/valid-pass/poc-transactions-convenient-api.yml b/spec/unified-test-format/valid-pass/poc-transactions-convenient-api.yml similarity index 100% rename from src/test/spec/json/unified-test-format/valid-pass/poc-transactions-convenient-api.yml rename to spec/unified-test-format/valid-pass/poc-transactions-convenient-api.yml diff --git a/src/test/spec/json/unified-test-format/valid-pass/poc-transactions-mongos-pin-auto.json b/spec/unified-test-format/valid-pass/poc-transactions-mongos-pin-auto.json similarity index 100% rename from src/test/spec/json/unified-test-format/valid-pass/poc-transactions-mongos-pin-auto.json rename to spec/unified-test-format/valid-pass/poc-transactions-mongos-pin-auto.json diff --git a/src/test/spec/json/unified-test-format/valid-pass/poc-transactions-mongos-pin-auto.yml b/spec/unified-test-format/valid-pass/poc-transactions-mongos-pin-auto.yml similarity index 100% rename from src/test/spec/json/unified-test-format/valid-pass/poc-transactions-mongos-pin-auto.yml rename to spec/unified-test-format/valid-pass/poc-transactions-mongos-pin-auto.yml diff --git a/src/test/spec/json/unified-test-format/valid-pass/poc-transactions.json b/spec/unified-test-format/valid-pass/poc-transactions.json similarity index 100% rename from src/test/spec/json/unified-test-format/valid-pass/poc-transactions.json rename to spec/unified-test-format/valid-pass/poc-transactions.json diff --git a/src/test/spec/json/unified-test-format/valid-pass/poc-transactions.yml b/spec/unified-test-format/valid-pass/poc-transactions.yml similarity index 100% rename from src/test/spec/json/unified-test-format/valid-pass/poc-transactions.yml rename to spec/unified-test-format/valid-pass/poc-transactions.yml diff --git a/src/test/spec/json/uri-options/README.md b/spec/uri-options/README.md similarity index 100% rename from src/test/spec/json/uri-options/README.md rename to spec/uri-options/README.md diff --git a/src/test/spec/json/uri-options/auth-options.json b/spec/uri-options/auth-options.json similarity index 100% rename from src/test/spec/json/uri-options/auth-options.json rename to spec/uri-options/auth-options.json diff --git a/src/test/spec/json/uri-options/auth-options.yml b/spec/uri-options/auth-options.yml similarity index 100% rename from src/test/spec/json/uri-options/auth-options.yml rename to spec/uri-options/auth-options.yml diff --git a/src/test/spec/json/uri-options/ca.pem b/spec/uri-options/ca.pem similarity index 100% rename from src/test/spec/json/uri-options/ca.pem rename to spec/uri-options/ca.pem diff --git a/src/test/spec/json/uri-options/cert.pem b/spec/uri-options/cert.pem similarity index 100% rename from src/test/spec/json/uri-options/cert.pem rename to spec/uri-options/cert.pem diff --git a/src/test/spec/json/uri-options/client.pem b/spec/uri-options/client.pem similarity index 100% rename from src/test/spec/json/uri-options/client.pem rename to spec/uri-options/client.pem diff --git a/src/test/spec/json/uri-options/compression-options.json b/spec/uri-options/compression-options.json similarity index 100% rename from src/test/spec/json/uri-options/compression-options.json rename to spec/uri-options/compression-options.json diff --git a/src/test/spec/json/uri-options/compression-options.yml b/spec/uri-options/compression-options.yml similarity index 100% rename from src/test/spec/json/uri-options/compression-options.yml rename to spec/uri-options/compression-options.yml diff --git a/src/test/spec/json/uri-options/concern-options.json b/spec/uri-options/concern-options.json similarity index 100% rename from src/test/spec/json/uri-options/concern-options.json rename to spec/uri-options/concern-options.json diff --git a/src/test/spec/json/uri-options/concern-options.yml b/spec/uri-options/concern-options.yml similarity index 100% rename from src/test/spec/json/uri-options/concern-options.yml rename to spec/uri-options/concern-options.yml diff --git a/src/test/spec/json/uri-options/connection-options.json b/spec/uri-options/connection-options.json similarity index 100% rename from src/test/spec/json/uri-options/connection-options.json rename to spec/uri-options/connection-options.json diff --git a/src/test/spec/json/uri-options/connection-options.yml b/spec/uri-options/connection-options.yml similarity index 100% rename from src/test/spec/json/uri-options/connection-options.yml rename to spec/uri-options/connection-options.yml diff --git a/src/test/spec/json/uri-options/connection-pool-options.json b/spec/uri-options/connection-pool-options.json similarity index 100% rename from src/test/spec/json/uri-options/connection-pool-options.json rename to spec/uri-options/connection-pool-options.json diff --git a/src/test/spec/json/uri-options/connection-pool-options.yml b/spec/uri-options/connection-pool-options.yml similarity index 100% rename from src/test/spec/json/uri-options/connection-pool-options.yml rename to spec/uri-options/connection-pool-options.yml diff --git a/src/test/spec/json/uri-options/proxy-options.json b/spec/uri-options/proxy-options.json similarity index 100% rename from src/test/spec/json/uri-options/proxy-options.json rename to spec/uri-options/proxy-options.json diff --git a/src/test/spec/json/uri-options/proxy-options.yml b/spec/uri-options/proxy-options.yml similarity index 100% rename from src/test/spec/json/uri-options/proxy-options.yml rename to spec/uri-options/proxy-options.yml diff --git a/src/test/spec/json/uri-options/read-preference-options.json b/spec/uri-options/read-preference-options.json similarity index 100% rename from src/test/spec/json/uri-options/read-preference-options.json rename to spec/uri-options/read-preference-options.json diff --git a/src/test/spec/json/uri-options/read-preference-options.yml b/spec/uri-options/read-preference-options.yml similarity index 100% rename from src/test/spec/json/uri-options/read-preference-options.yml rename to spec/uri-options/read-preference-options.yml diff --git a/src/test/spec/json/uri-options/sdam-options.json b/spec/uri-options/sdam-options.json similarity index 100% rename from src/test/spec/json/uri-options/sdam-options.json rename to spec/uri-options/sdam-options.json diff --git a/src/test/spec/json/uri-options/sdam-options.yml b/spec/uri-options/sdam-options.yml similarity index 100% rename from src/test/spec/json/uri-options/sdam-options.yml rename to spec/uri-options/sdam-options.yml diff --git a/src/test/spec/json/uri-options/single-threaded-options.json b/spec/uri-options/single-threaded-options.json similarity index 100% rename from src/test/spec/json/uri-options/single-threaded-options.json rename to spec/uri-options/single-threaded-options.json diff --git a/src/test/spec/json/uri-options/single-threaded-options.yml b/spec/uri-options/single-threaded-options.yml similarity index 100% rename from src/test/spec/json/uri-options/single-threaded-options.yml rename to spec/uri-options/single-threaded-options.yml diff --git a/src/test/spec/json/uri-options/srv-options.json b/spec/uri-options/srv-options.json similarity index 100% rename from src/test/spec/json/uri-options/srv-options.json rename to spec/uri-options/srv-options.json diff --git a/src/test/spec/json/uri-options/srv-options.yml b/spec/uri-options/srv-options.yml similarity index 100% rename from src/test/spec/json/uri-options/srv-options.yml rename to spec/uri-options/srv-options.yml diff --git a/src/test/spec/json/uri-options/tls-options.json b/spec/uri-options/tls-options.json similarity index 100% rename from src/test/spec/json/uri-options/tls-options.json rename to spec/uri-options/tls-options.json diff --git a/src/test/spec/json/uri-options/tls-options.yml b/spec/uri-options/tls-options.yml similarity index 100% rename from src/test/spec/json/uri-options/tls-options.yml rename to spec/uri-options/tls-options.yml diff --git a/src/test/spec/json/versioned-api/README.rst b/spec/versioned-api/README.rst similarity index 100% rename from src/test/spec/json/versioned-api/README.rst rename to spec/versioned-api/README.rst diff --git a/src/test/spec/json/versioned-api/crud-api-version-1-strict.json b/spec/versioned-api/crud-api-version-1-strict.json similarity index 100% rename from src/test/spec/json/versioned-api/crud-api-version-1-strict.json rename to spec/versioned-api/crud-api-version-1-strict.json diff --git a/src/test/spec/json/versioned-api/crud-api-version-1-strict.yml b/spec/versioned-api/crud-api-version-1-strict.yml similarity index 100% rename from src/test/spec/json/versioned-api/crud-api-version-1-strict.yml rename to spec/versioned-api/crud-api-version-1-strict.yml diff --git a/src/test/spec/json/versioned-api/crud-api-version-1.json b/spec/versioned-api/crud-api-version-1.json similarity index 100% rename from src/test/spec/json/versioned-api/crud-api-version-1.json rename to spec/versioned-api/crud-api-version-1.json diff --git a/src/test/spec/json/versioned-api/crud-api-version-1.yml b/spec/versioned-api/crud-api-version-1.yml similarity index 100% rename from src/test/spec/json/versioned-api/crud-api-version-1.yml rename to spec/versioned-api/crud-api-version-1.yml diff --git a/src/test/spec/json/versioned-api/runcommand-helper-no-api-version-declared.json b/spec/versioned-api/runcommand-helper-no-api-version-declared.json similarity index 100% rename from src/test/spec/json/versioned-api/runcommand-helper-no-api-version-declared.json rename to spec/versioned-api/runcommand-helper-no-api-version-declared.json diff --git a/src/test/spec/json/versioned-api/runcommand-helper-no-api-version-declared.yml b/spec/versioned-api/runcommand-helper-no-api-version-declared.yml similarity index 100% rename from src/test/spec/json/versioned-api/runcommand-helper-no-api-version-declared.yml rename to spec/versioned-api/runcommand-helper-no-api-version-declared.yml diff --git a/src/test/spec/json/versioned-api/test-commands-deprecation-errors.json b/spec/versioned-api/test-commands-deprecation-errors.json similarity index 100% rename from src/test/spec/json/versioned-api/test-commands-deprecation-errors.json rename to spec/versioned-api/test-commands-deprecation-errors.json diff --git a/src/test/spec/json/versioned-api/test-commands-deprecation-errors.yml b/spec/versioned-api/test-commands-deprecation-errors.yml similarity index 100% rename from src/test/spec/json/versioned-api/test-commands-deprecation-errors.yml rename to spec/versioned-api/test-commands-deprecation-errors.yml diff --git a/src/test/spec/json/versioned-api/test-commands-strict-mode.json b/spec/versioned-api/test-commands-strict-mode.json similarity index 100% rename from src/test/spec/json/versioned-api/test-commands-strict-mode.json rename to spec/versioned-api/test-commands-strict-mode.json diff --git a/src/test/spec/json/versioned-api/test-commands-strict-mode.yml b/spec/versioned-api/test-commands-strict-mode.yml similarity index 100% rename from src/test/spec/json/versioned-api/test-commands-strict-mode.yml rename to spec/versioned-api/test-commands-strict-mode.yml diff --git a/src/test/spec/json/versioned-api/transaction-handling.json b/spec/versioned-api/transaction-handling.json similarity index 100% rename from src/test/spec/json/versioned-api/transaction-handling.json rename to spec/versioned-api/transaction-handling.json diff --git a/src/test/spec/json/versioned-api/transaction-handling.yml b/spec/versioned-api/transaction-handling.yml similarity index 100% rename from src/test/spec/json/versioned-api/transaction-handling.yml rename to spec/versioned-api/transaction-handling.yml diff --git a/src/test/auth.rs b/src/test/auth.rs index 3790e07b4..93c746593 100644 --- a/src/test/auth.rs +++ b/src/test/auth.rs @@ -13,7 +13,7 @@ use crate::{ }; #[tokio::test] -async fn plain_auth() { +async fn plain_auth_skip_local() { let options = ClientOptions::builder() .hosts(vec![ServerAddress::Tcp { host: "ldaptest.10gen.cc".into(), diff --git a/src/test/csfle.rs b/src/test/csfle.rs index 0fc0feae5..b0b0ead8e 100644 --- a/src/test/csfle.rs +++ b/src/test/csfle.rs @@ -302,7 +302,7 @@ async fn validate_roundtrip( fn load_testdata_raw(name: &str) -> Result { let path: PathBuf = [ env!("CARGO_MANIFEST_DIR"), - "src/test/spec/json/testdata/client-side-encryption", + "spec/testdata/client-side-encryption", name, ] .iter() diff --git a/src/test/spec.rs b/src/test/spec.rs index c32d8bb61..437057236 100644 --- a/src/test/spec.rs +++ b/src/test/spec.rs @@ -32,7 +32,7 @@ use std::{ ffi::OsStr, fs::{read_dir, File}, future::Future, - path::PathBuf, + path::{Path, PathBuf}, }; use serde::{de::DeserializeOwned, Deserialize}; @@ -56,9 +56,7 @@ pub(crate) fn deserialize_spec_tests( spec: &[&str], skipped_files: Option<&[&str]>, ) -> Vec<(T, PathBuf)> { - let mut path: PathBuf = [env!("CARGO_MANIFEST_DIR"), "src", "test", "spec", "json"] - .iter() - .collect(); + let mut path = Path::new(env!("CARGO_MANIFEST_DIR")).join("spec"); path.extend(spec); deserialize_spec_tests_common(path, skipped_files) } diff --git a/src/test/spec/unified_runner/test_runner.rs b/src/test/spec/unified_runner/test_runner.rs index e48d951d3..b0b6eb6c9 100644 --- a/src/test/spec/unified_runner/test_runner.rs +++ b/src/test/spec/unified_runner/test_runner.rs @@ -257,7 +257,7 @@ impl TestRunner { for operation in &test_case.operations { self.sync_workers().await; operation.execute(self, &test_case.description).await; - // This test (in src/test/spec/json/sessions/server-support.json) runs two + // This test (in spec/sessions/server-support.json) runs two // operations with implicit sessions in sequence and then checks to see if they // used the same lsid. We delay for one second to ensure that the // implicit session used in the first operation is returned to the pool before